diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java index 200c56f..6bdd360 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java @@ -1216,19 +1216,22 @@ public class DateUtil { return time; } - public static List> getRange(Date start, Date end) { - List> restList = new ArrayList<>(); + public static List> getRange(Date start, Date end) { + List> restList = new ArrayList<>(); if(start != null && end != null) { List dates = getMonthBetween(start, end); for (int i = 0; i < dates.size(); i++) { - Map temp = new HashMap<>(); - temp.put("cname", getyyyy_mm(dates.get(i))); + Map temp = new HashMap<>(); + temp.put("cname", dates.get(i)); if(i == 0) { - temp.put("condition", Arrays.asList(start, dates.get(i))); + temp.put("start", start); + temp.put("end", dates.get(i + 1)); } else if(i == dates.size() - 1) { - temp.put("condition", Arrays.asList(dates.get(dates.size() - 1), end)); + temp.put("start", dates.get(dates.size() - 1)); + temp.put("end", end); } else { - temp.put("condition", Arrays.asList(dates.get(i), dates.get(i + 1))); + temp.put("start", dates.get(i)); + temp.put("end", dates.get(i + 1)); } restList.add(temp); } @@ -1254,13 +1257,11 @@ public class DateUtil { } public static void main(String[] args) { - List> monthBetween = getRange(parseYMD("2017-1-11"), parseYMD("2017-3-11")); - for (Map map : monthBetween) { - System.out.println(map.get("cname")); - List conditions = (List) map.get("condition"); - for (Date condition : conditions) { - System.out.println(condition.toLocaleString()); - } + List> monthBetween = getRange(parseYMD("2017-1-11"), parseYMD("2017-3-11")); + for (Map map : monthBetween) { + System.out.print("cname>> " + getyyyy_mm(map.get("cname"))); + System.out.print(" start>> " + getyyyy_MM_dd(map.get("start"))); + System.out.println(" end>> " + getyyyy_MM_dd(map.get("end"))); } } 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 38d7c08..9327e62 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 @@ -194,6 +194,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService Integer statistType, Integer ageType, Integer patientType, Date startDate, Date endDate, Integer userId) { List patients = getPatients(provinceId, cityId, aredId, streetId, ageType, patientType, startDate, endDate, userId); Map restMap = new HashMap<>(); + List> tabList = new ArrayList<>(); List xDatas = new ArrayList<>(); List> series = new ArrayList<>(); List legend = Arrays.asList("建档总数"); @@ -246,8 +247,12 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService barMap.put("name", "建档总数"); series.add(barMap); - for (Integer count : bar) { - + Integer count = 0; + for (Integer num : bar) { + count += num; + } + for (Integer num : bar) { + line.add(MathUtil.getProportion(num, count)); } lineMap.put("data", line); lineMap.put("type", "line"); @@ -258,6 +263,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService restMap.put("legend", legend); restMap.put("series", series); restMap.put("xDatas", xDatas); + restMap.put("tabList", tabList); return RespBuilder.buildSuccess(restMap); }