From bd60d97e6adff397f195d41b08eecf18c3e93cb8 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Fri, 23 Dec 2016 15:07:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=A7=E6=A3=80=E5=88=A0?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/facade/AntenatalExaminationFacade.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index 84ee3c6..b654b11 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -852,9 +852,9 @@ public class AntenatalExaminationFacade { Map map = new HashMap(); List sortList = new ArrayList(); - String hospital = autoMatchFacade.getHospitalId(userId); + List listDate = new ArrayList(); - ; + if (CollectionUtils.isNotEmpty(list)) { // Patients patients2 = findOnePatient(null, null, null, hospital, -1, true, exListQueryRequest.getPid(),false); Patients patients2 = findOnePatient(null, null, null, groupsFacade.findGroupHospital(userId), -1, true, exListQueryRequest.getPid(), false); @@ -1050,7 +1050,7 @@ public class AntenatalExaminationFacade { organization = organizationService.getOrganization(Integer.valueOf(patients.getHospitalId())); } pid = patients.getPid(); - if(!"0".equals(patients.getEnable())){ + if(!"2".equals(patients.getEnable())){ listData.add(new AntData(patients, null != organization ? organization.getName() : "")); } @@ -1211,7 +1211,7 @@ public class AntenatalExaminationFacade { organization = organizationService.getOrganization(Integer.valueOf(patients.getHospitalId())); } pid = patients.getPid(); - if(!"0".equals(patients.getEnable())) { + if(!"2".equals(patients.getEnable())) { listData.add(new AntData(patients, null != organization ? organization.getName() : "")); } } -- 1.8.3.1