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 ac2aefb..6210140 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 @@ -1007,7 +1007,7 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient if ("2100001635".equals(hospitalId)) { kmap = getWhComputeKul(week, Double.parseDouble(patientWeight.getNowWeight()), Double.parseDouble(patientWeight.getBeforeWeight()), patientWeight.getBregmatic(), bmi); }else if ("2100002043".equals(hospitalId)) { //临西县热量单独计算 - kmap = getLxComputeKul(week, Double.parseDouble(patientWeight.getNowWeight()), Double.parseDouble(patientWeight.getBeforeWeight()), patientWeight.getBregmatic(), bmi); + kmap = getLxComputeKul(week, Double.parseDouble(patientWeight.getBeforeHeight()), Double.parseDouble(patientWeight.getNowWeight()), Double.parseDouble(patientWeight.getBeforeWeight()), patientWeight.getBregmatic(), bmi); } else { kmap = computeKulServiceManager.getComputeKulByRisk(rid).getComputeKul(Double.parseDouble(patientWeight.getBeforeWeight()), @@ -2299,7 +2299,7 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient - public Map getLxComputeKul(int week, double currentWeight, double beforeWeight, String bregmatic, double bmiD) { + public Map getLxComputeKul(int week, double height, double currentWeight, double beforeWeight, String bregmatic, double bmiD) { String bmiStr = null; //空和1表示单胎 @@ -2349,46 +2349,46 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient if (week <= 11) { if (add <= hvalue) { if (bmiD < 18.5) { - kulStart = (currentWeight - 105) * 37; + kulStart = (height - 105) * 37; } else if (bmiD >= 18.5 && bmiD <= 24.9) { - kulStart = (currentWeight - 105) * 33; + kulStart = (height - 105) * 33; } else if (bmiD >= 25) { - kulStart = (currentWeight - 105) * 28; + kulStart = (height - 105) * 28; } } else { if (bmiD < 18.5) { - kulStart = (currentWeight - 105) * 35; + kulStart = (height - 105) * 35; } else if (bmiD >= 18.5 && bmiD <= 24.9) { - kulStart = (currentWeight - 105) * 30; + kulStart = (height - 105) * 30; } else if (bmiD >= 25) { - kulStart = (currentWeight - 105) * 25; + kulStart = (height - 105) * 25; } } } //孕中期 - else if (week < 28) { + else if (week < 42) { int addKal = week < 28 ? 200 : 400; if (add <= hvalue) { if (bmiD < 18.5) { - kulStart = (currentWeight - 105) * 37 + addKal; + kulStart = (height - 105) * 37 + addKal; } else if (bmiD >= 18.5 && bmiD <= 24.9) { - kulStart = (currentWeight - 105) * 33 + addKal; + kulStart = (height - 105) * 33 + addKal; } else if (bmiD >= 25) { - kulStart = (currentWeight - 105) * 28 + addKal; + kulStart = (height - 105) * 28 + addKal; } } else { if (bmiD < 18.5) { - kulStart = (currentWeight - 105) * 35 + addKal; + kulStart = (height - 105) * 35 + addKal; } else if (bmiD >= 18.5 && bmiD <= 24.9) { - kulStart = (currentWeight - 105) * 30 + addKal; + kulStart = (height - 105) * 30 + addKal; } else if (bmiD >= 25) { - kulStart = (currentWeight - 105) * 25 + addKal; + kulStart = (height - 105) * 25 + addKal; } } if (kulStart < 1500)