From 59654db548e0987a6d52370ed41299bd345c7bb6 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Wed, 7 Sep 2016 15:49:08 +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

---
 .../platform/operate/web/facade/AntenatalExaminationFacade.java     | 6 ++++--
 1 file changed, 4 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 7a485c6..05fb06d 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
@@ -627,7 +627,7 @@ public class AntenatalExaminationFacade {
             sortList(listDate);
 
             //需要过滤掉建档就分娩的情况
-            Date dueDate = new Date();
+            Date dueDate =null;
             if (CollectionUtils.isNotEmpty(listDate)) {
                 String pid = "";
                 int count = 0;
@@ -789,7 +789,9 @@ public class AntenatalExaminationFacade {
                 listData.add(new AntData(patients, null != organization ? organization.getName() : ""));
                 iterator.remove();
 
-
+                if(null==dueDate &&null!=patients.getFmDate()){
+                    dueDate=patients.getFmDate();
+                }
                 PostReviewQuery postReviewQuery = new PostReviewQuery();
                 if (list.size() - 1 > i) {
                     postReviewQuery.setStart(dueDate);
-- 
1.8.3.1