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 5ea255f..b7d1bac 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 @@ -2161,7 +2161,6 @@ public class BabyBookbuildingFacade { babyQuery.setHospitalId(hospitalId); babyQuery.setYn(YnEnums.YES.getId()); - Date currentDate = DateUtil.formatDate(new Date()); if (StringUtils.isNotEmpty(request.getBirth())) { @@ -2172,14 +2171,13 @@ public class BabyBookbuildingFacade { } if (request.getMonthAgeStart() != null) { - Date start = DateUtil.addMonth(currentDate, -request.getMonthAgeStart()); - babyQuery.setCheckDateEnd(start); + babyQuery.setCheckMonthStart(request.getMonthAgeStart()); } if (request.getMonthAgeEnd() != null) { - Date end = DateUtil.addDay(DateUtil.addMonth(currentDate, -request.getMonthAgeEnd() - 1), 1); - babyQuery.setCheckDateStart(end); + babyQuery.setCheckMonthEnd(request.getMonthAgeEnd()); } + List result = new ArrayList<>(); Map> mapItems = getCountGroupItemMaps(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/GrowthCountTask.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/GrowthCountTask.java index 85902c1..3449f08 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/GrowthCountTask.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/GrowthCountTask.java @@ -1,7 +1,10 @@ package com.lyms.platform.operate.web.utils; import com.lyms.platform.biz.service.BabyCheckService; +import com.lyms.platform.common.enums.YnEnums; +import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.ExceptionUtils; +import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.result.BabyGrowthCountResult; import com.lyms.platform.query.BabyCheckModelQuery; import org.apache.commons.collections.CollectionUtils; @@ -47,17 +50,27 @@ public class GrowthCountTask{ @Override public List call() throws Exception { + BabyCheckModelQuery babyCheckModelQuery = new BabyCheckModelQuery(); + babyCheckModelQuery.setYn(YnEnums.YES.getId()); + BabyCheckModelQuery babyQuery = new BabyCheckModelQuery(); + babyCheckModelQuery.setHospitalId(babyQuery.getHospitalId()); + + babyQuery.setYn(YnEnums.YES.getId()); + babyQuery.setBirthStart(babyQuery.getBirthStart()); + babyQuery.setBirthEnd(babyQuery.getBirthEnd()); + babyQuery.setCheckMonthEnd(babyQuery.getCheckMonthEnd()); + if (CollectionUtils.isNotEmpty(growths)) { for(BabyGrowthCountResult grouwth : growths) { if ("身长".equals(type)) { - babyQuery.setHeightEvaluate(grouwth.getEvaluate()); + babyCheckModelQuery.setHeightEvaluate(grouwth.getEvaluate()); } else if ("体重".equals(type)) { - babyQuery.setWeightEvaluate(grouwth.getEvaluate()); + babyCheckModelQuery.setWeightEvaluate(grouwth.getEvaluate()); } grouwth.setTypeName(type); int count = babyCheckService.queryBabyCheckCount(babyQuery);