From b223b09a4f976c8c363965f074604517a99a1dc5 Mon Sep 17 00:00:00 2001 From: zhangchao Date: Wed, 10 Jul 2024 20:57:25 +0800 Subject: [PATCH] =?UTF-8?q?#fix:=E6=96=B0=E5=A2=9E=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E8=90=A5=E5=85=BB=E6=8A=A5=E5=91=8A=E9=AB=98=E5=8D=B1?= =?UTF-8?q?=E5=9B=A0=E7=B4=A0=E9=A2=9C=E8=89=B2=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/service/impl/PatientWeightServiceImpl.java | 27 ++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 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 4a7100e..ae761f0 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 @@ -24,10 +24,7 @@ import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.permission.service.PatientServiceService; import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.*; -import com.lyms.platform.query.MatDeliverQuery; -import com.lyms.platform.query.PatientsQuery; -import com.lyms.platform.query.SmsConfigQuery; -import com.lyms.platform.query.SmsTemplateQuery; +import com.lyms.platform.query.*; import net.sf.json.JSONArray; import net.sf.json.JSONObject; import org.apache.commons.collections.MapUtils; @@ -1055,13 +1052,34 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient map.put("yunqi", "孕周"); List factor = patients.getRiskFactorId(); String risk = ""; + List riskLevelId=new ArrayList<>(); if (CollectionUtils.isNotEmpty(factor)) { StringBuilder sb = new StringBuilder(56); + BasicConfigQuery basicConfigQuery=new BasicConfigQuery(); 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(','); + basicConfigQuery.setId(basicConfig1.getParentId()); + List basicConfigs2 = basicConfigService.queryBasicConfig(basicConfigQuery); + if (org.apache.commons.collections.CollectionUtils.isNotEmpty(basicConfigs2)) { + for (BasicConfig bc : basicConfigs2) { + if (org.apache.commons.lang.StringUtils.isNotEmpty(bc.getName())) { + String name = bc.getName(); + if (name.indexOf("黄色") > -1) { + name = "黄色"; + } else if (name.indexOf("橙色") > -1) { + name = "橙色"; + } else if (name.indexOf("红色") > -1) { + name = "红色"; + } else if (name.indexOf("紫色") > -1) { + name = "紫色"; + } + riskLevelId.add("risk_" + RiskDefaultTypeEnum.getColor(name)); + } + } + } } } } @@ -1072,6 +1090,7 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient } } map.put("risk", risk); + map.put("riskLevelId",riskLevelId); } //map.put("height", patientWeight.getBeforeHeight() == null ? "" : MathUtil.doubleFormat(Double.parseDouble(patientWeight.getBeforeHeight()) / 100) + " 米"); map.put("height", patientWeight.getBeforeHeight() == null ? "" : patientWeight.getBeforeHeight() + "cm"); -- 1.8.3.1