From fe42c782d4cf3ca1bb1f11421f49b7ad68b617a4 Mon Sep 17 00:00:00 2001
From: "litao@lymsh.com" <Lt123456>
Date: Thu, 3 Aug 2017 15:50:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/service/impl/ReportServiceImpl.java        | 71 ++++++++++++----------
 1 file changed, 39 insertions(+), 32 deletions(-)

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 f9e337e..8c8af0e 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
@@ -549,37 +549,37 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
         Map<String, Object> titleMap = parseTitle(couponReport);
         transNullToZero(couponReport, titleMap);
 
-        /** titlemap 排序 */
-        Map<String, Object> temp = new LinkedHashMap<>();
-        Set<String> keys = titleMap.keySet();
-        for (String key : keys) {
-            if(key.startsWith("7")) {
-                temp.put(key, titleMap.get(key));
-            }
-        }
-        for (String key : keys) {
-            if(key.startsWith("9")) {
-                temp.put(key, titleMap.get(key));
-            }
-        }
-        for (String key : keys) {
-            if(key.startsWith("8")) {
-                temp.put(key, titleMap.get(key));
-            }
-        }
-        for (String key : keys) {
-            if(key.startsWith("10")) {
-                temp.put(key, titleMap.get(key));
-            }
-        }
-        for (String s : keys) {
-            if(!s.startsWith("10")||!s.startsWith("9")||!s.startsWith("8")||!s.startsWith("7")) {
-                temp.put(s, titleMap.get(s));
-            }
-        }
+//        /** titlemap 排序 */
+//        Map<String, Object> temp = new LinkedHashMap<>();
+//        Set<String> keys = titleMap.keySet();
+//        for (String key : keys) {
+//            if(key.startsWith("7")) {
+//                temp.put(key, titleMap.get(key));
+//            }
+//        }
+//        for (String key : keys) {
+//            if(key.startsWith("9")) {
+//                temp.put(key, titleMap.get(key));
+//            }
+//        }
+//        for (String key : keys) {
+//            if(key.startsWith("8")) {
+//                temp.put(key, titleMap.get(key));
+//            }
+//        }
+//        for (String key : keys) {
+//            if(key.startsWith("10")) {
+//                temp.put(key, titleMap.get(key));
+//            }
+//        }
+//        for (String s : keys) {
+//            if(!s.startsWith("10")||!s.startsWith("9")||!s.startsWith("8")||!s.startsWith("7")) {
+//                temp.put(s, titleMap.get(s));
+//            }
+//        }
 
         List<Map<String, Object>> couponReportMap = new ArrayList<>();
-        Set<Map.Entry<String, Object>> entries = temp.entrySet();
+        Set<Map.Entry<String, Object>> entries = titleMap.entrySet();
         for (Map.Entry<String, Object> entry : entries) {
             Map<String, Object> m = new HashMap<>();
             m.put("name", entry.getValue());
@@ -599,7 +599,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
             }
         }
 
-        if(CollectionUtils.isNotEmpty(couponReport)) {
+       /* if(CollectionUtils.isNotEmpty(couponReport)) {
             Map<String, Object> map = couponReport.get(0);
             // 类型排序：儿童建档券-新生儿访视券-儿保检查券-血红蛋白检查券 (7 9 8 10)
             Map<String, Object> temp = new LinkedHashMap<>();
@@ -630,7 +630,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
                 }
             }
             couponReport.set(0, temp);
-        }
+        }*/
     }
 
     private Map<String, Object> packCouponMap(Map<String, Object> sendInfo, Map<String, Object> usedInfo, Map<String, Object> hNameMap, String hid, List<String> xAxis, Map<String, Object> param) {
@@ -746,11 +746,18 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
                 temp.put(key, titleMap.get(key));
             }
         }
+        Map<String, Object> sortTemp = new TreeMap<>(
+                new Comparator<String>() {
+                    public int compare(String obj1, String obj2) {
+                return obj1.compareTo(obj2);
+            }
+        });
         for (String key : keys) {
             if(key.startsWith("10")) {
-                temp.put(key, titleMap.get(key));
+                sortTemp.put(key, titleMap.get(key));
             }
         }
+        temp.putAll(sortTemp);
         for (String s : keys) {
             if(!s.startsWith("10")||!s.startsWith("9")||!s.startsWith("8")||!s.startsWith("7")) {
                 temp.put(s, titleMap.get(s));
-- 
1.8.3.1