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 819fd72..116053e 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 @@ -5429,7 +5429,7 @@ public class BasicConfigServiceTest { //saveCdgwOrg("F:\\承德工位\\qhdorg.xls"); //babyReport("G:\\儿童膳食报告.xls"); // saveQhdbabyDiaginose("F:\\承德工位\\秦皇岛儿童诊断 - 副本.xls"); - saveQhdWeight("F:\\秦皇岛标准报告.xls"); + //saveQhdWeight("F:\\秦皇岛标准报告.xls"); // dietaryIntake("F:\\膳食摄入量推荐.xls"); @@ -5441,7 +5441,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"); // 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 cdc881b..e74b327 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 @@ -532,12 +532,12 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient Map kmap = getComputeKul(Double.parseDouble(patientWeight.getBeforeWeight()), Double.parseDouble(nowWeight), week, bmi, patientWeight.getBregmatic(), patientWeight.getBeforeHeight()); - /*if (3 == type) { + if (3 == type) { kmap.put("type", "3"); } else { kmap.put("type", null); - }*/ - kmap.put("type", null); + } + if (1 == type) { setGuide(week, map, patientWeight.getHospitalId()); // 设置指南 } else { @@ -1135,9 +1135,9 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient } else { suggests = configModel.getLaterSuggests(); } - /* if ("3".equals((String) kaclmap.get("type"))) { + if ("3".equals((String) kaclmap.get("type"))) { suggests = configModel.getDietaryIntake(); - }*/ + } map.put("suggest", suggests); } @@ -1771,14 +1771,11 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient BigDecimal b1 = new BigDecimal(Double.toString(addWeightStart)); BigDecimal b2 = new BigDecimal(Double.toString(addWeightEnd)); BigDecimal bw = null; - /*if (bmi >= 25) { + if (bmi >= 25) { bw = new BigDecimal(Double.toString(Integer.valueOf(height) - 105)); } else { bw = new BigDecimal(Double.toString(beforeWeight)); - }*/ - - - bw = new BigDecimal(Double.toString(beforeWeight)); + } double kstart = (bw.add(b1)).multiply(new BigDecimal(25)).doubleValue() + basekul; double kend = (bw.add(b2)).multiply(new BigDecimal(25)).doubleValue() + basekul;