From ce33dd70da2154f34810c86b06dc10c65e6862b2 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 29 Jan 2021 14:40:44 +0800 Subject: [PATCH] update --- .../lyms/platform/biz/BasicConfigServiceTest.java | 2 +- .../web/facade/AntenatalExaminationFacade.java | 6 ++--- .../operate/web/facade/BabyNutritionFacade.java | 28 ++++++++++++++-------- .../operate/web/facade/BookbuildingFacade.java | 4 ++-- .../operate/web/facade/MatDeliverFacade.java | 4 ++-- 5 files changed, 26 insertions(+), 18 deletions(-) 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 d8ef4a8..842a691 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(1).xls"); + saveQhdDist("F:\\儿童营养报告\\秦皇岛市妇幼新版选择儿童膳食报告\\（泉渝）秦皇岛市妇幼儿童膳食报告20210129.xls"); // saveQhdDist1("F:\\儿童营养报告\\秦皇岛市妇幼新版选择儿童膳食报告\\秦皇岛市妇幼儿童膳食报告0-11.xls"); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index 382ce84..7490094 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -3625,10 +3625,10 @@ public class AntenatalExaminationFacade { List currentGroupHospital = groupsFacade.findGroupHospital(userId, false); - //衡水区域并且不是冀州妇幼登陆 - if("12".equals(og.getCityId()) && !"2100002109".equals(hospitalId)) + //衡水区域并且不是衡水市第六人民医院 + if("12".equals(og.getCityId()) && !"2100002324".equals(hospitalId)) { - currentGroupHospital.remove("2100002109");//排查冀州妇幼 + currentGroupHospital.remove("2100002324");//排查冀州妇幼 } if (!StringUtils.isEmpty(queryRequest.getPatientId())) { 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 68d6fed..d500f8c 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 @@ -2288,27 +2288,35 @@ public class BabyNutritionFacade { } if (month >= 6 && month <= 11) { - - Query query = Query.query(Criteria.where("startMonthAge").lte(month).and("endMonthAge").gte(month).and("type").is(1)); - System.out.println(query.toString()); - List recommendRecipes = - mongoTemplate.find(query, BabyQhdfyDietReportModel.class); - - //推荐食谱 - data.put("recommendRecipes",recommendRecipes); - List oneDayRecipes = null; + List recommendRecipes = null; if (kaupEvaluate.equals("正常")) { + + Query query = Query.query(Criteria.where("startMonthAge").lte(month).and("endMonthAge").gte(month).and("type").is(1).and("shape").is(1)); + recommendRecipes = + mongoTemplate.find(query, BabyQhdfyDietReportModel.class); + oneDayRecipes = - mongoTemplate.find(Query.query(Criteria.where("startMonthAge").lte(month).and("endMonthAge").gte(month).and("type").is(2).and("shape").is(1)), BabyQhdfyDietReportModel.class); + mongoTemplate.find(Query.query(Criteria.where("startMonthAge").lte(month).and("endMonthAge").gte(month).and("type").is(2).and("shape").is(1)), + BabyQhdfyDietReportModel.class); } else { + + Query query = Query.query(Criteria.where("startMonthAge").lte(month).and("endMonthAge").gte(month).and("type").is(1) + .and("shape").is(20).and("kcal").is(kaul)); + recommendRecipes = + mongoTemplate.find(query, BabyQhdfyDietReportModel.class); + oneDayRecipes = mongoTemplate.find(Query.query(Criteria.where("startMonthAge").lte(month).and("endMonthAge").gte(month) .and("type").is(2).and("shape").is(20).and("kcal").is(kaul)), BabyQhdfyDietReportModel.class); } + + //推荐食谱 + data.put("recommendRecipes",recommendRecipes); + //一日喂养 data.put("oneDayRecipes",oneDayRecipes); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index 5e4b218..74a6abc 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -1487,9 +1487,9 @@ public class BookbuildingFacade { //衡水区域并且不是冀州妇幼登陆 - if("12".equals(org.getCityId()) && !"2100002109".equals(hospitalId)) + if("12".equals(org.getCityId()) && !"2100002324".equals(hospitalId)) { - hids.remove("2100002109");//排查冀州妇幼 + hids.remove("2100002324");//排查冀州妇幼 } if (CollectionUtils.isNotEmpty(hids)) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 7d688b0..4b865f9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -1353,9 +1353,9 @@ public class MatDeliverFacade { //衡水区域并且不是冀州妇幼登陆 - if("12".equals(og.getCityId()) && !"2100002109".equals(hospital)) + if("12".equals(og.getCityId()) && !"2100002324".equals(hospital)) { - hids.remove("2100002109");//排查冀州妇幼 + hids.remove("2100002324");//排查冀州妇幼 } -- 1.8.3.1