jiangjiazhi / regional-platform

Download as
Browse Code »

Commit c8d17cbdc87416a310e6913db652e177498fef08

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

update

Showing 1 changed file with 68 additions and 14 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java View file @ c8d17cb
... ... @@ -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 < 73; i++) {
  488 + for (Integer i = 0; i < 40; i++) {
489 489 try {
490 490 while (!i.toString().equals(babyStatisticsManagerWeekAgeGroupQueryModelList.get(index).getWeekAge()) && i > Integer.valueOf(babyStatisticsManagerWeekAgeGroupQueryModelList.get(index).getWeekAge())) {
491 491 index++;
... ... @@ -493,19 +493,73 @@
493 493 } catch (Exception e) {
494 494 index++;
495 495 }
496   - if (CollectionUtils.isEmpty(babyStatisticsManagerWeekAgeGroupQueryModelList) || babyStatisticsManagerWeekAgeGroupQueryModelList.size() < index) {
497   - BabyStatisticsManagerWeekAgeGroupQueryModel babyStatisticsManagerWeekAgeGroupQueryModel = new BabyStatisticsManagerWeekAgeGroupQueryModel();
498   - babyStatisticsManagerWeekAgeGroupQueryModel.setCount("0");
499   - babyStatisticsManagerWeekAgeGroupQueryModel.setWeekAge(i.toString());
500   - babyStatisticsManagerWeekAgeGroupQueryModelListResult.add(babyStatisticsManagerWeekAgeGroupQueryModel);
501   - } else if (babyStatisticsManagerWeekAgeGroupQueryModelList.size() > index && (babyStatisticsManagerWeekAgeGroupQueryModelList.get(index) == null || !i.toString().equals(babyStatisticsManagerWeekAgeGroupQueryModelList.get(index).getWeekAge()))) {
502   - BabyStatisticsManagerWeekAgeGroupQueryModel babyStatisticsManagerWeekAgeGroupQueryModel = new BabyStatisticsManagerWeekAgeGroupQueryModel();
503   - babyStatisticsManagerWeekAgeGroupQueryModel.setCount("0");
504   - babyStatisticsManagerWeekAgeGroupQueryModel.setWeekAge(i.toString());
505   - babyStatisticsManagerWeekAgeGroupQueryModelListResult.add(babyStatisticsManagerWeekAgeGroupQueryModel);
506   - } else {
507   - babyStatisticsManagerWeekAgeGroupQueryModelListResult.add(babyStatisticsManagerWeekAgeGroupQueryModelList.get(index));
508   - index++;
  496 + if(i<36) {
  497 + if (CollectionUtils.isEmpty(babyStatisticsManagerWeekAgeGroupQueryModelList) || babyStatisticsManagerWeekAgeGroupQueryModelList.size() < index) {
  498 + BabyStatisticsManagerWeekAgeGroupQueryModel babyStatisticsManagerWeekAgeGroupQueryModel = new BabyStatisticsManagerWeekAgeGroupQueryModel();
  499 + babyStatisticsManagerWeekAgeGroupQueryModel.setCount("0");
  500 + babyStatisticsManagerWeekAgeGroupQueryModel.setWeekAge(i.toString());
  501 + babyStatisticsManagerWeekAgeGroupQueryModelListResult.add(babyStatisticsManagerWeekAgeGroupQueryModel);
  502 + } else if (babyStatisticsManagerWeekAgeGroupQueryModelList.size() > index && (babyStatisticsManagerWeekAgeGroupQueryModelList.get(index) == null || !i.toString().equals(babyStatisticsManagerWeekAgeGroupQueryModelList.get(index).getWeekAge()))) {
  503 + BabyStatisticsManagerWeekAgeGroupQueryModel babyStatisticsManagerWeekAgeGroupQueryModel = new BabyStatisticsManagerWeekAgeGroupQueryModel();
  504 + babyStatisticsManagerWeekAgeGroupQueryModel.setCount("0");
  505 + babyStatisticsManagerWeekAgeGroupQueryModel.setWeekAge(i.toString());
  506 + babyStatisticsManagerWeekAgeGroupQueryModelListResult.add(babyStatisticsManagerWeekAgeGroupQueryModel);
  507 + } else {
  508 + babyStatisticsManagerWeekAgeGroupQueryModelListResult.add(babyStatisticsManagerWeekAgeGroupQueryModelList.get(index));
  509 + index++;
  510 + }
  511 + }else{
  512 + Integer count=0;
  513 + switch (i){
  514 + case 36:
  515 + for (BabyStatisticsManagerWeekAgeGroupQueryModel babyStatisticsManagerWeekAgeGroupQueryModel36 : babyStatisticsManagerWeekAgeGroupQueryModelList) {
  516 + if(Integer.valueOf(babyStatisticsManagerWeekAgeGroupQueryModel36.getWeekAge())>35&&Integer.valueOf(babyStatisticsManagerWeekAgeGroupQueryModel36.getWeekAge())<48){
  517 + count+= Integer.valueOf(babyStatisticsManagerWeekAgeGroupQueryModel36.getCount());
  518 + }
  519 + }
  520 + BabyStatisticsManagerWeekAgeGroupQueryModel babyStatisticsManagerWeekAgeGroupQueryModel36 = new BabyStatisticsManagerWeekAgeGroupQueryModel();
  521 + babyStatisticsManagerWeekAgeGroupQueryModel36.setCount(count.toString());
  522 + babyStatisticsManagerWeekAgeGroupQueryModel36.setWeekAge("3岁");
  523 + babyStatisticsManagerWeekAgeGroupQueryModelListResult.add(babyStatisticsManagerWeekAgeGroupQueryModel36);
  524 + count=0;
  525 + break;
  526 + case 37:
  527 + for (BabyStatisticsManagerWeekAgeGroupQueryModel babyStatisticsManagerWeekAgeGroupQueryModel37 : babyStatisticsManagerWeekAgeGroupQueryModelList) {
  528 + if(Integer.valueOf(babyStatisticsManagerWeekAgeGroupQueryModel37.getWeekAge())>47&&Integer.valueOf(babyStatisticsManagerWeekAgeGroupQueryModel37.getWeekAge())<60){
  529 + count+= Integer.valueOf(babyStatisticsManagerWeekAgeGroupQueryModel37.getCount());
  530 + }
  531 + }
  532 + BabyStatisticsManagerWeekAgeGroupQueryModel babyStatisticsManagerWeekAgeGroupQueryModel37 = new BabyStatisticsManagerWeekAgeGroupQueryModel();
  533 + babyStatisticsManagerWeekAgeGroupQueryModel37.setCount(count.toString());
  534 + babyStatisticsManagerWeekAgeGroupQueryModel37.setWeekAge("4岁");
  535 + babyStatisticsManagerWeekAgeGroupQueryModelListResult.add(babyStatisticsManagerWeekAgeGroupQueryModel37);
  536 + count=0;
  537 + break;
  538 + case 38:
  539 + for (BabyStatisticsManagerWeekAgeGroupQueryModel babyStatisticsManagerWeekAgeGroupQueryModel38 : babyStatisticsManagerWeekAgeGroupQueryModelList) {
  540 + if(Integer.valueOf(babyStatisticsManagerWeekAgeGroupQueryModel38.getWeekAge())>59&&Integer.valueOf(babyStatisticsManagerWeekAgeGroupQueryModel38.getWeekAge())<72){
  541 + count+= Integer.valueOf(babyStatisticsManagerWeekAgeGroupQueryModel38.getCount());
  542 + }
  543 + }
  544 + BabyStatisticsManagerWeekAgeGroupQueryModel babyStatisticsManagerWeekAgeGroupQueryModel38 = new BabyStatisticsManagerWeekAgeGroupQueryModel();
  545 + babyStatisticsManagerWeekAgeGroupQueryModel38.setCount(count.toString());
  546 + babyStatisticsManagerWeekAgeGroupQueryModel38.setWeekAge("5岁");
  547 + babyStatisticsManagerWeekAgeGroupQueryModelListResult.add(babyStatisticsManagerWeekAgeGroupQueryModel38);
  548 + count=0;
  549 + break;
  550 + case 39:
  551 + for (BabyStatisticsManagerWeekAgeGroupQueryModel babyStatisticsManagerWeekAgeGroupQueryModel39 : babyStatisticsManagerWeekAgeGroupQueryModelList) {
  552 + if(Integer.valueOf(babyStatisticsManagerWeekAgeGroupQueryModel39.getWeekAge())>71){
  553 + count+= Integer.valueOf(babyStatisticsManagerWeekAgeGroupQueryModel39.getCount());
  554 + }
  555 + }
  556 + BabyStatisticsManagerWeekAgeGroupQueryModel babyStatisticsManagerWeekAgeGroupQueryModel39 = new BabyStatisticsManagerWeekAgeGroupQueryModel();
  557 + babyStatisticsManagerWeekAgeGroupQueryModel39.setCount(count.toString());
  558 + babyStatisticsManagerWeekAgeGroupQueryModel39.setWeekAge("6岁");
  559 + babyStatisticsManagerWeekAgeGroupQueryModelListResult.add(babyStatisticsManagerWeekAgeGroupQueryModel39);
  560 + count=0;
  561 + break;
  562 + }
509 563 }
510 564 }
511 565 Map map = new HashMap();