From 13b97b96bf434267e5b9909134e7ecdc77ec4e7d Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Wed, 24 Aug 2016 11:33:14 +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

---
 .../operate/web/facade/AntenatalExaminationFacade.java      | 13 +++++++++++--
 1 file changed, 11 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 b72bea8..7382bb1 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
@@ -574,12 +574,21 @@ public class AntenatalExaminationFacade {
         Collections.sort(listData, new Comparator<AntData>() {
             @Override
             public int compare(AntData o1, AntData o2) {
-                if (o1.getCreated().after(o2.getCreated())) {
+
+                if(Integer.valueOf(o1.getType())>Integer.valueOf(o2.getType())){
                     return 1;
                 }
-                if (o1.getCreated().before(o2.getCreated())) {
+                if(Integer.valueOf(o1.getType())<Integer.valueOf(o2.getType())){
                     return -1;
                 }
+                if(Integer.valueOf(o1.getType())==Integer.valueOf(o2.getType())) {
+                    if (o1.getCreated().after(o2.getCreated())) {
+                        return 1;
+                    }
+                    if (o1.getCreated().before(o2.getCreated())) {
+                        return -1;
+                    }
+                }
                 return 0;
             }
         });
-- 
1.8.3.1