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 2b6ce79..6d455f5 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 @@ -50,18 +50,20 @@ public class GrowthCountTask{ @Override public List call() throws Exception { - BabyCheckModelQuery babyCheckModelQuery = new BabyCheckModelQuery(); - babyCheckModelQuery.setYn(YnEnums.YES.getId()); - babyCheckModelQuery.setHospitalId(babyQuery.getHospitalId()); - babyCheckModelQuery.setBirthStart(babyQuery.getBirthStart()); - babyCheckModelQuery.setBirthEnd(babyQuery.getBirthEnd()); - babyCheckModelQuery.setCheckMonthStart(babyQuery.getCheckMonthStart()); - babyCheckModelQuery.setCheckMonthEnd(babyQuery.getCheckMonthEnd()); if (CollectionUtils.isNotEmpty(growths)) { for(BabyGrowthCountResult grouwth : growths) { + BabyCheckModelQuery babyCheckModelQuery = new BabyCheckModelQuery(); + babyCheckModelQuery.setYn(YnEnums.YES.getId()); + babyCheckModelQuery.setHospitalId(babyQuery.getHospitalId()); + babyCheckModelQuery.setBirthStart(babyQuery.getBirthStart()); + babyCheckModelQuery.setBirthEnd(babyQuery.getBirthEnd()); + babyCheckModelQuery.setCheckMonthStart(babyQuery.getCheckMonthStart()); + babyCheckModelQuery.setCheckMonthEnd(babyQuery.getCheckMonthEnd()); + + if ("身长".equals(type)) { babyCheckModelQuery.setHeightEvaluate(grouwth.getEvaluate());