diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java index b86b889..a7b70df 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java @@ -2209,7 +2209,7 @@ public class BasicConfigServiceTest { // babyConfig("F:\\儿童营养报告\\儿童营养报告模板.xls"); - babyNutritionConfig("F:\\儿童营养报告\\婴幼儿体重与营养管理报告内容及规则\\儿童膳食报告文章1.xls"); + babyNutritionConfig("F:\\儿童营养报告\\婴幼儿体重与营养管理报告内容及规则\\儿童膳食报告文章2.xls"); } } 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 f6f0445..4d2162b 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 @@ -523,10 +523,11 @@ public class BabyNutritionFacade { if (elements.size() > 0) { + int tempMonth = month < 6 ? 0 : (month < 12 ? 6 : 12); for (String key : elements.keySet()) { BabyNutritionConfigModel babyNutritionConfig1 = mongoTemplate.findOne( - Query.query(Criteria.where("type").is(5).and("monthAge").is(month).and("title").is(key)), BabyNutritionConfigModel.class); + Query.query(Criteria.where("type").is(5).and("monthAge").is(tempMonth).and("title").is(key)), BabyNutritionConfigModel.class); if (babyNutritionConfig1 == null) { continue;