Commit f142466d69aa87ea791e9e0b7696e4d91986921d
1 parent
5dd89de4c1
Exists in
master
and in
6 other branches
儿童保健
Showing 1 changed file with 55 additions and 15 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
View file @
f142466
... | ... | @@ -6437,17 +6437,23 @@ |
6437 | 6437 | babyCheckModelQuery.setCheckDateEnd(DateUtil.getDayLastSecond(checkDateEnd)); |
6438 | 6438 | List<BabyCheckModel> babyCheckModels = babyCheckService.queryBabyCheckRecord(babyCheckModelQuery); |
6439 | 6439 | Map result=new HashMap(); |
6440 | - int number1=0,number3=0,number6=0,number8=0,number12=0,number18=0,number24=0,number30=0,number36=0,number48=0,number60=0,number72=0; | |
6440 | + int number1=0,number3=0,number6=0,number8=0,number12=0,number18=0,number24=0, | |
6441 | + number30=0,number36=0,number48=0,number60=0,number72=0,visitNumber=0; | |
6441 | 6442 | for (BabyCheckModel babyCheckModel : babyCheckModels) { |
6442 | 6443 | //儿童档案 |
6443 | 6444 | BabyModelQuery babyModelQuery=new BabyModelQuery(); |
6444 | 6445 | babyModelQuery.setYn(YnEnums.YES.getId()); |
6445 | 6446 | babyModelQuery.setId(babyCheckModel.getBuildId()); |
6446 | - if(StringUtils.isNotEmpty(babyProvinceId) && StringUtils.isNotEmpty(babyCityId) && | |
6447 | - StringUtils.isNotEmpty(babyAreaId) && StringUtils.isNotEmpty(babyStreetId)){ | |
6447 | + if(StringUtils.isNotEmpty(babyProvinceId)){ | |
6448 | 6448 | babyModelQuery.setBabyProvinceId(babyProvinceId); |
6449 | + } | |
6450 | + if(StringUtils.isNotEmpty(babyCityId)){ | |
6449 | 6451 | babyModelQuery.setBabyCityId(babyCityId); |
6452 | + } | |
6453 | + if(StringUtils.isNotEmpty(babyAreaId)){ | |
6450 | 6454 | babyModelQuery.setBabyAreaId(babyAreaId); |
6455 | + } | |
6456 | + if(StringUtils.isNotEmpty(babyStreetId)){ | |
6451 | 6457 | babyModelQuery.setBabyStreetId(babyStreetId); |
6452 | 6458 | } |
6453 | 6459 | List<BabyModel> babyModels = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery); |
6454 | 6460 | |
6455 | 6461 | |
6456 | 6462 | |
6457 | 6463 | |
6458 | 6464 | |
6459 | 6465 | |
6460 | 6466 | |
6461 | 6467 | |
6462 | 6468 | |
6463 | 6469 | |
6464 | 6470 | |
6465 | 6471 | |
... | ... | @@ -6457,67 +6463,101 @@ |
6457 | 6463 | switch (babyCheckModel.getTcType()){ |
6458 | 6464 | case 1: |
6459 | 6465 | info.put("number", ++number1); |
6460 | - info.put("money", MathUtil.multiply((double) number1, 19d, 2)); | |
6466 | + info.put("money", 19); | |
6461 | 6467 | result.put("month_1",info); |
6462 | 6468 | break; |
6463 | 6469 | case 3: |
6464 | 6470 | info.put("number", ++number3); |
6465 | - info.put("money", MathUtil.multiply((double) number3, 22d, 2)); | |
6471 | + info.put("money",22); | |
6466 | 6472 | result.put("month_3",info); |
6467 | 6473 | break; |
6468 | 6474 | case 6: |
6469 | 6475 | info.put("number", ++number6); |
6470 | - info.put("money", MathUtil.multiply((double) number6, 22d, 2)); | |
6476 | + info.put("money", 22); | |
6471 | 6477 | result.put("month_6",info); |
6472 | 6478 | break; |
6473 | 6479 | case 8: |
6474 | 6480 | info.put("number", ++number8); |
6475 | - info.put("money", MathUtil.multiply((double) number8, 22d, 2)); | |
6481 | + info.put("money", 22); | |
6476 | 6482 | result.put("month_8",info); |
6477 | 6483 | break; |
6478 | 6484 | case 12: |
6479 | 6485 | info.put("number", ++number12); |
6480 | - info.put("money", MathUtil.multiply((double) number12, 22d, 2)); | |
6486 | + info.put("money", 22); | |
6481 | 6487 | result.put("month_12",info); |
6482 | 6488 | break; |
6483 | 6489 | case 18: |
6484 | 6490 | info.put("number", ++number18); |
6485 | - info.put("money", MathUtil.multiply((double) number18, 34.5, 2)); | |
6491 | + info.put("money", 34.5); | |
6486 | 6492 | result.put("month_18",info); |
6487 | 6493 | break; |
6488 | 6494 | case 24: |
6489 | 6495 | info.put("number", ++number24); |
6490 | - info.put("money", MathUtil.multiply((double) number24, 43.5, 2)); | |
6496 | + info.put("money", 34.5); | |
6491 | 6497 | result.put("month_24",info); |
6492 | 6498 | break; |
6493 | 6499 | case 30: |
6494 | 6500 | info.put("number", ++number30); |
6495 | - info.put("money", MathUtil.multiply((double) number30, 26d, 2)); | |
6501 | + info.put("money",26); | |
6496 | 6502 | result.put("month_30",info); |
6497 | 6503 | break; |
6498 | 6504 | case 36: |
6499 | 6505 | info.put("number", ++number36); |
6500 | - info.put("money", MathUtil.multiply((double) number36, 26d, 2)); | |
6506 | + info.put("money",26); | |
6501 | 6507 | result.put("month_36",info); |
6502 | 6508 | break; |
6503 | 6509 | case 48: |
6504 | 6510 | info.put("number", ++number48); |
6505 | - info.put("money", MathUtil.multiply((double) number48, 38d, 2)); | |
6511 | + info.put("money", 38); | |
6506 | 6512 | result.put("month_48",info); |
6507 | 6513 | break; |
6508 | 6514 | case 60: |
6509 | 6515 | info.put("number", ++number60); |
6510 | - info.put("money", MathUtil.multiply((double) number60, 38d, 2)); | |
6516 | + info.put("money", 38); | |
6511 | 6517 | result.put("month_60",info); |
6512 | 6518 | break; |
6513 | 6519 | case 72: |
6514 | 6520 | info.put("number", ++number72); |
6515 | - info.put("money", MathUtil.multiply((double) number72, 38d, 2)); | |
6521 | + info.put("money",38); | |
6516 | 6522 | result.put("month_72",info); |
6517 | 6523 | break; |
6518 | 6524 | } |
6519 | 6525 | } |
6520 | 6526 | } |
6527 | + } | |
6528 | + | |
6529 | + List<NewbornVisit> newbornVisits = mongoTemplate.find(Query.query(Criteria.where("yn").is("1") | |
6530 | + .and("checkTime").gte(checkDateStart).lte(checkDateEnd)), NewbornVisit.class); | |
6531 | + if (CollectionUtils.isNotEmpty(newbornVisits)) | |
6532 | + { | |
6533 | + Map info=new HashMap(); | |
6534 | + for (NewbornVisit visit : newbornVisits) | |
6535 | + { | |
6536 | + //儿童档案 | |
6537 | + BabyModelQuery babyModelQuery=new BabyModelQuery(); | |
6538 | + babyModelQuery.setYn(YnEnums.YES.getId()); | |
6539 | + babyModelQuery.setId(visit.getBabyId()); | |
6540 | + if(StringUtils.isNotEmpty(babyProvinceId)){ | |
6541 | + babyModelQuery.setBabyProvinceId(babyProvinceId); | |
6542 | + } | |
6543 | + if(StringUtils.isNotEmpty(babyCityId)){ | |
6544 | + babyModelQuery.setBabyCityId(babyCityId); | |
6545 | + } | |
6546 | + if(StringUtils.isNotEmpty(babyAreaId)){ | |
6547 | + babyModelQuery.setBabyAreaId(babyAreaId); | |
6548 | + } | |
6549 | + if(StringUtils.isNotEmpty(babyStreetId)){ | |
6550 | + babyModelQuery.setBabyStreetId(babyStreetId); | |
6551 | + } | |
6552 | + List<BabyModel> vbabyModels = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery); | |
6553 | + if (CollectionUtils.isNotEmpty(vbabyModels)) | |
6554 | + { | |
6555 | + visitNumber++; | |
6556 | + } | |
6557 | + } | |
6558 | + info.put("number", visitNumber); | |
6559 | + info.put("money",30.5); | |
6560 | + result.put("visit",info); | |
6521 | 6561 | } |
6522 | 6562 | return new BaseObjectResponse().setData(result); |
6523 | 6563 | } |