liquanyu / regional-platform

Download as
Browse Code »

Commit 4e293a04682899e52786c292b1a4903fbdd0752b

Authored by wangbo
1 parent 0346754481
Exists in master and in 1 other branch dev

儿童膳食报告bug修改

Showing 1 changed file with 2 additions and 2 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java View file @ 4e293a0
... ... @@ -1357,8 +1357,8 @@
1357 1357 data.put("feedingGuide", babyDiet.getFeedingGuide());
1358 1358 }
1359 1359 }
1360   - if (null != babyDiet.getKcal()) {
1361   - if ((babyDiet.getShape() == 0 || babyDiet.getShape() == 2) && babyDiet.getKcal() == kaul) {
  1360 + if (null != babyDiet.getKcal() && null != babyDiet.getWeightType()) {
  1361 + if (babyDiet.getWeightType() == 1 && babyDiet.getKcal() == kaul) {
1362 1362 data.put("dietStructure", babyDiet.getDietStructure());
1363 1363 data.put("oneDayRecipes", babyDiet.getOneDayRecipes());
1364 1364 data.put("recommendRecipes", babyDiet.getRecommendRecipes());