From 8f6be691a55a3db849af2f81390372e914baa4a8 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Tue, 23 Aug 2016 11:42:27 +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     | 30 ++++++++++++----------
 1 file changed, 17 insertions(+), 13 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 d947eb6..dfc5b4b 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
@@ -517,20 +517,9 @@ public class AntenatalExaminationFacade {
                         }
                     }
                     if(!listData.isEmpty()){
+                        sort(listData);
                         sortList.add(listData);
                     }
-                    Collections.sort(listData, new Comparator<AntData>() {
-                        @Override
-                        public int compare(AntData o1, AntData o2) {
-                            if (o1.getCreated().after(o2.getCreated())) {
-                                return -1;
-                            }
-                            if (o1.getCreated().before(o2.getCreated())) {
-                                return 1;
-                            }
-                            return 0;
-                        }
-                    });
                 }
                 PatientsQuery patientsQuery1=new PatientsQuery();
                 patientsQuery1.setYn(YnEnums.YES.getId());
@@ -541,12 +530,14 @@ public class AntenatalExaminationFacade {
                 List list1=new ArrayList();
                 List l= buildPatientList(dueDate, patientsList, list1);
                 if(!l.isEmpty()){
+                    sort(l);
                     sortList.add(l);
                 }
             }else{
                 List list1=new ArrayList();
                 List l=buildPatientList(dueDate, list, list1);
                 if(!l.isEmpty()){
+                    sort(l);
                     sortList.add(l);
                 }
             }
@@ -554,7 +545,20 @@ public class AntenatalExaminationFacade {
         antexListResult.setData(sortList);
         return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(antexListResult);
     }
-
+    private void sort(List<AntData> listData){
+        Collections.sort(listData, new Comparator<AntData>() {
+            @Override
+            public int compare(AntData o1, AntData o2) {
+                if (o1.getCreated().after(o2.getCreated())) {
+                    return 1;
+                }
+                if (o1.getCreated().before(o2.getCreated())) {
+                    return -1;
+                }
+                return 0;
+            }
+        });
+    }
 
 
 
-- 
1.8.3.1