From d09a1b4ec3106a65e820d8f55bd929ceb0c77955 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Tue, 23 Aug 2016 19:27:06 +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

---
 .../web/facade/AntenatalExaminationFacade.java     | 24 ++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 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 9a67b79..1c212b9 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
@@ -528,7 +528,16 @@ public class AntenatalExaminationFacade {
                 patientsQuery1.setType(1);
                 List<Patients> patientsList =   patientsService.queryPatient(patientsQuery1);
                 List list1=new ArrayList();
-                List l= buildPatientList(dueDate, patientsList, list1,null);
+                List<SortIn> tmp =new ArrayList();
+                for(Patients patients:patientsList){
+                    tmp.add(new SortIn(patients));
+                }
+                sortList(tmp);
+                Date min=null;
+                if(!tmp.isEmpty()){
+                    min=tmp.get(tmp.size()-1).getDate();
+                }
+                List l= buildPatientList(dueDate, patientsList, list1,min);
                 if(!l.isEmpty()){
                     sort(l);
                     sortList.add(l);
@@ -593,10 +602,13 @@ public class AntenatalExaminationFacade {
             antExChuQuery.setYn(YnEnums.YES.getId());
             if(null==min){
                 antExChuQuery.setStart(patientses.get(0).getBookbuildingDate());
+                antExChuQuery.setEnd(new Date(dueDate.getTime()+86398000));
             }else{
-                antExChuQuery.setStart( min);
+                antExChuQuery.setStart(min);
+                if(min.before(patientses.get(0).getBookbuildingDate())){
+                    antExChuQuery.setEnd(new Date(patientses.get(0).getBookbuildingDate().getTime() + 86398000));
+                }
             }
-            antExChuQuery.setEnd(new Date(dueDate.getTime() + 86398000));
             antExChuQuery.setPid(pid);
 
             List<AntExChuModel> antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery);
@@ -615,10 +627,14 @@ public class AntenatalExaminationFacade {
             antExQuery.setPid(pid);
             if(null==min) {
                 antExQuery.setStart(patientses.get(0).getBookbuildingDate());
+                antExQuery.setEnd(new Date(dueDate.getTime() + 86398000));
             }else{
                 antExQuery.setStart(min);
+                if(min.before(patientses.get(0).getBookbuildingDate())){
+                    antExQuery.setEnd(new Date(patientses.get(0).getBookbuildingDate().getTime() + 86398000));
+                }
             }
-            antExQuery.setEnd(new Date(dueDate.getTime() + 86398000));
+
             List<AntenatalExaminationModel> list1 = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery());
             if (CollectionUtils.isNotEmpty(list1)) {
                 for (AntenatalExaminationModel an : list1) {
-- 
1.8.3.1