diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index 9645321..00361a2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -2175,14 +2175,14 @@ public class BabyBookbuildingFacade { Date end = DateUtil.addDay(DateUtil.addMonth(currentDate, -request.getMonthAgeEnd() - 1), 1); babyQuery.setCheckDateStart(end); } - Map> result = new HashMap<>(); + List result = new ArrayList<>(); Map> mapItems = getCountGroupItemMaps(); for(String key : mapItems.keySet()) { List groups = mapItems.get(key); GrowthCountTask task = new GrowthCountTask(groups,babyQuery,babyCheckService,key); - result.put(key,task.getResults()); + result.addAll(task.getResults()); } BaseObjectResponse objectResponse = new BaseObjectResponse(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyGrowthCountResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyGrowthCountResult.java index 7e363e7..344c2a1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyGrowthCountResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyGrowthCountResult.java @@ -1,15 +1,15 @@ package com.lyms.platform.operate.web.result; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; + /** * Created by lqy on 2016-12-21. */ public class BabyGrowthCountResult { + //类型名称 + private String typeName; + //标准差 private String bzc; @@ -43,5 +43,11 @@ public class BabyGrowthCountResult { this.count = count; } + public String getTypeName() { + return typeName; + } + public void setTypeName(String typeName) { + this.typeName = typeName; + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/GrowthCountTask.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/GrowthCountTask.java index ad378d0..85902c1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/GrowthCountTask.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/GrowthCountTask.java @@ -59,6 +59,7 @@ public class GrowthCountTask{ { babyQuery.setWeightEvaluate(grouwth.getEvaluate()); } + grouwth.setTypeName(type); int count = babyCheckService.queryBabyCheckCount(babyQuery); grouwth.setCount(String.valueOf(count)); }