From 2c57beb0b8eef17246eac87b34fdd40197e8f648 Mon Sep 17 00:00:00 2001 From: lichuanyang <1176537920@qq.com> Date: Tue, 6 Aug 2024 13:25:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3=20tblist/p?= =?UTF-8?q?atientexamlist/page?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/patientexamlist/PatientexamlistController.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/PatientexamlistController.java b/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/PatientexamlistController.java index 4af019762..e37e734f3 100644 --- a/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/PatientexamlistController.java +++ b/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/PatientexamlistController.java @@ -103,20 +103,24 @@ public class PatientexamlistController { PageResult pageResult = patientexamlistService.getPatientexamlistPage(pageReqVO); List 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);