Commit 7fe5283cab30fc59527fa9b93bb9f2b350e36878
1 parent
63e8574293
Exists in
master
and in
6 other branches
体重管理bug
Showing 2 changed files with 9 additions and 12 deletions
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java
View file @
7fe5283
| ... | ... | @@ -5429,7 +5429,7 @@ |
| 5429 | 5429 | //saveCdgwOrg("F:\\承德工位\\qhdorg.xls"); |
| 5430 | 5430 | //babyReport("G:\\儿童膳食报告.xls"); |
| 5431 | 5431 | // saveQhdbabyDiaginose("F:\\承德工位\\秦皇岛儿童诊断 - 副本.xls"); |
| 5432 | - saveQhdWeight("F:\秦皇岛标准报告.xls"); | |
| 5432 | + //saveQhdWeight("F:\秦皇岛标准报告.xls"); | |
| 5433 | 5433 | |
| 5434 | 5434 | // dietaryIntake("F:\\膳食摄入量推荐.xls"); |
| 5435 | 5435 | |
| ... | ... | @@ -5441,7 +5441,7 @@ |
| 5441 | 5441 | //saveEvaluationCriterionModel2("D:\\user\\workspace\\产品中心\\区域平台\\需求资料\\儿童智能等级.xls"); |
| 5442 | 5442 | // saveEvaluationCriterionModel3("D:\\user\\workspace\\产品中心\\区域平台\\需求资料\\儿童神经心理发育情况.xls"); |
| 5443 | 5443 | //saveQhdWeight("F:\\text.xls"); |
| 5444 | - //saveQhdGaoWeiWeight("F:\\秦皇岛高危版体重报告.xls"); | |
| 5444 | + saveQhdGaoWeiWeight("F:\\秦皇岛高危报告内容.xls"); | |
| 5445 | 5445 | // saveQhdWeight("F:\\text.xls"); |
| 5446 | 5446 | // baby35Report("C:\\Users\\Administrator\\Desktop\\doc\\秦皇岛3-5月龄膳食报告\\3-5月龄儿童膳食报告内容.xls"); |
| 5447 | 5447 | // baby35Report("C:\\Users\\Administrator\\Desktop\\doc\\秦皇岛3-5月龄膳食报告\\3-5月龄儿童膳食报告内容.xls"); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java
View file @
7fe5283
| ... | ... | @@ -532,12 +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 | - }*/ | |
| 540 | - kmap.put("type", null); | |
| 539 | + } | |
| 540 | + | |
| 541 | 541 | if (1 == type) { |
| 542 | 542 | setGuide(week, map, patientWeight.getHospitalId()); // 设置指南 |
| 543 | 543 | } else { |
| 544 | 544 | |
| ... | ... | @@ -1135,9 +1135,9 @@ |
| 1135 | 1135 | } else { |
| 1136 | 1136 | suggests = configModel.getLaterSuggests(); |
| 1137 | 1137 | } |
| 1138 | - /* if ("3".equals((String) kaclmap.get("type"))) { | |
| 1138 | + if ("3".equals((String) kaclmap.get("type"))) { | |
| 1139 | 1139 | suggests = configModel.getDietaryIntake(); |
| 1140 | - }*/ | |
| 1140 | + } | |
| 1141 | 1141 | |
| 1142 | 1142 | map.put("suggest", suggests); |
| 1143 | 1143 | } |
| 1144 | 1144 | |
| ... | ... | @@ -1771,14 +1771,11 @@ |
| 1771 | 1771 | BigDecimal b1 = new BigDecimal(Double.toString(addWeightStart)); |
| 1772 | 1772 | BigDecimal b2 = new BigDecimal(Double.toString(addWeightEnd)); |
| 1773 | 1773 | BigDecimal bw = null; |
| 1774 | - /*if (bmi >= 25) { | |
| 1774 | + if (bmi >= 25) { | |
| 1775 | 1775 | bw = new BigDecimal(Double.toString(Integer.valueOf(height) - 105)); |
| 1776 | 1776 | } else { |
| 1777 | 1777 | bw = new BigDecimal(Double.toString(beforeWeight)); |
| 1778 | - }*/ | |
| 1779 | - | |
| 1780 | - | |
| 1781 | - bw = new BigDecimal(Double.toString(beforeWeight)); | |
| 1778 | + } | |
| 1782 | 1779 | double kstart = (bw.add(b1)).multiply(new BigDecimal(25)).doubleValue() + basekul; |
| 1783 | 1780 | double kend = (bw.add(b2)).multiply(new BigDecimal(25)).doubleValue() + basekul; |
| 1784 | 1781 |