diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabySSReportModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabySSReportModel.java new file mode 100644 index 0000000..8bc4b07 --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabySSReportModel.java @@ -0,0 +1,64 @@ +package com.lyms.platform.pojo; + +import com.lyms.platform.common.result.BaseModel; +import org.springframework.data.mongodb.core.mapping.Document; + +import java.util.List; + +@Document(collection = "lyms_baby_ss_report") +public class BabySSReportModel extends BaseModel { + private String id; + + + //进食行为建议 + private List suggests; + + + //喂养常见问题及处理 + private List handles; + + private Integer startMonthAge; + + private Integer endMonthAge; + + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public List getSuggests() { + return suggests; + } + + public void setSuggests(List suggests) { + this.suggests = suggests; + } + + public List getHandles() { + return handles; + } + + public void setHandles(List handles) { + this.handles = handles; + } + + public Integer getStartMonthAge() { + return startMonthAge; + } + + public void setStartMonthAge(Integer startMonthAge) { + this.startMonthAge = startMonthAge; + } + + public Integer getEndMonthAge() { + return endMonthAge; + } + + public void setEndMonthAge(Integer endMonthAge) { + this.endMonthAge = endMonthAge; + } +} 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 a19b6fa..4e49610 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 @@ -1368,6 +1368,20 @@ public class BabyNutritionFacade { //获取热量值 体重在正常范围内的不计算热量值 double kaul = getKcal(month, model.getWeight(), model.getHeight(), baby.getSex(), kaupEvaluate); + + List ss = mongoTemplate.find(Query.query(Criteria.where("startMonthAge").lte(month).and("endMonthAge").gte(month)), + BabySSReportModel.class); + if (CollectionUtils.isNotEmpty(ss)) + { + BabySSReportModel ssReportModel = ss.get(0); + + //进食行为建议 + data.put("feedSuggest", ssReportModel.getSuggests()); + //喂养常见问题及处理 + data.put("feedHandle", ssReportModel.getHandles()); + } + + double kauls = getBasicKaul(month, model.getWeight(), model.getHeight(), baby.getSex()); if (month >= 0 && month <= 5) { List babyDietReport = mongoTemplate.find(Query.query(Criteria.where("monthAge").is(month).and("feedingPattern").is(Integer.valueOf(model.getFeedType()))), BabyDietReportModel.class);