From 3b2c085ee38016ed49336e448ba08fc56b9d3763 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Tue, 28 Aug 2018 16:36:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BD=93=E9=87=8D=E8=90=A5?= =?UTF-8?q?=E5=85=BB=E6=8A=A5=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/service/impl/PatientWeightServiceImpl.java | 39 +++++++++++----------- 1 file changed, 19 insertions(+), 20 deletions(-) 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 f82bcfe..0e181f8 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 @@ -487,6 +487,25 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient week = DateUtil.getWeek2(patients.getLastMenses(), new Date()); String yunqi = "孕" + String.valueOf(week) + "期"; map.put("yunqi", yunqi); + List factor = patients.getRiskFactorId(); + String risk=""; + if (CollectionUtils.isNotEmpty(factor)) { + StringBuilder sb = new StringBuilder(56); + for (String srt : factor) { + if (StringUtils.isNotEmpty(srt)) { + BasicConfig basicConfig1 = basicConfigService.getOneBasicConfigById(srt); + if (null != basicConfig1 && sb.indexOf(basicConfig1.getName()) == -1) { + sb.append(basicConfig1.getName()).append(','); + } + } + } + if (sb.toString().endsWith(",")) { + risk=sb.substring(0, sb.length() - 1); + } else { + risk=sb.toString(); + } + } + map.put("risk", risk); } map.put("height", patientWeight.getBeforeHeight() == null ? "" : MathUtil.doubleFormat(Double.parseDouble(patientWeight.getBeforeHeight()) / 100) + " 米"); map.put("beforeWeight", patientWeight.getBeforeWeight() == null ? "" : patientWeight.getBeforeWeight() + " 公斤"); @@ -523,26 +542,6 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient week = DateUtil.getWeek2(patients.getLastMenses(), new Date()); String yunqi = "孕" + String.valueOf(week) + "期"; map.put("yunqi", yunqi); - - List factor = patients.getRiskFactorId(); - String risk=""; - if (CollectionUtils.isNotEmpty(factor)) { - StringBuilder sb = new StringBuilder(56); - for (String srt : factor) { - if (StringUtils.isNotEmpty(srt)) { - BasicConfig basicConfig1 = basicConfigService.getOneBasicConfigById(srt); - if (null != basicConfig && sb.indexOf(basicConfig1.getName()) == -1) { - sb.append(basicConfig1.getName()).append(','); - } - } - } - if (sb.toString().endsWith(",")) { - risk=sb.substring(0, sb.length() - 1); - } else { - risk=sb.toString(); - } - } - map.put("risk", risk); } map.put("height", patientWeight.getBeforeHeight() == null ? "" : MathUtil.doubleFormat(Double.parseDouble(patientWeight.getBeforeHeight()) / 100) + " 米"); map.put("beforeWeight", patientWeight.getBeforeWeight() == null ? "" : patientWeight.getBeforeWeight() + " 公斤"); -- 1.8.3.1