diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index af38ad5..93e100e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -120,7 +120,8 @@ public class BabyCheckFacade extends BaseServiceImpl { private AreaCountFacade areaCountFacade; @Autowired private MeasureDataInfoService measureDataInfoService; - + @Autowired + private BabyNutritionService babyNutritionService; @Autowired private BabyAfterVisitService babyAfterVisitService; @@ -1421,6 +1422,20 @@ public class BabyCheckFacade extends BaseServiceImpl { base.setBabyHeight(measureBabyInfoModel.getValueTwo()); base.setBabyWeight(measureBabyInfoModel.getValueOne()); } + else + { + BabyNutritionQuery babyQuery1 = new BabyNutritionQuery(); + babyQuery1.setBabyId(model.getId()); + Date date = DateUtil.getYmdDate(new Date()); + babyQuery1.setNutritiTimeStart(date); + babyQuery1.setNutritiTimeEnd(new Date(date.getTime() + 24 * 60 * 60 * 1000 - 1)); + List nutritionModels = babyNutritionService.queryBabyNutritions(babyQuery1); + if (CollectionUtils.isNotEmpty(nutritionModels)) + { + base.setBabyHeight(String.valueOf(nutritionModels.get(0).getWeight())); + base.setBabyWeight(String.valueOf(nutritionModels.get(0).getHeight())); + } + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java index c356c4a..eca03b9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java @@ -136,6 +136,22 @@ public class BabyNutritionFacade { map.put("hegiht", model.getValueTwo()); map.put("lastTime", DateUtil.getyyyy_MM_dd(model.getModified())); } + else + { + BabyCheckModelQuery babyCheckQuery = new BabyCheckModelQuery(); + babyCheckQuery.setYn(YnEnums.YES.getId()); + Date date = DateUtil.getYmdDate(new Date()); + babyCheckQuery.setCheckDateStart(date); + babyCheckQuery.setCheckDateEnd(new Date(date.getTime() + 24 * 60 * 60 * 1000 - 1)); + List babyChecks = babyCheckService.queryBabyCheckRecord(babyCheckQuery); + if (CollectionUtils.isNotEmpty(babyChecks)) + { + map.put("weight", babyChecks.get(0).getWeight()); + map.put("hegiht", babyChecks.get(0).getHeight()); + map.put("lastTime", DateUtil.getyyyy_MM_dd(babyChecks.get(0).getCheckDate())); + } + + } return map; } @@ -2029,7 +2045,7 @@ public class BabyNutritionFacade { int items = 0; switch (month) { - case 6: items = 8;break; + case 6: items = 7;break; case 7: items = 15;break; case 8: items = 20;break; case 9: items = 20;break;