From 2bd3a39de17bcc5dad1ca3ca2559addaf4b47d6b Mon Sep 17 00:00:00 2001 From: zengwh <81383286@qq.com> Date: Tue, 2 Feb 2021 21:13:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B6=E4=BB=96=E6=A1=A3=E6=A1=88=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=A2=9E=E5=8A=A0=E5=88=A0=E9=99=A4=E6=9D=83=E9=99=90?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/ipml/Archive_MasterServiceImpl.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java index 941b4e2..dcb5cc6 100644 --- a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java @@ -219,20 +219,22 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { patientIds = null; } selectList = selectOracleGetSignList(patientIds,selectList); - for(Archive_Master master : masters) { - if (StringUtils.isNotBlank(master.getPatientId())) { + if(!CollectionUtils.isEmpty(selectList)) { + for (Archive_Master master : masters) { if (StringUtils.isNotBlank(master.getPatientId())) { - for (String patientId : selectList) { - if (master.getPatientId().equals(patientId)) { - selectList1.add(master.getPatientId()); - break; + if (StringUtils.isNotBlank(master.getPatientId())) { + for (String patientId : selectList) { + if (master.getPatientId().equals(patientId)) { + selectList1.add(master.getPatientId()); + break; + } } } } } } //设置进查询条件 - if(!CollectionUtils.isEmpty(selectList)) { + if(!CollectionUtils.isEmpty(selectList1)) { vo.setPatientIdsForSign(selectList1); } }