jiangjiazhi / regional-platform

Download as
Browse Code »

Commit a2d353025815572ac691938d9afaea03895fd18c

Authored by wangbo
1 parent 4e293a0468
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

儿童膳食报告bug修改

Showing 1 changed file with 10 additions and 8 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java View file @ a2d3530
... ... @@ -1293,9 +1293,9 @@
1293 1293 data.put("feedingGuide", babyDietReport.getFeedingGuide());
1294 1294 }
1295 1295 } else if (kaupEvaluate.equals("正常") && month >= 6 && month <= 11) {
1296   - List<BabyDietReportModel> babyDietReportList = mongoTemplate.find(Query.query(Criteria.where("monthAge").is(month).and("shape").is(1)), BabyDietReportModel.class);
  1296 + List<BabyDietReportModel> babyDietReportList = mongoTemplate.find(Query.query(Criteria.where("monthAge").is(month)), BabyDietReportModel.class);
1297 1297 for (BabyDietReportModel babyDiet : babyDietReportList) {
1298   - if (month == 6) {
  1298 + if (month == 6 && babyDiet.getShape() == 1) {
1299 1299 if (StringUtils.isNotEmpty(model.getFeedType())) {
1300 1300 if (Integer.valueOf(model.getFeedType()) == month) {
1301 1301 data.put("feedingGuide", babyDiet.getFeedingGuide());
... ... @@ -1307,12 +1307,14 @@
1307 1307 } else {
1308 1308 data.put("feedingGuide", babyDiet.getFeedingGuide());
1309 1309 }
1310   - //膳食结构
1311   - data.put("dietStructure", babyDiet.getDietStructure());
1312   - //一周喂养参考
1313   - data.put("feedingWeek", babyDiet.getOneDayRecipes());
1314   - //推荐食谱
1315   - data.put("recommendRecipes", babyDiet.getRecommendRecipes());
  1310 + if (null != babyDiet.getWeightType() && babyDiet.getWeightType() == 0) {
  1311 + //膳食结构
  1312 + data.put("dietStructure", babyDiet.getDietStructure());
  1313 + //一周喂养参考
  1314 + data.put("feedingWeek", babyDiet.getOneDayRecipes());
  1315 + //推荐食谱
  1316 + data.put("recommendRecipes", babyDiet.getRecommendRecipes());
  1317 + }
1316 1318 }
1317 1319 } else if (kaupEvaluate.equals("正常") && month >= 12 && month <= 36) {
1318 1320 List<BabyDietReportModel> babyDietReportList = mongoTemplate.find(Query.query(Criteria.where("startMonthAge").lte(month).and("endMonthAge").gte(month)), BabyDietReportModel.class);