Merge remote-tracking branch '公司/master'
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
yudao-ui-admin CI / build (14.x) (push) Has been cancelled
yudao-ui-admin CI / build (16.x) (push) Has been cancelled

This commit is contained in:
lxd 2024-08-06 13:27:43 +08:00
commit 2edb0b4a3e

View File

@ -103,20 +103,24 @@ public class PatientexamlistController {
PageResult<PatientexamlistDO> pageResult = patientexamlistService.getPatientexamlistPage(pageReqVO);
List<PatientexamlistDO> doList=new ArrayList<>();
String devicetype=pageReqVO.getDeviceType();
if(devicetype.equals("US"))//表示只查询超声的数据
if(devicetype!=null&&devicetype.equals("US"))//表示只查询超声的数据
{
// 筛选条件
doList = pageResult.getList().stream()
.filter(PatientexamlistDO -> (PatientexamlistDO.getDeviceType().equals(devicetype)))
.collect(Collectors.toList());
}
else//表示只查询影像的数据
else if(devicetype!=null&&!devicetype.trim().isEmpty())//表示只查询影像的数据
{
// 筛选条件
doList = pageResult.getList().stream()
.filter(PatientexamlistDO -> !(PatientexamlistDO.getDeviceType().equals("US")))
.collect(Collectors.toList());
}
else //devicetype为空查询全部数据
{
doList=pageResult.getList();
}
pageResult.setList(doList);