diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index ea0a993..48f3af3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -6437,17 +6437,23 @@ public class BabyBookbuildingFacade { babyCheckModelQuery.setCheckDateEnd(DateUtil.getDayLastSecond(checkDateEnd)); List babyCheckModels = babyCheckService.queryBabyCheckRecord(babyCheckModelQuery); Map result=new HashMap(); - 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; + 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,visitNumber=0; for (BabyCheckModel babyCheckModel : babyCheckModels) { //儿童档案 BabyModelQuery babyModelQuery=new BabyModelQuery(); babyModelQuery.setYn(YnEnums.YES.getId()); babyModelQuery.setId(babyCheckModel.getBuildId()); - if(StringUtils.isNotEmpty(babyProvinceId) && StringUtils.isNotEmpty(babyCityId) && - StringUtils.isNotEmpty(babyAreaId) && StringUtils.isNotEmpty(babyStreetId)){ + if(StringUtils.isNotEmpty(babyProvinceId)){ babyModelQuery.setBabyProvinceId(babyProvinceId); + } + if(StringUtils.isNotEmpty(babyCityId)){ babyModelQuery.setBabyCityId(babyCityId); + } + if(StringUtils.isNotEmpty(babyAreaId)){ babyModelQuery.setBabyAreaId(babyAreaId); + } + if(StringUtils.isNotEmpty(babyStreetId)){ babyModelQuery.setBabyStreetId(babyStreetId); } List babyModels = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery); @@ -6457,68 +6463,102 @@ public class BabyBookbuildingFacade { switch (babyCheckModel.getTcType()){ case 1: info.put("number", ++number1); - info.put("money", MathUtil.multiply((double) number1, 19d, 2)); + info.put("money", 19); result.put("month_1",info); break; case 3: info.put("number", ++number3); - info.put("money", MathUtil.multiply((double) number3, 22d, 2)); + info.put("money",22); result.put("month_3",info); break; case 6: info.put("number", ++number6); - info.put("money", MathUtil.multiply((double) number6, 22d, 2)); + info.put("money", 22); result.put("month_6",info); break; case 8: info.put("number", ++number8); - info.put("money", MathUtil.multiply((double) number8, 22d, 2)); + info.put("money", 22); result.put("month_8",info); break; case 12: info.put("number", ++number12); - info.put("money", MathUtil.multiply((double) number12, 22d, 2)); + info.put("money", 22); result.put("month_12",info); break; case 18: info.put("number", ++number18); - info.put("money", MathUtil.multiply((double) number18, 34.5, 2)); + info.put("money", 34.5); result.put("month_18",info); break; case 24: info.put("number", ++number24); - info.put("money", MathUtil.multiply((double) number24, 43.5, 2)); + info.put("money", 34.5); result.put("month_24",info); break; case 30: info.put("number", ++number30); - info.put("money", MathUtil.multiply((double) number30, 26d, 2)); + info.put("money",26); result.put("month_30",info); break; case 36: info.put("number", ++number36); - info.put("money", MathUtil.multiply((double) number36, 26d, 2)); + info.put("money",26); result.put("month_36",info); break; case 48: info.put("number", ++number48); - info.put("money", MathUtil.multiply((double) number48, 38d, 2)); + info.put("money", 38); result.put("month_48",info); break; case 60: info.put("number", ++number60); - info.put("money", MathUtil.multiply((double) number60, 38d, 2)); + info.put("money", 38); result.put("month_60",info); break; case 72: info.put("number", ++number72); - info.put("money", MathUtil.multiply((double) number72, 38d, 2)); + info.put("money",38); result.put("month_72",info); break; } } } } + + List newbornVisits = mongoTemplate.find(Query.query(Criteria.where("yn").is("1") + .and("checkTime").gte(checkDateStart).lte(checkDateEnd)), NewbornVisit.class); + if (CollectionUtils.isNotEmpty(newbornVisits)) + { + Map info=new HashMap(); + for (NewbornVisit visit : newbornVisits) + { + //儿童档案 + BabyModelQuery babyModelQuery=new BabyModelQuery(); + babyModelQuery.setYn(YnEnums.YES.getId()); + babyModelQuery.setId(visit.getBabyId()); + if(StringUtils.isNotEmpty(babyProvinceId)){ + babyModelQuery.setBabyProvinceId(babyProvinceId); + } + if(StringUtils.isNotEmpty(babyCityId)){ + babyModelQuery.setBabyCityId(babyCityId); + } + if(StringUtils.isNotEmpty(babyAreaId)){ + babyModelQuery.setBabyAreaId(babyAreaId); + } + if(StringUtils.isNotEmpty(babyStreetId)){ + babyModelQuery.setBabyStreetId(babyStreetId); + } + List vbabyModels = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery); + if (CollectionUtils.isNotEmpty(vbabyModels)) + { + visitNumber++; + } + } + info.put("number", visitNumber); + info.put("money",30.5); + result.put("visit",info); + } return new BaseObjectResponse().setData(result); }