From d134d2b7633318dbac136f7368c13dc277358f0f Mon Sep 17 00:00:00 2001 From: "[wangbo]" Date: Tue, 30 Jul 2019 17:43:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=95=E5=A6=87=E4=BD=93?= =?UTF-8?q?=E9=87=8D=E6=8A=A5=E5=91=8Abug=E4=BF=AE=E6=94=B9-=E7=A7=A6?= =?UTF-8?q?=E7=9A=87=E5=B2=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/lyms/platform/biz/BasicConfigServiceTest.java | 6 +++--- .../operate/web/service/impl/PatientWeightServiceImpl.java | 7 ++++--- 2 files changed, 7 insertions(+), 6 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 ac8fad1..fe3ad10 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 @@ -5427,9 +5427,9 @@ public class BasicConfigServiceTest { //saveCdgwOrg("F:\\承德工位\\qhdorg.xls"); //babyReport("G:\\儿童膳食报告.xls"); // saveQhdbabyDiaginose("F:\\承德工位\\秦皇岛儿童诊断 - 副本.xls"); - // saveQhdWeight("F:\\text.xls"); + saveQhdWeight("F:\\秦皇岛标准报告.xls"); - dietaryIntake("F:\\膳食摄入量推荐.xls"); + // dietaryIntake("F:\\膳食摄入量推荐.xls"); //saveQhdbabyDiaginose("F:\\承德工位\\秦皇岛儿童诊断 - 副本.xls"); @@ -5439,7 +5439,7 @@ public class BasicConfigServiceTest { //saveEvaluationCriterionModel2("D:\\user\\workspace\\产品中心\\区域平台\\需求资料\\儿童智能等级.xls"); // saveEvaluationCriterionModel3("D:\\user\\workspace\\产品中心\\区域平台\\需求资料\\儿童神经心理发育情况.xls"); //saveQhdWeight("F:\\text.xls"); - // saveQhdGaoWeiWeight("F:\\秦皇岛高危版体重报告.xls"); + //saveQhdGaoWeiWeight("F:\\秦皇岛高危版体重报告.xls"); // saveQhdWeight("F:\\text.xls"); // baby35Report("C:\\Users\\Administrator\\Desktop\\doc\\秦皇岛3-5月龄膳食报告\\3-5月龄儿童膳食报告内容.xls"); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java index 6b2219d..f8e9f54 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java @@ -2407,15 +2407,16 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient //糖尿病 if (this.initReport("0").contains(reis)) { - List diabetes = mongoTemplate.find(Query.query(Criteria.where("kcal").is(diabetesKcal).and("isHighRisk").is("1").and("highRiskIlness").is("0")), QhdWeightConfigModel.class); + List diabetes = mongoTemplate.find(Query.query(Criteria.where("kcal").is(diabetesKcal).and("isHighRisk").is("1").and("highRiskIlness").is("2")), QhdWeightConfigModel.class); datas.put("1", this.getQhdInfo(weights, data3, diabetes, patientWeight, patients, bmiD, week)); } else if (this.initReport("1").contains(reis)) { //高血压 - List feritin = mongoTemplate.find(Query.query(Criteria.where("kcal").is(gxyKcal).and("isHighRisk").is("1").and("highRiskIlness").is("1")), QhdWeightConfigModel.class); + List feritin = mongoTemplate.find(Query.query(Criteria.where("kcal").is(gxyKcal).and("isHighRisk").is("1").and("highRiskIlness").is("0")), QhdWeightConfigModel.class); + System.out.println(feritin.size()); datas.put("2", this.getQhdInfo(weights, data2, feritin, patientWeight, patients, bmiD, week)); } else if (this.initReport("2").contains(reis)) { //贫血 - List anemia = mongoTemplate.find(Query.query(Criteria.where("kcal").is(gxyKcal).and("isHighRisk").is("1").and("highRiskIlness").is("2")), QhdWeightConfigModel.class); + List anemia = mongoTemplate.find(Query.query(Criteria.where("kcal").is(gxyKcal).and("isHighRisk").is("1").and("highRiskIlness").is("1")), QhdWeightConfigModel.class); datas.put("3", this.getQhdInfo(weights, data0, anemia, patientWeight, patients, bmiD, week)); } } -- 1.8.3.1