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 titleMap = parseTitle(couponReport); transNullToZero(couponReport, titleMap); - /** titlemap 排序 */ - Map temp = new LinkedHashMap<>(); - Set 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 temp = new LinkedHashMap<>(); +// Set 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> couponReportMap = new ArrayList<>(); - Set> entries = temp.entrySet(); + Set> entries = titleMap.entrySet(); for (Map.Entry entry : entries) { Map 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 map = couponReport.get(0); // 类型排序:儿童建档券-新生儿访视券-儿保检查券-血红蛋白检查券 (7 9 8 10) Map temp = new LinkedHashMap<>(); @@ -630,7 +630,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService } } couponReport.set(0, temp); - } + }*/ } private Map packCouponMap(Map sendInfo, Map usedInfo, Map hNameMap, String hid, List xAxis, Map param) { @@ -746,11 +746,18 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService temp.put(key, titleMap.get(key)); } } + Map sortTemp = new TreeMap<>( + new Comparator() { + 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));