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", "
儿童保健券(三)
");
- couponReportMap.put("8_5", "
");
- couponReportMap.put("8_6", "
");
- couponReportMap.put("8_7", "
");
- couponReportMap.put("8_8", "
");
- couponReportMap.put("8_9", "
");
- couponReportMap.put("8_10", "
");
+ couponReportMap.put("8_1", "
");
+ couponReportMap.put("8_2", "
");
+ couponReportMap.put("8_3", "
儿童保健券(三)
");
+ couponReportMap.put("8_4", "
");
+ couponReportMap.put("8_5", "
");
+ couponReportMap.put("8_6", "
");
+ couponReportMap.put("8_7", "
");
+ couponReportMap.put("8_8", "
");
+ couponReportMap.put("8_9", "
");
+ couponReportMap.put("8_10", "
");
+ couponReportMap.put("8_11", "
");
+ couponReportMap.put("8_12", "
");
couponReportMap.put("9_1", "
");
couponReportMap.put("9_2", "
");
couponReportMap.put("9_3", "
");
@@ -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
map = couponReport.get(0);
+ map.remove("8_1");
}
+
for (Map 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 map = couponReport.get(0);
+ // 类型排序:儿童建档券-新生儿访视券-儿保检查券-血红蛋白检查券 (7 9 8 10)
+ Map temp = new LinkedHashMap<>();
+ Set 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 packCouponMap(Map sendInfo, Map usedInfo, Map hNameMap, String hid, List xAxis, Map param) {