From 702d4671fa8fc1e1547dedf61f7476d37da840ab Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Tue, 23 Aug 2016 19:00:21 +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     | 29 +++++++++++++++++-----
 1 file changed, 23 insertions(+), 6 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 dfc5b4b..9a67b79 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
@@ -489,7 +489,7 @@ public class AntenatalExaminationFacade {
                     }
 
                     if(CollectionUtils.isNotEmpty(patientses)){
-                        buildPatientList(dueDate,patientses,listData);
+                        buildPatientList(dueDate,patientses,listData,null);
 
                         PostReviewQuery postReviewQuery = new PostReviewQuery();
                         if (list.size() - 1 > i) {
@@ -528,14 +528,23 @@ public class AntenatalExaminationFacade {
                 patientsQuery1.setType(1);
                 List<Patients> patientsList =   patientsService.queryPatient(patientsQuery1);
                 List list1=new ArrayList();
-                List l= buildPatientList(dueDate, patientsList, list1);
+                List l= buildPatientList(dueDate, patientsList, list1,null);
                 if(!l.isEmpty()){
                     sort(l);
                     sortList.add(l);
                 }
             }else{
                 List list1=new ArrayList();
-                List l=buildPatientList(dueDate, list, list1);
+                List<SortIn> tmp =new ArrayList();
+                for(Patients patients:list){
+                    tmp.add(new SortIn(patients));
+                }
+                sortList(tmp);
+                Date min=null;
+                if(!tmp.isEmpty()){
+                    min=tmp.get(tmp.size()-1).getDate();
+                }
+                List l=buildPatientList(dueDate, list, list1,min);
                 if(!l.isEmpty()){
                     sort(l);
                     sortList.add(l);
@@ -562,7 +571,7 @@ public class AntenatalExaminationFacade {
 
 
 
-    private List buildPatientList(Date dueDate, List<Patients> patientses,List listData) {
+    private List buildPatientList(Date dueDate, List<Patients> patientses,List listData,Date min) {
         if(CollectionUtils.isEmpty(patientses)){
             return listData;
         }
@@ -582,7 +591,11 @@ public class AntenatalExaminationFacade {
             //初诊记录
             AntExChuQuery antExChuQuery = new AntExChuQuery();
             antExChuQuery.setYn(YnEnums.YES.getId());
-            antExChuQuery.setStart(patientses.get(0).getBookbuildingDate());
+            if(null==min){
+                antExChuQuery.setStart(patientses.get(0).getBookbuildingDate());
+            }else{
+                antExChuQuery.setStart( min);
+            }
             antExChuQuery.setEnd(new Date(dueDate.getTime() + 86398000));
             antExChuQuery.setPid(pid);
 
@@ -600,7 +613,11 @@ public class AntenatalExaminationFacade {
             AntExQuery antExQuery = new AntExQuery();
             antExQuery.setYn(YnEnums.YES.getId());
             antExQuery.setPid(pid);
-            antExQuery.setStart(patientses.get(0).getBookbuildingDate());
+            if(null==min) {
+                antExQuery.setStart(patientses.get(0).getBookbuildingDate());
+            }else{
+                antExQuery.setStart(min);
+            }
             antExQuery.setEnd(new Date(dueDate.getTime() + 86398000));
             List<AntenatalExaminationModel> list1 = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery());
             if (CollectionUtils.isNotEmpty(list1)) {
-- 
1.8.3.1