diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java index 4cf42b2..b2f61ad 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java @@ -485,7 +485,7 @@ public class BabyStatisticsManagerFacade { List babyStatisticsManagerWeekAgeGroupQueryModelListResult = new ArrayList<>(); // 从0开始,没有也填充 int index = 0; - for (Integer i = 0; i < 73; i++) { + for (Integer i = 0; i < 40; i++) { try { while (!i.toString().equals(babyStatisticsManagerWeekAgeGroupQueryModelList.get(index).getWeekAge()) && i > Integer.valueOf(babyStatisticsManagerWeekAgeGroupQueryModelList.get(index).getWeekAge())) { index++; @@ -493,19 +493,73 @@ public class BabyStatisticsManagerFacade { } catch (Exception e) { index++; } - if (CollectionUtils.isEmpty(babyStatisticsManagerWeekAgeGroupQueryModelList) || babyStatisticsManagerWeekAgeGroupQueryModelList.size() < index) { - BabyStatisticsManagerWeekAgeGroupQueryModel babyStatisticsManagerWeekAgeGroupQueryModel = new BabyStatisticsManagerWeekAgeGroupQueryModel(); - babyStatisticsManagerWeekAgeGroupQueryModel.setCount("0"); - babyStatisticsManagerWeekAgeGroupQueryModel.setWeekAge(i.toString()); - babyStatisticsManagerWeekAgeGroupQueryModelListResult.add(babyStatisticsManagerWeekAgeGroupQueryModel); - } else if (babyStatisticsManagerWeekAgeGroupQueryModelList.size() > index && (babyStatisticsManagerWeekAgeGroupQueryModelList.get(index) == null || !i.toString().equals(babyStatisticsManagerWeekAgeGroupQueryModelList.get(index).getWeekAge()))) { - BabyStatisticsManagerWeekAgeGroupQueryModel babyStatisticsManagerWeekAgeGroupQueryModel = new BabyStatisticsManagerWeekAgeGroupQueryModel(); - babyStatisticsManagerWeekAgeGroupQueryModel.setCount("0"); - babyStatisticsManagerWeekAgeGroupQueryModel.setWeekAge(i.toString()); - babyStatisticsManagerWeekAgeGroupQueryModelListResult.add(babyStatisticsManagerWeekAgeGroupQueryModel); - } else { - babyStatisticsManagerWeekAgeGroupQueryModelListResult.add(babyStatisticsManagerWeekAgeGroupQueryModelList.get(index)); - index++; + if(i<36) { + if (CollectionUtils.isEmpty(babyStatisticsManagerWeekAgeGroupQueryModelList) || babyStatisticsManagerWeekAgeGroupQueryModelList.size() < index) { + BabyStatisticsManagerWeekAgeGroupQueryModel babyStatisticsManagerWeekAgeGroupQueryModel = new BabyStatisticsManagerWeekAgeGroupQueryModel(); + babyStatisticsManagerWeekAgeGroupQueryModel.setCount("0"); + babyStatisticsManagerWeekAgeGroupQueryModel.setWeekAge(i.toString()); + babyStatisticsManagerWeekAgeGroupQueryModelListResult.add(babyStatisticsManagerWeekAgeGroupQueryModel); + } else if (babyStatisticsManagerWeekAgeGroupQueryModelList.size() > index && (babyStatisticsManagerWeekAgeGroupQueryModelList.get(index) == null || !i.toString().equals(babyStatisticsManagerWeekAgeGroupQueryModelList.get(index).getWeekAge()))) { + BabyStatisticsManagerWeekAgeGroupQueryModel babyStatisticsManagerWeekAgeGroupQueryModel = new BabyStatisticsManagerWeekAgeGroupQueryModel(); + babyStatisticsManagerWeekAgeGroupQueryModel.setCount("0"); + babyStatisticsManagerWeekAgeGroupQueryModel.setWeekAge(i.toString()); + babyStatisticsManagerWeekAgeGroupQueryModelListResult.add(babyStatisticsManagerWeekAgeGroupQueryModel); + } else { + babyStatisticsManagerWeekAgeGroupQueryModelListResult.add(babyStatisticsManagerWeekAgeGroupQueryModelList.get(index)); + index++; + } + }else{ + Integer count=0; + switch (i){ + case 36: + for (BabyStatisticsManagerWeekAgeGroupQueryModel babyStatisticsManagerWeekAgeGroupQueryModel36 : babyStatisticsManagerWeekAgeGroupQueryModelList) { + if(Integer.valueOf(babyStatisticsManagerWeekAgeGroupQueryModel36.getWeekAge())>35&&Integer.valueOf(babyStatisticsManagerWeekAgeGroupQueryModel36.getWeekAge())<48){ + count+= Integer.valueOf(babyStatisticsManagerWeekAgeGroupQueryModel36.getCount()); + } + } + BabyStatisticsManagerWeekAgeGroupQueryModel babyStatisticsManagerWeekAgeGroupQueryModel36 = new BabyStatisticsManagerWeekAgeGroupQueryModel(); + babyStatisticsManagerWeekAgeGroupQueryModel36.setCount(count.toString()); + babyStatisticsManagerWeekAgeGroupQueryModel36.setWeekAge("3岁"); + babyStatisticsManagerWeekAgeGroupQueryModelListResult.add(babyStatisticsManagerWeekAgeGroupQueryModel36); + count=0; + break; + case 37: + for (BabyStatisticsManagerWeekAgeGroupQueryModel babyStatisticsManagerWeekAgeGroupQueryModel37 : babyStatisticsManagerWeekAgeGroupQueryModelList) { + if(Integer.valueOf(babyStatisticsManagerWeekAgeGroupQueryModel37.getWeekAge())>47&&Integer.valueOf(babyStatisticsManagerWeekAgeGroupQueryModel37.getWeekAge())<60){ + count+= Integer.valueOf(babyStatisticsManagerWeekAgeGroupQueryModel37.getCount()); + } + } + BabyStatisticsManagerWeekAgeGroupQueryModel babyStatisticsManagerWeekAgeGroupQueryModel37 = new BabyStatisticsManagerWeekAgeGroupQueryModel(); + babyStatisticsManagerWeekAgeGroupQueryModel37.setCount(count.toString()); + babyStatisticsManagerWeekAgeGroupQueryModel37.setWeekAge("4岁"); + babyStatisticsManagerWeekAgeGroupQueryModelListResult.add(babyStatisticsManagerWeekAgeGroupQueryModel37); + count=0; + break; + case 38: + for (BabyStatisticsManagerWeekAgeGroupQueryModel babyStatisticsManagerWeekAgeGroupQueryModel38 : babyStatisticsManagerWeekAgeGroupQueryModelList) { + if(Integer.valueOf(babyStatisticsManagerWeekAgeGroupQueryModel38.getWeekAge())>59&&Integer.valueOf(babyStatisticsManagerWeekAgeGroupQueryModel38.getWeekAge())<72){ + count+= Integer.valueOf(babyStatisticsManagerWeekAgeGroupQueryModel38.getCount()); + } + } + BabyStatisticsManagerWeekAgeGroupQueryModel babyStatisticsManagerWeekAgeGroupQueryModel38 = new BabyStatisticsManagerWeekAgeGroupQueryModel(); + babyStatisticsManagerWeekAgeGroupQueryModel38.setCount(count.toString()); + babyStatisticsManagerWeekAgeGroupQueryModel38.setWeekAge("5岁"); + babyStatisticsManagerWeekAgeGroupQueryModelListResult.add(babyStatisticsManagerWeekAgeGroupQueryModel38); + count=0; + break; + case 39: + for (BabyStatisticsManagerWeekAgeGroupQueryModel babyStatisticsManagerWeekAgeGroupQueryModel39 : babyStatisticsManagerWeekAgeGroupQueryModelList) { + if(Integer.valueOf(babyStatisticsManagerWeekAgeGroupQueryModel39.getWeekAge())>71){ + count+= Integer.valueOf(babyStatisticsManagerWeekAgeGroupQueryModel39.getCount()); + } + } + BabyStatisticsManagerWeekAgeGroupQueryModel babyStatisticsManagerWeekAgeGroupQueryModel39 = new BabyStatisticsManagerWeekAgeGroupQueryModel(); + babyStatisticsManagerWeekAgeGroupQueryModel39.setCount(count.toString()); + babyStatisticsManagerWeekAgeGroupQueryModel39.setWeekAge("6岁"); + babyStatisticsManagerWeekAgeGroupQueryModelListResult.add(babyStatisticsManagerWeekAgeGroupQueryModel39); + count=0; + break; + } } } Map map = new HashMap();