From ec2120fa7a3c6383b6f5939e6f99565d7bdb468e Mon Sep 17 00:00:00 2001
From: shiyang <wtt@qq.com>
Date: Wed, 11 Aug 2021 11:31:23 +0800
Subject: [PATCH] udate

---
 .../lyms/platform/common/enums/DatePointEnums.java   |  6 +++++-
 .../operate/web/controller/BabyBuildController.java  |  6 ++++++
 .../web/facade/BabyStatisticsManagerFacade.java      | 20 ++++++++++++++++++--
 3 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/DatePointEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/DatePointEnums.java
index 5205784..8ec9fcb 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/enums/DatePointEnums.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/enums/DatePointEnums.java
@@ -89,7 +89,7 @@ public enum DatePointEnums {
         List<Map> list = new ArrayList<>();
         for (DatePointEnums e : DatePointEnums.values()) {
             if(e.getPid() == pid) {
-                for(int i = 0 ; i <= 39 ;i++)
+                for(int i = 0 ; i <= 40 ;i++)
                 {
                     Map rootMap = new HashMap();
                     switch (i){
@@ -109,6 +109,10 @@ public enum DatePointEnums {
                             rootMap.put("id", i);
                             rootMap.put("name", "6岁");
                             break;
+                        case 40:
+                            rootMap.put("id", i);
+                            rootMap.put("name", ">6岁");
+                            break;
                         default:
                             rootMap.put("id", i);
                             rootMap.put("name", i+e.getName());
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java
index d8544d2..3f83e8e 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java
@@ -301,6 +301,9 @@ public class BabyBuildController extends BaseController {
             case 39:
                 request.setMonthAgeStart(72);
                 break;
+            case 40:
+                request.setMonthAgeStart(84);
+                break;
             default:
                 request.setMonthAgeStart(startMonthAge);
         }
@@ -315,6 +318,9 @@ public class BabyBuildController extends BaseController {
                 request.setMonthAgeEnd(71);
                 break;
             case 39:
+                request.setMonthAgeEnd(83);
+                break;
+            case 40:
                 request.setMonthAgeEnd(null);
                 break;
             default:
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 6603ee2..b2d1087 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<BabyStatisticsManagerWeekAgeGroupQueryModel> babyStatisticsManagerWeekAgeGroupQueryModelListResult = new ArrayList<>();
         // 从0开始，没有也填充
         int index = 0;
-        for (Integer i = 0; i < 40; i++) {
+        for (Integer i = 0; i < 41; i++) {
             try {
                 while (!i.toString().equals(babyStatisticsManagerWeekAgeGroupQueryModelList.get(index).getWeekAge()) && i > Integer.valueOf(babyStatisticsManagerWeekAgeGroupQueryModelList.get(index).getWeekAge())) {
                     index++;
@@ -549,7 +549,7 @@ public class BabyStatisticsManagerFacade {
                         break;
                     case 39:
                         for (BabyStatisticsManagerWeekAgeGroupQueryModel babyStatisticsManagerWeekAgeGroupQueryModel39 : babyStatisticsManagerWeekAgeGroupQueryModelList) {
-                            if(Integer.valueOf(babyStatisticsManagerWeekAgeGroupQueryModel39.getWeekAge())>=72){
+                            if(Integer.valueOf(babyStatisticsManagerWeekAgeGroupQueryModel39.getWeekAge())>=72&&Integer.valueOf(babyStatisticsManagerWeekAgeGroupQueryModel39.getWeekAge())<=83){
                                 count+= Integer.valueOf(babyStatisticsManagerWeekAgeGroupQueryModel39.getCount());
                             }
                         }
@@ -559,6 +559,18 @@ public class BabyStatisticsManagerFacade {
                         babyStatisticsManagerWeekAgeGroupQueryModelListResult.add(babyStatisticsManagerWeekAgeGroupQueryModel39);
                         count=0;
                         break;
+                    case 40:
+                        for (BabyStatisticsManagerWeekAgeGroupQueryModel babyStatisticsManagerWeekAgeGroupQueryModel40 : babyStatisticsManagerWeekAgeGroupQueryModelList) {
+                            if(Integer.valueOf(babyStatisticsManagerWeekAgeGroupQueryModel40.getWeekAge())>=84){
+                                count+= Integer.valueOf(babyStatisticsManagerWeekAgeGroupQueryModel40.getCount());
+                            }
+                        }
+                        BabyStatisticsManagerWeekAgeGroupQueryModel babyStatisticsManagerWeekAgeGroupQueryModel40 = new BabyStatisticsManagerWeekAgeGroupQueryModel();
+                        babyStatisticsManagerWeekAgeGroupQueryModel40.setCount(count.toString());
+                        babyStatisticsManagerWeekAgeGroupQueryModel40.setWeekAge(">6岁");
+                        babyStatisticsManagerWeekAgeGroupQueryModelListResult.add(babyStatisticsManagerWeekAgeGroupQueryModel40);
+                        count=0;
+                        break;
                 }
             }
         }
@@ -604,6 +616,10 @@ public class BabyStatisticsManagerFacade {
                     break;
                 case "6岁":
                     babyCheckModelQuery.setCheckMonthStart(72);
+                    babyCheckModelQuery.setCheckMonthEnd(83);
+                    break;
+                case ">6岁":
+                    babyCheckModelQuery.setCheckMonthStart(84);
                     break;
                 default:
                     babyCheckModelQuery.setCheckMonth( Integer.valueOf(babyStatisticsManagerWeekAgeListRequest.getWeekAge()));
-- 
1.8.3.1