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 b82ad6a..a6cadfa 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 @@ -3333,6 +3333,7 @@ public class BasicConfigServiceTest { continue; case 1: List list6 = Arrays.asList(str.split("\n")); + System.out.println("=========>" + list6); weighReport.setGuideInfo(list6); continue; } @@ -3535,8 +3536,8 @@ public class BasicConfigServiceTest { // babyNutritionConfig("F:\\儿童营养报告\\婴幼儿体重与营养管理报告内容及规则\\儿童膳食报告文章2.xls"); - xyPresentation("E:\\血压报告.xls"); - // weightReport("E:\\体重营养报告10.xls"); + //xyPresentation("E:\\血压报告.xls"); + weightReport("E:\\体重营养报告10.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 81aba3d..f81ce19 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 @@ -2012,7 +2012,7 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient } } //计算出属于那种类型 偏重 还事负重 还是正常 当前体重-孕前体重 - Double residualWeight = Double.valueOf(patientWeight.getNowWeight()).doubleValue() - Double.valueOf(patientWeight.getBeforeHeight()).doubleValue(); + Double residualWeight = Double.valueOf(patientWeight.getNowWeight()).doubleValue() - Double.valueOf(patientWeight.getBeforeWeight()).doubleValue(); //贫血/高血压计算规则 Integer gxyKcal = this.getRounding((int) this.getKcal(bregmatic, residualWeight, low, high, week, bmiD, patients, patientWeight, heights, 1.12)); String gxyKcalStr = gxyKcal + "kcal"; @@ -2028,6 +2028,7 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient //甲亢计算规则 Integer gkKcal = this.getRounding((int) this.getKcal(bregmatic, residualWeight, low, high, week, bmiD, patients, patientWeight, heights, 1.45)); String gkKcalStr = gkKcal + "kcal"; + System.out.println("甲亢计算规则" + gkKcalStr); //甲减计算规则 Integer gjKcal = this.getRounding((int) this.getKcal(bregmatic, residualWeight, low, high, week, bmiD, patients, patientWeight, heights, 1.45)); String gjKcalStr = gjKcal + "kcal";