From b0ad58aa1b95e9a8a1968b6e4555c872e515d182 Mon Sep 17 00:00:00 2001
From: "litao@lymsh.com" <Lt123456>
Date: Thu, 3 Aug 2017 11:22:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E5=8A=A0=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/service/impl/ReportServiceImpl.java        | 58 ++++++++++++++++++----
 1 file changed, 48 insertions(+), 10 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 7b35ce7..5b48198 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
@@ -126,15 +126,18 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
         /** 儿童 */
         couponReportMap.put("7_1", "儿童建档券使用人次");
 //        couponReportMap.put("8_1", "新生儿保健券使用人次");
-        couponReportMap.put("8_2", "<div class='ag-double-line'>儿童保健券(一)<div>使用人次</div></div>");
-        couponReportMap.put("8_3", "<div class='ag-double-line'>儿童保健券(二)<div>使用人次</div></div>");
-        couponReportMap.put("8_4", "<div class='ag-double-line'>儿童保健券(三)<div><div>使用人次</div></div>");
-        couponReportMap.put("8_5", "<div class='ag-double-line'>儿童保健券(四)<div>使用人次</div></div>");
-        couponReportMap.put("8_6", "<div class='ag-double-line'>儿童保健券(五)<div>使用人次</div></div>");
-        couponReportMap.put("8_7", "<div class='ag-double-line'>儿童保健券(六)<div>使用人次</div></div>");
-        couponReportMap.put("8_8", "<div class='ag-double-line'>儿童保健券(七)<div>使用人次</div></div>");
-        couponReportMap.put("8_9", "<div class='ag-double-line'>儿童保健券(八)<div>使用人次</div></div>");
-        couponReportMap.put("8_10", "<div class='ag-double-line'>儿童保健券(九)<div>使用人次</div></div>");
+        couponReportMap.put("8_1", "<div class='ag-double-line'>儿童保健券(一)<div>使用人次</div></div>");
+        couponReportMap.put("8_2", "<div class='ag-double-line'>儿童保健券(二)<div>使用人次</div></div>");
+        couponReportMap.put("8_3", "<div class='ag-double-line'>儿童保健券(三)<div><div>使用人次</div></div>");
+        couponReportMap.put("8_4", "<div class='ag-double-line'>儿童保健券(四)<div>使用人次</div></div>");
+        couponReportMap.put("8_5", "<div class='ag-double-line'>儿童保健券(五)<div>使用人次</div></div>");
+        couponReportMap.put("8_6", "<div class='ag-double-line'>儿童保健券(六)<div>使用人次</div></div>");
+        couponReportMap.put("8_7", "<div class='ag-double-line'>儿童保健券(七)<div>使用人次</div></div>");
+        couponReportMap.put("8_8", "<div class='ag-double-line'>儿童保健券(八)<div>使用人次</div></div>");
+        couponReportMap.put("8_9", "<div class='ag-double-line'>儿童保健券(九)<div>使用人次</div></div>");
+        couponReportMap.put("8_10", "<div class='ag-double-line'>儿童保健券(十)<div>使用人次</div></div>");
+        couponReportMap.put("8_11", "<div class='ag-double-line'>儿童保健券(十一)<div>使用人次</div></div>");
+        couponReportMap.put("8_12", "<div class='ag-double-line'>儿童保健券(十二)<div>使用人次</div></div>");
         couponReportMap.put("9_1", "<div class='ag-double-line'>新生儿访视券(一)<div>使用人次</div></div>");
         couponReportMap.put("9_2", "<div class='ag-double-line'>新生儿访视券(二)<div>使用人次</div></div>");
         couponReportMap.put("9_3", "<div class='ag-double-line'>新生儿访视券(三)<div>使用人次</div></div>");
@@ -555,8 +558,10 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
             key.remove("8_1");
         }
         if(CollectionUtils.isNotEmpty(couponReport)) {
-            couponReport.get(0).remove("8_1");
+            Map<String, Object> map = couponReport.get(0);
+            map.remove("8_1");
         }
+
         for (Map<String, Object> map : couponReport) {
             for (String s : key) {
                 if(map.get(s) == null) {
@@ -564,6 +569,39 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
                 }
             }
         }
+
+        if(CollectionUtils.isNotEmpty(couponReport)) {
+            Map<String, Object> map = couponReport.get(0);
+            // 类型排序：儿童建档券-新生儿访视券-儿保检查券-血红蛋白检查券 (7 9 8 10)
+            Map<String, Object> temp = new LinkedHashMap<>();
+            Set<String> keys = map.keySet();
+            for (String s : keys) {
+                if(s.startsWith("7")) {
+                    temp.put(s, map.get(s));
+                }
+            }
+            for (String s : keys) {
+                if(s.startsWith("9")) {
+                    temp.put(s, map.get(s));
+                }
+            }
+            for (String s : keys) {
+                if(s.startsWith("8")) {
+                    temp.put(s, map.get(s));
+                }
+            }
+            for (String s : keys) {
+                if(s.startsWith("10")) {
+                    temp.put(s, map.get(s));
+                }
+            }
+            for (String s : keys) {
+                if(!s.startsWith("10")||!s.startsWith("9")||!s.startsWith("8")||!s.startsWith("7")) {
+                    temp.put(s, map.get(s));
+                }
+            }
+            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) {
-- 
1.8.3.1