From 48d76ab05561e802d509e4c5ff93c369857c4aa0 Mon Sep 17 00:00:00 2001
From: wtt <wtt@qq.com>
Date: Tue, 20 Apr 2021 14:15:27 +0800
Subject: [PATCH] update

---
 .../web/controller/BabyStatisticsManagerController.java     | 13 ++++++++++---
 .../operate/web/facade/BabyStatisticsManagerFacade.java     | 12 ++++++++++--
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyStatisticsManagerController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyStatisticsManagerController.java
index 8819bd6..9fe21b5 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyStatisticsManagerController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyStatisticsManagerController.java
@@ -6,6 +6,7 @@ import com.lyms.platform.common.base.LoginContext;
 import com.lyms.platform.common.constants.ErrorCodeConstants;
 import com.lyms.platform.common.result.BaseListResponse;
 import com.lyms.platform.common.result.BaseObjectResponse;
+import com.lyms.platform.common.result.BaseResponse;
 import com.lyms.platform.common.utils.*;
 import com.lyms.platform.operate.web.facade.AutoMatchFacade;
 import com.lyms.platform.operate.web.facade.BabyStatisticsManagerFacade;
@@ -212,10 +213,10 @@ public class BabyStatisticsManagerController extends BaseController {
      * @createTime 2017年01月09日 15时33分
      * @discription 体检月龄统计左边
      */
-    @TokenRequired
+   /*   @TokenRequired
     @ResponseBody
     @RequestMapping(value = "babyStatisticsManagerWeekAgeGroup", method = RequestMethod.POST, consumes = "application/json")
-    public BaseListResponse babyStatisticsManagerWeekAgeGroup(HttpServletRequest httpServletRequest, @RequestBody BabyStatisticsManagerWeekAgeGroupRequest babyStatisticsManagerWeekAgeGroupRequest) {
+  public BaseListResponse babyStatisticsManagerWeekAgeGroup(HttpServletRequest httpServletRequest, @RequestBody BabyStatisticsManagerWeekAgeGroupRequest babyStatisticsManagerWeekAgeGroupRequest) {
         BaseListResponse baseListResponse;
         try {
             babyStatisticsManagerWeekAgeGroupRequest.setOperatorId(((LoginContext) httpServletRequest.getAttribute("loginContext")).getId());
@@ -230,8 +231,14 @@ public class BabyStatisticsManagerController extends BaseController {
             ExceptionUtils.catchException(e, "babyStatisticsManagerWeekAgeGroup异常");
         }
         return baseListResponse;
+    }*/
+    @TokenRequired
+    @ResponseBody
+    @RequestMapping(value = "babyStatisticsManagerWeekAgeGroup", method = RequestMethod.POST, consumes = "application/json")
+    public BaseResponse babyStatisticsManagerWeekAgeGroup(HttpServletRequest httpServletRequest, @RequestBody BabyStatisticsManagerWeekAgeGroupRequest babyStatisticsManagerWeekAgeGroupRequest) {
+        babyStatisticsManagerWeekAgeGroupRequest.setOperatorId(((LoginContext) httpServletRequest.getAttribute("loginContext")).getId());
+        return babyStatisticsManagerFacade.babyStatisticsManagerWeekAgeGroup(babyStatisticsManagerWeekAgeGroupRequest);
     }
-
     /**
      * @auther HuJiaqi
      * @createTime 2017年01月09日 16时34分
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 d15f8e4..c35eae2 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,11 +447,16 @@ public class BabyStatisticsManagerFacade {
 
         List<BabyStatisticsManagerWeekAgeGroupQueryModel> 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);
             }
         }
@@ -508,8 +513,11 @@ public class BabyStatisticsManagerFacade {
                 index++;
             }
         }
-
-        babyStatisticsManagerWeekAgeGroupResult.setData(babyStatisticsManagerWeekAgeGroupQueryModelListResult);
+        Map map = new HashMap();
+//        babyStatisticsManagerWeekAgeGroupResult.setData(babyStatisticsManagerWeekAgeGroupQueryModelListResult);
+        map.put("babyStatisticsManagerWeekAgeGroupQueryModelListResult", babyStatisticsManagerWeekAgeGroupQueryModelListResult);
+        map.put("counts", counts);
+        babyStatisticsManagerWeekAgeGroupResult.setObject(map);
         babyStatisticsManagerWeekAgeGroupResult.setErrorcode(ErrorCodeConstants.SUCCESS);
         babyStatisticsManagerWeekAgeGroupResult.setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION);
         return babyStatisticsManagerWeekAgeGroupResult;
-- 
1.8.3.1