From 91dd58b40936f7f33cfffa4220341b391093871b Mon Sep 17 00:00:00 2001
From: "litao@lymsh.com" <Lt123456>
Date: Fri, 29 Dec 2017 16:38:57 +0800
Subject: [PATCH] bbbbbb

---
 .../platform/operate/web/service/impl/ReportServiceImpl.java   |  2 ++
 .../com/lyms/platform/operate/web/utils/CollectionUtils.java   | 10 ++++++++++
 2 files changed, 12 insertions(+)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
index 8f61a72..37ab22d 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
@@ -680,6 +680,8 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
             setReport(tzMap, weights, antExChuModels.get(antExChuModels.size() - 1).getYqWeight(), PatientWeightServiceImpl.getBmi(antExChuModels.get(antExChuModels.size() - 1).getYqWeight(), antExChuModels.get(antExChuModels.size() - 1).getHeight()));
         }
 
+        CollectionUtils.sortListByMapKeyWithDateYmd(restList, "checkTime");
+
         return RespBuilder.buildSuccess("tabList", restList, "xyMap", xyMap, "tzMap", tzMap);
     }
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/CollectionUtils.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/CollectionUtils.java
index 3136379..e6c43d9 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/CollectionUtils.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/CollectionUtils.java
@@ -243,4 +243,14 @@ public class CollectionUtils extends org.apache.commons.collections.CollectionUt
             });
         }
     }
+
+    public static void sortListByMapKeyWithDateYmd(List<Map<String, Object>> list, final String key) {
+        if(CollectionUtils.isNotEmpty(list) && StringUtils.isNotEmpty(key)) {
+            Collections.sort(list, new Comparator<Map<String, Object>>() {
+                public int compare(Map<String, Object> o1, Map<String, Object> o2) {
+                    return new Long(DateUtil.parseYMD((String) o1.get(key)).getTime() - DateUtil.parseYMDHMS((String) o2.get(key)).getTime()).intValue();
+                }
+            });
+        }
+    }
 }
-- 
1.8.3.1