Commit d67c9cfa89c16f14f4d0d3cf9c491346bc99f842
1 parent
307b002df6
Exists in
master
and in
6 other branches
修改体重标准报告bug
Showing 2 changed files with 3 additions and 3 deletions
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java
View file @
d67c9cf
... | ... | @@ -4561,7 +4561,7 @@ |
4561 | 4561 | } |
4562 | 4562 | |
4563 | 4563 | public static void main(String[] args) { |
4564 | -// weightWeek("F:\体重与营养管理\体重与营养管理第三版(北方)改标红“、冰淇淋”-晓萌.xls"); | |
4564 | + //weightWeek("F:\体重与营养管理\体重与营养管理第三版(北方)改标红“、冰淇淋”-晓萌.xls"); | |
4565 | 4565 | // weightMange("F:\\体重与营养管理\\体重与营养管理第三版(北方)改标红“、冰淇淋”-晓萌.xls"); |
4566 | 4566 | // weightFood("F:\\体重与营养管理\\体重与营养管理第三版(北方)改标红“、冰淇淋”-晓萌.xls"); |
4567 | 4567 | // bloodSugar("F:\\血糖报告\\血糖报告\\血糖报告基础数据格式(2).xls"); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java
View file @
d67c9cf
... | ... | @@ -631,8 +631,8 @@ |
631 | 631 | } |
632 | 632 | map.put("week", week); |
633 | 633 | map.put("bregmatic", StringUtils.isNotEmpty(patientWeight.getBregmatic()) ? patientWeight.getBregmatic() : "1"); |
634 | - map.put("height", patientWeight.getBeforeHeight() == null ? "" : MathUtil.doubleFormat(Double.parseDouble(patientWeight.getBeforeHeight()) / 100) + " 米"); | |
635 | - map.put("beforeWeight", patientWeight.getBeforeWeight() == null ? "" : patientWeight.getBeforeWeight() + " 公斤"); | |
634 | + map.put("height", StringUtils.isEmpty(patientWeight.getBeforeHeight()) ? "" : MathUtil.doubleFormat(Double.parseDouble(patientWeight.getBeforeHeight()) / 100) + " 米"); | |
635 | + map.put("beforeWeight", StringUtils.isEmpty(patientWeight.getBeforeWeight()) ? "" : patientWeight.getBeforeWeight() + " 公斤"); | |
636 | 636 | map.put("bmi", patientWeight.getBmi()); |
637 | 637 | map.put("nowWeight", patientWeight.getNowWeight() + " 公斤"); |
638 | 638 | String pregnancy = DateUtil.getWeekDesc(patients.getLastMenses(), new Date()); |