From a398036c5d3ffaa4397247d8a8603d6e35303658 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Thu, 8 Sep 2016 17:34:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E7=94=B5=E5=AD=90?=
 =?UTF-8?q?=E7=97=85=E5=8E=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/facade/AntenatalExaminationFacade.java       | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 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 31fb977..da5a9bb 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
@@ -656,7 +656,7 @@ public class AntenatalExaminationFacade {
                     if (CollectionUtils.isNotEmpty(patientses)) {
                         count = count + patientses.size();
                         //TODO  处理自动分娩的情况
-                        updateAutoMatdel(patientses,list,i,dueDate,sortList);
+                        updateAutoMatdel(patientses,list,i,dueDate,sortList,listDate);
                         listData = new ArrayList();
                     }
 
@@ -757,7 +757,7 @@ public class AntenatalExaminationFacade {
                 if (!tmp.isEmpty()) {
                     min = tmp.get(tmp.size() - 1).getDate();
                 }
-                updateAutoMatdel(list,list,0,dueDate,sortList);
+                updateAutoMatdel(list,list,0,dueDate,sortList,null);
                 if(size!=list.size()){
                     list1   = new ArrayList();
                 }
@@ -779,7 +779,7 @@ public class AntenatalExaminationFacade {
     /**
      * 处理自动分娩的情况
      */
-    private void updateAutoMatdel(List<Patients> patientses,List<Patients> list,int i,Date dueDate,List sortList){
+    private void updateAutoMatdel(List<Patients> patientses,List<Patients> list,int i,Date dueDate,List sortList,List<SortIn> listDate ){
         Iterator<Patients> iterator = patientses.iterator();
         Organization organization=null;
         String pid="";
@@ -804,9 +804,11 @@ public class AntenatalExaminationFacade {
                 PostReviewQuery postReviewQuery = new PostReviewQuery();
                 if (list.size() - 1 > i) {
                     postReviewQuery.setStart(dueDate);
-                    if (CollectionUtils.isNotEmpty(patientses)) {
+                    if (CollectionUtils.isNotEmpty(listDate)) {
                         //下次建档记录前都是产后复查,如果没有下个产程的数据就直接显示
-                        postReviewQuery.setEnd(patientses.get(0).getBookbuildingDate());
+                        if(listDate.size()>1 && i >1){
+                            postReviewQuery.setEnd(listDate.get(i-1).getDate());
+                        }
                     }
                 }
                 postReviewQuery.setYn(YnEnums.YES.getId());
-- 
1.8.3.1