From 314d77697b59092d2bb7f68cbde62bc1d244d0f6 Mon Sep 17 00:00:00 2001
From: "litao@lymsh.com" <Lt123456>
Date: Wed, 20 Dec 2017 14:22:44 +0800
Subject: [PATCH] paixu

---
 .../operate/web/service/impl/BloodPressureServiceImpl.java    |  4 ++--
 .../com/lyms/platform/operate/web/utils/CollectionUtils.java  | 11 +++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java
index bacc13a..6ea789e 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java
@@ -184,10 +184,9 @@ public class BloodPressureServiceImpl extends BaseServiceImpl implements IBloodP
 
     @Override
     public List<Map<String, Object>> getAppInfo(String parentId) {
-        List<BloodPressure> bloodPressure = mongoTemplate.find(Query.query(Criteria.where("pid").is(parentId)).with(new Sort(Sort.Direction.ASC, "created")), BloodPressure.class);
+        List<BloodPressure> bloodPressure = mongoTemplate.find(Query.query(Criteria.where("pid").is(parentId)), BloodPressure.class);
         List<Map<String, Object>> restList = new ArrayList<>();
         if(CollectionUtils.isNotEmpty(bloodPressure)) {
-
             for(BloodPressure b:bloodPressure){
                 Map<String, Map<String, Object>> infos = b.getInfos();
                 Object[] keys = infos.keySet().toArray();
@@ -203,6 +202,7 @@ public class BloodPressureServiceImpl extends BaseServiceImpl implements IBloodP
                 }
             }
         }
+        CollectionUtils.sortListByMapKeyWithDate(restList, "createTime");
         return restList;
     }
 
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 33d4484..3136379 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
@@ -1,5 +1,6 @@
 package com.lyms.platform.operate.web.utils;
 
+import com.lyms.platform.common.utils.DateUtil;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.util.Assert;
@@ -232,4 +233,14 @@ public class CollectionUtils extends org.apache.commons.collections.CollectionUt
             restList.addAll(tempList);
         }
     }
+
+    public static void sortListByMapKeyWithDate(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.parseYMDHMS((String) o1.get(key)).getTime() - DateUtil.parseYMDHMS((String) o2.get(key)).getTime()).intValue();
+                }
+            });
+        }
+    }
 }
-- 
1.8.3.1