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 40bcbae..d8ef4a8 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 @@ -6874,7 +6874,7 @@ public class BasicConfigServiceTest { //saveMicroelements("E:\\dev\\微量元素指导报告模板.xls"); //saveBabyMicroelements("F:\\技术文档\\儿童微量元素\\儿童微量元素指导报告模板.xls"); //saveBabyBone("F:\\技术文档\\骨密度\\儿童骨密度报告模板内容表.xls"); - saveQhdDist("F:\\儿童营养报告\\秦皇岛市妇幼新版选择儿童膳食报告\\秦皇岛市妇幼儿童膳食报告one.xls"); + saveQhdDist("F:\\儿童营养报告\\秦皇岛市妇幼新版选择儿童膳食报告\\(泉渝)秦皇岛市妇幼儿童膳食报告one(1).xls"); // saveQhdDist1("F:\\儿童营养报告\\秦皇岛市妇幼新版选择儿童膳食报告\\秦皇岛市妇幼儿童膳食报告0-11.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 94c66f0..4cb2c93 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 @@ -1851,6 +1851,11 @@ public class BabyNutritionFacade { double kaul = getKcal(month, model.getWeight(), model.getHeight(), baby.getSex(), kaupEvaluate); + if (month == 5) + { + month = 6; + } + List ss = mongoTemplate.find(Query.query(Criteria.where("startMonthAge").lte(month).and("endMonthAge").gte(month)), BabySSReportModel.class); if (CollectionUtils.isNotEmpty(ss)) @@ -2154,6 +2159,11 @@ public class BabyNutritionFacade { int kaul = (int)getKcal(month, model.getWeight(), model.getHeight(), baby.getSex(), kaupEvaluate); + if (month == 5) + { + month = 6; + } + if (month >= 6 && month <= 11) { Query query = Query.query(Criteria.where("startMonthAge").lte(month).and("endMonthAge").gte(month).and("type").is(1));