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 e18797d..94c66f0 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 @@ -187,6 +187,13 @@ public class BabyNutritionFacade { if (CollectionUtils.isNotEmpty(models)) { BabyNutritionResult result = new BabyNutritionResult(); result.convertToResult(models.get(0)); + + BabyModel babyModel = babyBookbuildingService.queryBabyById(models.get(0).getBabyId()); + if (babyModel != null) + { + result.setCheckMonth(DateUtil.getBabyMonthAge1(babyModel.getBirth(),models.get(0).getNutritiTime())); + } + Organization org = organizationService.getOrganization(Integer.parseInt(result.getHospitalId())); result.setHospitalName(org.getName()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyNutritionResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyNutritionResult.java index 9e27e49..e798e7e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyNutritionResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyNutritionResult.java @@ -20,6 +20,7 @@ public class BabyNutritionResult { private Double weight; + private Integer checkMonth; private String babyId; @@ -135,22 +136,7 @@ public class BabyNutritionResult { private List> diets; - public List> getDiets() { - return diets; - } - - public void setDiets(List> diets) { - this.diets = diets; - } - - - public String getInterpretDoctorId() { - return interpretDoctorId; - } - public void setInterpretDoctorId(String interpretDoctorId) { - this.interpretDoctorId = interpretDoctorId; - } public BabyNutritionResult convertToResult(BabyNutritionModel model) { setId(model.getId()); @@ -204,6 +190,31 @@ public class BabyNutritionResult { return this; } + public Integer getCheckMonth() { + return checkMonth; + } + + public void setCheckMonth(Integer checkMonth) { + this.checkMonth = checkMonth; + } + + public List> getDiets() { + return diets; + } + + public void setDiets(List> diets) { + this.diets = diets; + } + + + public String getInterpretDoctorId() { + return interpretDoctorId; + } + + public void setInterpretDoctorId(String interpretDoctorId) { + this.interpretDoctorId = interpretDoctorId; + } + public List getFoods() { return foods; }