Commit 765f118580abd7181068aa82c11448552a0919d3
1 parent
c8d17cbdc8
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 30 additions and 6 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java
View file @
765f118
| ... | ... | @@ -510,10 +510,10 @@ |
| 510 | 510 | } |
| 511 | 511 | }else{ |
| 512 | 512 | Integer count=0; |
| 513 | - switch (i){ | |
| 513 | + switch (i){//儿保体检月龄统计用指定左面列表3/4/5/6 岁范围统计 | |
| 514 | 514 | case 36: |
| 515 | 515 | for (BabyStatisticsManagerWeekAgeGroupQueryModel babyStatisticsManagerWeekAgeGroupQueryModel36 : babyStatisticsManagerWeekAgeGroupQueryModelList) { |
| 516 | - if(Integer.valueOf(babyStatisticsManagerWeekAgeGroupQueryModel36.getWeekAge())>35&&Integer.valueOf(babyStatisticsManagerWeekAgeGroupQueryModel36.getWeekAge())<48){ | |
| 516 | + if(Integer.valueOf(babyStatisticsManagerWeekAgeGroupQueryModel36.getWeekAge())>=36&&Integer.valueOf(babyStatisticsManagerWeekAgeGroupQueryModel36.getWeekAge())<=47){ | |
| 517 | 517 | count+= Integer.valueOf(babyStatisticsManagerWeekAgeGroupQueryModel36.getCount()); |
| 518 | 518 | } |
| 519 | 519 | } |
| ... | ... | @@ -525,7 +525,7 @@ |
| 525 | 525 | break; |
| 526 | 526 | case 37: |
| 527 | 527 | for (BabyStatisticsManagerWeekAgeGroupQueryModel babyStatisticsManagerWeekAgeGroupQueryModel37 : babyStatisticsManagerWeekAgeGroupQueryModelList) { |
| 528 | - if(Integer.valueOf(babyStatisticsManagerWeekAgeGroupQueryModel37.getWeekAge())>47&&Integer.valueOf(babyStatisticsManagerWeekAgeGroupQueryModel37.getWeekAge())<60){ | |
| 528 | + if(Integer.valueOf(babyStatisticsManagerWeekAgeGroupQueryModel37.getWeekAge())>=48&&Integer.valueOf(babyStatisticsManagerWeekAgeGroupQueryModel37.getWeekAge())<=59){ | |
| 529 | 529 | count+= Integer.valueOf(babyStatisticsManagerWeekAgeGroupQueryModel37.getCount()); |
| 530 | 530 | } |
| 531 | 531 | } |
| ... | ... | @@ -537,7 +537,7 @@ |
| 537 | 537 | break; |
| 538 | 538 | case 38: |
| 539 | 539 | for (BabyStatisticsManagerWeekAgeGroupQueryModel babyStatisticsManagerWeekAgeGroupQueryModel38 : babyStatisticsManagerWeekAgeGroupQueryModelList) { |
| 540 | - if(Integer.valueOf(babyStatisticsManagerWeekAgeGroupQueryModel38.getWeekAge())>59&&Integer.valueOf(babyStatisticsManagerWeekAgeGroupQueryModel38.getWeekAge())<72){ | |
| 540 | + if(Integer.valueOf(babyStatisticsManagerWeekAgeGroupQueryModel38.getWeekAge())>=60&&Integer.valueOf(babyStatisticsManagerWeekAgeGroupQueryModel38.getWeekAge())<=71){ | |
| 541 | 541 | count+= Integer.valueOf(babyStatisticsManagerWeekAgeGroupQueryModel38.getCount()); |
| 542 | 542 | } |
| 543 | 543 | } |
| ... | ... | @@ -549,7 +549,7 @@ |
| 549 | 549 | break; |
| 550 | 550 | case 39: |
| 551 | 551 | for (BabyStatisticsManagerWeekAgeGroupQueryModel babyStatisticsManagerWeekAgeGroupQueryModel39 : babyStatisticsManagerWeekAgeGroupQueryModelList) { |
| 552 | - if(Integer.valueOf(babyStatisticsManagerWeekAgeGroupQueryModel39.getWeekAge())>71){ | |
| 552 | + if(Integer.valueOf(babyStatisticsManagerWeekAgeGroupQueryModel39.getWeekAge())>=72){ | |
| 553 | 553 | count+= Integer.valueOf(babyStatisticsManagerWeekAgeGroupQueryModel39.getCount()); |
| 554 | 554 | } |
| 555 | 555 | } |
| ... | ... | @@ -588,7 +588,31 @@ |
| 588 | 588 | babyCheckModelQuery.setCheckDateStart(DateUtil.getSNDate(babyStatisticsManagerWeekAgeListRequest.getCheckDate())[0]); |
| 589 | 589 | babyCheckModelQuery.setCheckDateEnd(DateUtil.getSNDate(babyStatisticsManagerWeekAgeListRequest.getCheckDate())[1]); |
| 590 | 590 | } |
| 591 | - babyCheckModelQuery.setCheckMonth(babyStatisticsManagerWeekAgeListRequest.getWeekAge() == null ? null : Integer.valueOf(babyStatisticsManagerWeekAgeListRequest.getWeekAge())); | |
| 591 | + if(StringUtils.isNotEmpty(babyStatisticsManagerWeekAgeListRequest.getWeekAge())&&!babyStatisticsManagerWeekAgeListRequest.getWeekAge().trim().equals("null")){ | |
| 592 | + switch (babyStatisticsManagerWeekAgeListRequest.getWeekAge()){//儿保体检月龄统计用指定3/4/5/6岁范围统计 右面列表 | |
| 593 | + case "3岁": | |
| 594 | + babyCheckModelQuery.setCheckMonthStart(36); | |
| 595 | + babyCheckModelQuery.setCheckMonthEnd(47); | |
| 596 | + break; | |
| 597 | + case "4岁": | |
| 598 | + babyCheckModelQuery.setCheckMonthStart(48); | |
| 599 | + babyCheckModelQuery.setCheckMonthEnd(59); | |
| 600 | + break; | |
| 601 | + case "5岁": | |
| 602 | + babyCheckModelQuery.setCheckMonthStart(60); | |
| 603 | + babyCheckModelQuery.setCheckMonthEnd(71); | |
| 604 | + break; | |
| 605 | + case "6岁": | |
| 606 | + babyCheckModelQuery.setCheckMonthStart(72); | |
| 607 | + break; | |
| 608 | + default: | |
| 609 | + babyCheckModelQuery.setCheckMonth( Integer.valueOf(babyStatisticsManagerWeekAgeListRequest.getWeekAge())); | |
| 610 | + } | |
| 611 | + }else { | |
| 612 | + babyCheckModelQuery.setCheckMonth(null); | |
| 613 | + } | |
| 614 | + | |
| 615 | + | |
| 592 | 616 | if (!babyStatisticsManagerWeekAgeListRequest.isExcel()) { |
| 593 | 617 | babyCheckModelQuery.setLimit(babyStatisticsManagerWeekAgeListRequest.getLimit()); |
| 594 | 618 | babyCheckModelQuery.setPage(babyStatisticsManagerWeekAgeListRequest.getPage()); |