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 8629ed9..e3c5f67 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 @@ -2015,6 +2015,8 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient //贫血/高血压计算规则 Integer gxyKcal = this.getRounding((int) this.getKcal(bregmatic, residualWeight, low, high, week, bmiD, patients, patientWeight, heights, 1.12)); String gxyKcalStr = gxyKcal + "kcal"; + System.out.println("贫血:" + gxyKcalStr); + //获取慢性肝炎的计算规则 Integer mxgyKcal = this.getRounding((int) this.getHepatitisKcal(patientWeight, bregmatic, residualWeight, low, high, bmiD, week)); String mxgyKcalStr = mxgyKcal + "kcal"; @@ -2024,12 +2026,11 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient //糖尿病计算规则 Integer diabetesKcal = getDiabetesRounding((int) this.getDiabetes(heights, week)); String diabetesKcalStr = diabetesKcal + "kcal"; - System.out.println(diabetesKcalStr); //甲亢计算规则 Integer gkKcal = this.getRounding((int) this.getKcal(bregmatic, residualWeight, low, high, week, bmiD, patients, patientWeight, heights, 1.45)); String gkKcalStr = gkKcal + "kcal"; //甲减计算规则 - Integer gjKcal = this.getRounding((int) this.getKcal(bregmatic, residualWeight, low, high, week, bmiD, patients, patientWeight, heights, 1.45)); + Integer gjKcal = this.getRounding((int) this.getKcal(bregmatic, residualWeight, low, high, week, bmiD, patients, patientWeight, heights, 1.0)); String gjKcalStr = gjKcal + "kcal"; //获取改孕妇的高危项 String risk = patients.getRiskLevelId(); @@ -2131,7 +2132,7 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient set.add(weightReportModel.getObstructiveAnemiaName()); } //贫血anemia - datas.put("6", this.getInfo(weights, data0, weightReportModel, patientWeight, patients, bmiD, week, gjKcalStr, set)); + datas.put("6", this.getInfo(weights, data0, weightReportModel, patientWeight, patients, bmiD, week, gxyKcalStr, set)); } else if (reis.equals(weightReportModel.getDiseasesDigestiveSystemId()) || reis.equals(weightReportModel.getViralHepatitisId())) { Set set = new HashSet(); if (null != weightReportModel.getDiseasesDigestiveSystemId() && reiskFactor.contains(weightReportModel.getDiseasesDigestiveSystemId())) {