From 604aee3604af68b488329d5f4b63cf7a405df1bc Mon Sep 17 00:00:00 2001 From: wtt Date: Tue, 20 Apr 2021 16:15:18 +0800 Subject: [PATCH] update --- .../operate/web/facade/BabyStatisticsManagerFacade.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) 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 c35eae2..867fcdb 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 @@ -447,16 +447,11 @@ public class BabyStatisticsManagerFacade { List babyStatisticsManagerWeekAgeGroupQueryModelList = new ArrayList<>(); - Integer counts = 0; if (CollectionUtils.isNotEmpty(temp)) { for (HashMap hashMap : temp) { BabyStatisticsManagerWeekAgeGroupQueryModel babyStatisticsManagerWeekAgeGroupQueryModel = new BabyStatisticsManagerWeekAgeGroupQueryModel(); babyStatisticsManagerWeekAgeGroupQueryModel.setWeekAge(hashMap.get("_id") == null ? null : hashMap.get("_id").toString()); babyStatisticsManagerWeekAgeGroupQueryModel.setCount(hashMap.get("count").toString()); - if(hashMap.get("count") !=null && !"0".equals(hashMap.get("count").toString())){ - counts += Integer.parseInt(hashMap.get("count").toString()); - } - babyStatisticsManagerWeekAgeGroupQueryModelList.add(babyStatisticsManagerWeekAgeGroupQueryModel); } } @@ -514,8 +509,15 @@ public class BabyStatisticsManagerFacade { } } Map map = new HashMap(); + Integer counts = 0; + // babyStatisticsManagerWeekAgeGroupResult.setData(babyStatisticsManagerWeekAgeGroupQueryModelListResult); map.put("babyStatisticsManagerWeekAgeGroupQueryModelListResult", babyStatisticsManagerWeekAgeGroupQueryModelListResult); + for (BabyStatisticsManagerWeekAgeGroupQueryModel b:babyStatisticsManagerWeekAgeGroupQueryModelListResult) { + if(StringUtils.isNotEmpty(b.getCount()) && !"0".equals(b.getCount())){ + counts += Integer.parseInt(b.getCount()); + } + } map.put("counts", counts); babyStatisticsManagerWeekAgeGroupResult.setObject(map); babyStatisticsManagerWeekAgeGroupResult.setErrorcode(ErrorCodeConstants.SUCCESS); -- 1.8.3.1