From 2aa0e18e9220b29121aacc44184ccb52aebae17b Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Fri, 23 Dec 2016 10:45:26 +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 | 9 +++++++-- 1 file changed, 7 insertions(+), 2 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 c653b41..7e5e78a 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 @@ -1028,6 +1028,7 @@ public class AntenatalExaminationFacade { List listData = new ArrayList(); while (iterator.hasNext()) { Patients patients = iterator.next(); + //处理建档就分娩的情况 Date date = DateUtil.addWeek(patients.getLastMenses(), 42); @@ -1038,7 +1039,9 @@ public class AntenatalExaminationFacade { organization = organizationService.getOrganization(Integer.valueOf(patients.getHospitalId())); } pid = patients.getPid(); - listData.add(new AntData(patients, null != organization ? organization.getName() : "")); + if(!"0".equals(patients.getEnable())){ + listData.add(new AntData(patients, null != organization ? organization.getName() : "")); + } if (null == dueDate && null != patients.getFmDate()) { @@ -1197,7 +1200,9 @@ public class AntenatalExaminationFacade { organization = organizationService.getOrganization(Integer.valueOf(patients.getHospitalId())); } pid = patients.getPid(); - listData.add(new AntData(patients, null != organization ? organization.getName() : "")); + if(!"0".equals(patients.getEnable())) { + listData.add(new AntData(patients, null != organization ? organization.getName() : "")); + } } -- 1.8.3.1