From 8ce05b764083d7314fbb160d9b69becdaf61b7f7 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Wed, 7 Sep 2016 16:58:07 +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

---
 .../lyms/platform/operate/web/facade/AntenatalExaminationFacade.java | 5 +++--
 1 file changed, 3 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 8c65a17..0287a85 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
@@ -755,6 +755,9 @@ public class AntenatalExaminationFacade {
                 if(size!=list.size()){
                     list1   = new ArrayList();
                 }
+                /*if(null==dueDate){
+                    dueDate= new Date();
+                }*/
                 List l = buildPatientList(dueDate, list, list1, min, true);
                 if (!l.isEmpty()) {
                     sort(l);
@@ -891,7 +894,6 @@ public class AntenatalExaminationFacade {
         }
 
 
-        if (null != end) {
             //初诊记录
             AntExChuQuery antExChuQuery = new AntExChuQuery();
             antExChuQuery.setYn(YnEnums.YES.getId());
@@ -939,7 +941,6 @@ public class AntenatalExaminationFacade {
                     listData.add(new AntData(an, null != organization ? organization.getName() : "", patientses.get(0).getLastMenses()));
                 }
             }
-        }
         return listData;
     }
 
-- 
1.8.3.1