jiangjiazhi / regional-platform

Download as
Browse Code »

Commit ec2120fa7a3c6383b6f5939e6f99565d7bdb468e

Authored by shiyang
1 parent 284bcae661
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

udate

Showing 3 changed files with 29 additions and 3 deletions

platform-common/src/main/java/com/lyms/platform/common/enums/DatePointEnums.java View file @ ec2120f
... ... @@ -89,7 +89,7 @@
89 89 List<Map> list = new ArrayList<>();
90 90 for (DatePointEnums e : DatePointEnums.values()) {
91 91 if(e.getPid() == pid) {
92   - for(int i = 0 ; i <= 39 ;i++)
  92 + for(int i = 0 ; i <= 40 ;i++)
93 93 {
94 94 Map rootMap = new HashMap();
95 95 switch (i){
... ... @@ -108,6 +108,10 @@
108 108 case 39:
109 109 rootMap.put("id", i);
110 110 rootMap.put("name", "6岁");
  111 + break;
  112 + case 40:
  113 + rootMap.put("id", i);
  114 + rootMap.put("name", ">6岁");
111 115 break;
112 116 default:
113 117 rootMap.put("id", i);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java View file @ ec2120f
... ... @@ -301,6 +301,9 @@
301 301 case 39:
302 302 request.setMonthAgeStart(72);
303 303 break;
  304 + case 40:
  305 + request.setMonthAgeStart(84);
  306 + break;
304 307 default:
305 308 request.setMonthAgeStart(startMonthAge);
306 309 }
... ... @@ -315,6 +318,9 @@
315 318 request.setMonthAgeEnd(71);
316 319 break;
317 320 case 39:
  321 + request.setMonthAgeEnd(83);
  322 + break;
  323 + case 40:
318 324 request.setMonthAgeEnd(null);
319 325 break;
320 326 default:
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java View file @ ec2120f
... ... @@ -485,7 +485,7 @@
485 485 List<BabyStatisticsManagerWeekAgeGroupQueryModel> babyStatisticsManagerWeekAgeGroupQueryModelListResult = new ArrayList<>();
486 486 // 从0开始，没有也填充
487 487 int index = 0;
488   - for (Integer i = 0; i < 40; i++) {
  488 + for (Integer i = 0; i < 41; i++) {
489 489 try {
490 490 while (!i.toString().equals(babyStatisticsManagerWeekAgeGroupQueryModelList.get(index).getWeekAge()) && i > Integer.valueOf(babyStatisticsManagerWeekAgeGroupQueryModelList.get(index).getWeekAge())) {
491 491 index++;
... ... @@ -549,7 +549,7 @@
549 549 break;
550 550 case 39:
551 551 for (BabyStatisticsManagerWeekAgeGroupQueryModel babyStatisticsManagerWeekAgeGroupQueryModel39 : babyStatisticsManagerWeekAgeGroupQueryModelList) {
552   - if(Integer.valueOf(babyStatisticsManagerWeekAgeGroupQueryModel39.getWeekAge())>=72){
  552 + if(Integer.valueOf(babyStatisticsManagerWeekAgeGroupQueryModel39.getWeekAge())>=72&&Integer.valueOf(babyStatisticsManagerWeekAgeGroupQueryModel39.getWeekAge())<=83){
553 553 count+= Integer.valueOf(babyStatisticsManagerWeekAgeGroupQueryModel39.getCount());
554 554 }
555 555 }
... ... @@ -559,6 +559,18 @@
559 559 babyStatisticsManagerWeekAgeGroupQueryModelListResult.add(babyStatisticsManagerWeekAgeGroupQueryModel39);
560 560 count=0;
561 561 break;
  562 + case 40:
  563 + for (BabyStatisticsManagerWeekAgeGroupQueryModel babyStatisticsManagerWeekAgeGroupQueryModel40 : babyStatisticsManagerWeekAgeGroupQueryModelList) {
  564 + if(Integer.valueOf(babyStatisticsManagerWeekAgeGroupQueryModel40.getWeekAge())>=84){
  565 + count+= Integer.valueOf(babyStatisticsManagerWeekAgeGroupQueryModel40.getCount());
  566 + }
  567 + }
  568 + BabyStatisticsManagerWeekAgeGroupQueryModel babyStatisticsManagerWeekAgeGroupQueryModel40 = new BabyStatisticsManagerWeekAgeGroupQueryModel();
  569 + babyStatisticsManagerWeekAgeGroupQueryModel40.setCount(count.toString());
  570 + babyStatisticsManagerWeekAgeGroupQueryModel40.setWeekAge(">6岁");
  571 + babyStatisticsManagerWeekAgeGroupQueryModelListResult.add(babyStatisticsManagerWeekAgeGroupQueryModel40);
  572 + count=0;
  573 + break;
562 574 }
563 575 }
564 576 }
... ... @@ -604,6 +616,10 @@
604 616 break;
605 617 case "6岁":
606 618 babyCheckModelQuery.setCheckMonthStart(72);
  619 + babyCheckModelQuery.setCheckMonthEnd(83);
  620 + break;
  621 + case ">6岁":
  622 + babyCheckModelQuery.setCheckMonthStart(84);
607 623 break;
608 624 default:
609 625 babyCheckModelQuery.setCheckMonth( Integer.valueOf(babyStatisticsManagerWeekAgeListRequest.getWeekAge()));