From 9781aaba194d78db6aaf177d2cb44a4be42711dc Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Tue, 11 Jul 2017 18:25:51 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=BF=AE=E6=94=B9=E5=88=86?=
 =?UTF-8?q?=E5=A8=A9=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/facade/AntenatalExaminationFacade.java       | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 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 4a64ac3..55107d1 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
@@ -1099,7 +1099,7 @@ public class AntenatalExaminationFacade {
         Organization organization = null;
         String pid = "";
         List listData = new ArrayList();
-
+        Date lastMenses=null;//上一次的末次月经
         while (iterator.hasNext()) {
             Patients patients = iterator.next();
 
@@ -1120,9 +1120,9 @@ public class AntenatalExaminationFacade {
                     listData.add(new AntData(patients, null != organization ? organization.getName() : ""));
                 }
 
-                if (null == dueDate && null != patients.getFmDate()) {
+//                if (null == dueDate && null != patients.getFmDate()) {
                     dueDate = patients.getFmDate();
-                }
+//                }
 
 
                 //初诊记录
@@ -1169,8 +1169,8 @@ public class AntenatalExaminationFacade {
                         listData.add(new AntData(an, null != organization ? organization.getName() : "", patientses.get(0).getLastMenses()));
                     }
                 }
-
-                /*if (null != map) {
+/*
+                if (null != map) {
                     Object obj = map.get(listDate.get(i).getId());
                     if (obj instanceof MaternalDeliverModel) {
                         MaternalDeliverModel model = (MaternalDeliverModel) obj;
@@ -1181,17 +1181,19 @@ public class AntenatalExaminationFacade {
                         listData.add(new AntData((MaternalDeliverModel) obj, patientses.get(0).getLastMenses(), null != organization ? organization.getName() : ""));
                     }
                 }*/
-                if (null != map) {
+               if (null != map) {
                     MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
                     matDeliverQuery.setYn(YnEnums.YES.getId());
                     matDeliverQuery.setPid(pid);
-                    matDeliverQuery.setNeStart(true);
+//                    matDeliverQuery.setNeStart(true);
 //                    matDeliverQuery.setNeEnd(true);
                     matDeliverQuery.setCreatedStart(dueDate);
                     if (CollectionUtils.isNotEmpty(listDate)) {
                         //下次建档记录前都是产后复查,如果没有下个产程的数据就直接显示
                         if (listDate.size() > 1 && i > 1) {
                             matDeliverQuery.setEndStart(listDate.get(i - 1).getDate());
+                        }else{
+                            matDeliverQuery.setEndStart(lastMenses);
                         }
                     }
                     List<MaternalDeliverModel> l=   matDeliverService.query(matDeliverQuery);
@@ -1201,7 +1203,7 @@ public class AntenatalExaminationFacade {
                             organization = organizationService.getOrganization(Integer.valueOf(model.getHospitalId()));
                         }
 
-                        listData.add(new AntData((MaternalDeliverModel) model, patientses.get(0).getLastMenses(), null != organization ? organization.getName() : ""));
+                        listData.add(new AntData(model, patientses.get(0).getLastMenses(), null != organization ? organization.getName() : ""));
                     }
                 }
 
@@ -1287,7 +1289,7 @@ public class AntenatalExaminationFacade {
                         }
                     }
                 }
-
+                lastMenses=patients.getLastMenses();
                 iterator.remove();
                 if (CollectionUtils.isNotEmpty(listData)) {
                     sort(listData);
-- 
1.8.3.1