jiangjiazhi / regional-platform

Download as
Browse Code »

Commit ce33dd70da2154f34810c86b06dc10c65e6862b2

Authored by liquanyu
1 parent 47cd595b4f
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 5 changed files with 26 additions and 18 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java View file @ ce33dd7
... ... @@ -6874,7 +6874,7 @@
6874 6874 //saveMicroelements("E:\\dev\\微量元素指导报告模板.xls");
6875 6875 //saveBabyMicroelements("F:\\技术文档\\儿童微量元素\\儿童微量元素指导报告模板.xls");
6876 6876 //saveBabyBone("F:\\技术文档\\骨密度\\儿童骨密度报告模板内容表.xls");
6877   - saveQhdDist("F:\\儿童营养报告\\秦皇岛市妇幼新版选择儿童膳食报告\\（泉渝）秦皇岛市妇幼儿童膳食报告one(1).xls");
  6877 + saveQhdDist("F:\\儿童营养报告\\秦皇岛市妇幼新版选择儿童膳食报告\\（泉渝）秦皇岛市妇幼儿童膳食报告20210129.xls");
6878 6878 // saveQhdDist1("F:\\儿童营养报告\\秦皇岛市妇幼新版选择儿童膳食报告\\秦皇岛市妇幼儿童膳食报告0-11.xls");
6879 6879 }
6880 6880  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ ce33dd7
... ... @@ -3625,10 +3625,10 @@
3625 3625 List <String> currentGroupHospital = groupsFacade.findGroupHospital(userId, false);
3626 3626  
3627 3627  
3628   - //衡水区域并且不是冀州妇幼登陆
3629   - if("12".equals(og.getCityId()) && !"2100002109".equals(hospitalId))
  3628 + //衡水区域并且不是衡水市第六人民医院
  3629 + if("12".equals(og.getCityId()) && !"2100002324".equals(hospitalId))
3630 3630 {
3631   - currentGroupHospital.remove("2100002109");//排查冀州妇幼
  3631 + currentGroupHospital.remove("2100002324");//排查冀州妇幼
3632 3632 }
3633 3633  
3634 3634 if (!StringUtils.isEmpty(queryRequest.getPatientId())) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java View file @ ce33dd7
... ... @@ -2288,27 +2288,35 @@
2288 2288 }
2289 2289  
2290 2290 if (month >= 6 && month <= 11) {
2291   -
2292   - Query query = Query.query(Criteria.where("startMonthAge").lte(month).and("endMonthAge").gte(month).and("type").is(1));
2293   - System.out.println(query.toString());
2294   - List<BabyQhdfyDietReportModel> recommendRecipes =
2295   - mongoTemplate.find(query, BabyQhdfyDietReportModel.class);
2296   -
2297   - //推荐食谱
2298   - data.put("recommendRecipes",recommendRecipes);
2299   -
2300 2291 List<BabyQhdfyDietReportModel> oneDayRecipes = null;
  2292 + List<BabyQhdfyDietReportModel> recommendRecipes = null;
2301 2293 if (kaupEvaluate.equals("正常"))
2302 2294 {
  2295 +
  2296 + Query query = Query.query(Criteria.where("startMonthAge").lte(month).and("endMonthAge").gte(month).and("type").is(1).and("shape").is(1));
  2297 + recommendRecipes =
  2298 + mongoTemplate.find(query, BabyQhdfyDietReportModel.class);
  2299 +
2303 2300 oneDayRecipes =
2304   - mongoTemplate.find(Query.query(Criteria.where("startMonthAge").lte(month).and("endMonthAge").gte(month).and("type").is(2).and("shape").is(1)), BabyQhdfyDietReportModel.class);
  2301 + mongoTemplate.find(Query.query(Criteria.where("startMonthAge").lte(month).and("endMonthAge").gte(month).and("type").is(2).and("shape").is(1)),
  2302 + BabyQhdfyDietReportModel.class);
2305 2303 }
2306 2304 else
2307 2305 {
  2306 +
  2307 + Query query = Query.query(Criteria.where("startMonthAge").lte(month).and("endMonthAge").gte(month).and("type").is(1)
  2308 + .and("shape").is(20).and("kcal").is(kaul));
  2309 + recommendRecipes =
  2310 + mongoTemplate.find(query, BabyQhdfyDietReportModel.class);
  2311 +
2308 2312 oneDayRecipes =
2309 2313 mongoTemplate.find(Query.query(Criteria.where("startMonthAge").lte(month).and("endMonthAge").gte(month)
2310 2314 .and("type").is(2).and("shape").is(20).and("kcal").is(kaul)), BabyQhdfyDietReportModel.class);
2311 2315 }
  2316 +
  2317 + //推荐食谱
  2318 + data.put("recommendRecipes",recommendRecipes);
  2319 +
2312 2320 //一日喂养
2313 2321 data.put("oneDayRecipes",oneDayRecipes);
2314 2322 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java View file @ ce33dd7
... ... @@ -1487,9 +1487,9 @@
1487 1487  
1488 1488  
1489 1489 //衡水区域并且不是冀州妇幼登陆
1490   - if("12".equals(org.getCityId()) && !"2100002109".equals(hospitalId))
  1490 + if("12".equals(org.getCityId()) && !"2100002324".equals(hospitalId))
1491 1491 {
1492   - hids.remove("2100002109");//排查冀州妇幼
  1492 + hids.remove("2100002324");//排查冀州妇幼
1493 1493 }
1494 1494  
1495 1495 if (CollectionUtils.isNotEmpty(hids)) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ ce33dd7
... ... @@ -1353,9 +1353,9 @@
1353 1353  
1354 1354  
1355 1355 //衡水区域并且不是冀州妇幼登陆
1356   - if("12".equals(og.getCityId()) && !"2100002109".equals(hospital))
  1356 + if("12".equals(og.getCityId()) && !"2100002324".equals(hospital))
1357 1357 {
1358   - hids.remove("2100002109");//排查冀州妇幼
  1358 + hids.remove("2100002324");//排查冀州妇幼
1359 1359 }
1360 1360  
1361 1361