Commit 53b9db146153e09b58f009cd2de952e415494746
1 parent
009bcad009
Exists in
master
and in
6 other branches
回退小程序报告修改
Showing 1 changed file with 9 additions and 6 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java
View file @
53b9db1
| ... | ... | @@ -532,11 +532,12 @@ |
| 532 | 532 | Map<String, String> kmap = getComputeKul(Double.parseDouble(patientWeight.getBeforeWeight()), |
| 533 | 533 | Double.parseDouble(nowWeight), week, bmi, patientWeight.getBregmatic(), patientWeight.getBeforeHeight()); |
| 534 | 534 | |
| 535 | - if (3 == type) { | |
| 535 | + /*if (3 == type) { | |
| 536 | 536 | kmap.put("type", "3"); |
| 537 | 537 | } else { |
| 538 | 538 | kmap.put("type", null); |
| 539 | - } | |
| 539 | + }*/ | |
| 540 | + kmap.put("type", null); | |
| 540 | 541 | if (1 == type) { |
| 541 | 542 | setGuide(week, map, patientWeight.getHospitalId()); // 设置指南 |
| 542 | 543 | } else { |
| 543 | 544 | |
| ... | ... | @@ -1134,9 +1135,9 @@ |
| 1134 | 1135 | } else { |
| 1135 | 1136 | suggests = configModel.getLaterSuggests(); |
| 1136 | 1137 | } |
| 1137 | - if ("3".equals((String) kaclmap.get("type"))) { | |
| 1138 | + /* if ("3".equals((String) kaclmap.get("type"))) { | |
| 1138 | 1139 | suggests = configModel.getDietaryIntake(); |
| 1139 | - } | |
| 1140 | + }*/ | |
| 1140 | 1141 | |
| 1141 | 1142 | map.put("suggest", suggests); |
| 1142 | 1143 | } |
| 1143 | 1144 | |
| 1144 | 1145 | |
| ... | ... | @@ -1770,12 +1771,14 @@ |
| 1770 | 1771 | BigDecimal b1 = new BigDecimal(Double.toString(addWeightStart)); |
| 1771 | 1772 | BigDecimal b2 = new BigDecimal(Double.toString(addWeightEnd)); |
| 1772 | 1773 | BigDecimal bw = null; |
| 1773 | - if (bmi >= 25) { | |
| 1774 | + /*if (bmi >= 25) { | |
| 1774 | 1775 | bw = new BigDecimal(Double.toString(Integer.valueOf(height) - 105)); |
| 1775 | 1776 | } else { |
| 1776 | 1777 | bw = new BigDecimal(Double.toString(beforeWeight)); |
| 1777 | - } | |
| 1778 | + }*/ | |
| 1778 | 1779 | |
| 1780 | + | |
| 1781 | + bw = new BigDecimal(Double.toString(beforeWeight)); | |
| 1779 | 1782 | double kstart = (bw.add(b1)).multiply(new BigDecimal(25)).doubleValue() + basekul; |
| 1780 | 1783 | double kend = (bw.add(b2)).multiply(new BigDecimal(25)).doubleValue() + basekul; |
| 1781 | 1784 |