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 d716e41..a9abdd6 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 @@ -326,14 +326,17 @@ public class BabyNutritionFacade { { return new BaseObjectResponse().setData(data).setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("月龄范围没有报告"); } + String bmi = patientWeightService.getBmi(String.valueOf(model.getWeight()),String.valueOf(model.getHeight())); + String kaupEvaluate = getBabyStatus(month,baby.getSex(),model.getHeight(),model.getWeight(),bmi); + + double kaul = getKal(month,model.getHeight(),model.getWeight(), baby.getSex(), kaupEvaluate); - String kaupEvaluate = getBabyStatus(month,baby.getSex(),model.getHeight(),model.getWeight()); map.put("kaupEvaluate", kaupEvaluate); map.put("month", month); + map.put("bmi", bmi); + map.put("kaul", kaul); data.put("baseInfo", map); - double kaul = getKal(month,model.getHeight(),model.getWeight(), baby.getSex(), kaupEvaluate); - if (month < 12) { //根据喂养方式获取 合理喂养 @@ -796,12 +799,12 @@ public class BabyNutritionFacade { * 12-26分为正常、消瘦、超重及以上三种情况:-2SD ≤ BMI ≤ 1SD正常;BMI<-2SD消瘦;BMI>+1SD超重 * @return */ - private String getBabyStatus(int month,int sex,Double weight,Double hegiht) + private String getBabyStatus(int month,int sex,Double weight,Double hegiht,String bmi) { String kaupEvaluate = ""; if (weight != null && hegiht != null) { - String bmi = patientWeightService.getBmi(String.valueOf(weight),String.valueOf(hegiht)); + if (StringUtils.isNotEmpty(bmi)) { Double bbmi = Double.parseDouble(bmi);