Commit d134d2b7633318dbac136f7368c13dc277358f0f
1 parent
1afa4593f7
Exists in
master
and in
6 other branches
修改孕妇体重报告bug修改-秦皇岛
Showing 2 changed files with 7 additions and 6 deletions
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java
View file @
d134d2b
| ... | ... | @@ -5427,9 +5427,9 @@ |
| 5427 | 5427 | //saveCdgwOrg("F:\\承德工位\\qhdorg.xls"); |
| 5428 | 5428 | //babyReport("G:\\儿童膳食报告.xls"); |
| 5429 | 5429 | // saveQhdbabyDiaginose("F:\\承德工位\\秦皇岛儿童诊断 - 副本.xls"); |
| 5430 | - // saveQhdWeight("F:\\text.xls"); | |
| 5430 | + saveQhdWeight("F:\\秦皇岛标准报告.xls"); | |
| 5431 | 5431 | |
| 5432 | - dietaryIntake("F:\膳食摄入量推荐.xls"); | |
| 5432 | + // dietaryIntake("F:\膳食摄入量推荐.xls"); | |
| 5433 | 5433 | |
| 5434 | 5434 | |
| 5435 | 5435 | //saveQhdbabyDiaginose("F:\\承德工位\\秦皇岛儿童诊断 - 副本.xls"); |
| ... | ... | @@ -5439,7 +5439,7 @@ |
| 5439 | 5439 | //saveEvaluationCriterionModel2("D:\\user\\workspace\\产品中心\\区域平台\\需求资料\\儿童智能等级.xls"); |
| 5440 | 5440 | // saveEvaluationCriterionModel3("D:\\user\\workspace\\产品中心\\区域平台\\需求资料\\儿童神经心理发育情况.xls"); |
| 5441 | 5441 | //saveQhdWeight("F:\\text.xls"); |
| 5442 | - // saveQhdGaoWeiWeight("F:\秦皇岛高危版体重报告.xls"); | |
| 5442 | + //saveQhdGaoWeiWeight("F:\秦皇岛高危版体重报告.xls"); | |
| 5443 | 5443 | // saveQhdWeight("F:\\text.xls"); |
| 5444 | 5444 | // baby35Report("C:\\Users\\Administrator\\Desktop\\doc\\秦皇岛3-5月龄膳食报告\\3-5月龄儿童膳食报告内容.xls"); |
| 5445 | 5445 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java
View file @
d134d2b
| ... | ... | @@ -2407,15 +2407,16 @@ |
| 2407 | 2407 | |
| 2408 | 2408 | //糖尿病 |
| 2409 | 2409 | if (this.initReport("0").contains(reis)) { |
| 2410 | - List<QhdWeightConfigModel> diabetes = mongoTemplate.find(Query.query(Criteria.where("kcal").is(diabetesKcal).and("isHighRisk").is("1").and("highRiskIlness").is("0")), QhdWeightConfigModel.class); | |
| 2410 | + List<QhdWeightConfigModel> diabetes = mongoTemplate.find(Query.query(Criteria.where("kcal").is(diabetesKcal).and("isHighRisk").is("1").and("highRiskIlness").is("2")), QhdWeightConfigModel.class); | |
| 2411 | 2411 | datas.put("1", this.getQhdInfo(weights, data3, diabetes, patientWeight, patients, bmiD, week)); |
| 2412 | 2412 | } else if (this.initReport("1").contains(reis)) { |
| 2413 | 2413 | //高血压 |
| 2414 | - List<QhdWeightConfigModel> feritin = mongoTemplate.find(Query.query(Criteria.where("kcal").is(gxyKcal).and("isHighRisk").is("1").and("highRiskIlness").is("1")), QhdWeightConfigModel.class); | |
| 2414 | + List<QhdWeightConfigModel> feritin = mongoTemplate.find(Query.query(Criteria.where("kcal").is(gxyKcal).and("isHighRisk").is("1").and("highRiskIlness").is("0")), QhdWeightConfigModel.class); | |
| 2415 | + System.out.println(feritin.size()); | |
| 2415 | 2416 | datas.put("2", this.getQhdInfo(weights, data2, feritin, patientWeight, patients, bmiD, week)); |
| 2416 | 2417 | } else if (this.initReport("2").contains(reis)) { |
| 2417 | 2418 | //贫血 |
| 2418 | - List<QhdWeightConfigModel> anemia = mongoTemplate.find(Query.query(Criteria.where("kcal").is(gxyKcal).and("isHighRisk").is("1").and("highRiskIlness").is("2")), QhdWeightConfigModel.class); | |
| 2419 | + List<QhdWeightConfigModel> anemia = mongoTemplate.find(Query.query(Criteria.where("kcal").is(gxyKcal).and("isHighRisk").is("1").and("highRiskIlness").is("1")), QhdWeightConfigModel.class); | |
| 2419 | 2420 | datas.put("3", this.getQhdInfo(weights, data0, anemia, patientWeight, patients, bmiD, week)); |
| 2420 | 2421 | } |
| 2421 | 2422 | } |