From d2b5d2269ae855279d23d61562f3531a95627d2d Mon Sep 17 00:00:00 2001 From: zhangchao Date: Thu, 8 Aug 2024 11:04:32 +0800 Subject: [PATCH] =?UTF-8?q?#fix:=E4=BC=98=E5=8C=96=E4=BA=A7=E5=A6=87?= =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/service/impl/PatientWeightServiceImpl.java | 44 +++++++++++----------- 1 file changed, 22 insertions(+), 22 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 a559690..e0b1d4d 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 @@ -915,30 +915,30 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient deliverQuery.setYn(1); deliverQuery.setParentId(patients.getId()); List modelList=matDeliverService.query(deliverQuery); - String deliveryMode = ""; - if (org.apache.commons.lang.StringUtils.isNotEmpty(modelList.get(0).getDeliveryMode())) { - - StringBuilder sb = new StringBuilder(); - Map m = JsonUtil.str2Obj(modelList.get(0).getDeliveryMode(), Map.class); - String fmfs = null; - if (m != null) { - Object b = m.get("fmfs"); - if (b != null) { - fmfs = b.toString(); - if (fmfs != null) { - if (fmfs.equals("1")) { - String fmName = FmTypeEnums.getFmNameById(fmfs); - sb.append(fmName); - if (null != m.get("scfs") && !"null".equals(m.get("scfs").toString())) { - sb.append(","); - String scfs = m.get("scfs").toString(); - sb.append(FmTypeEnums.getFmScNameById(scfs)); + if (CollectionUtils.isNotEmpty(modelList)){ + if (org.apache.commons.lang.StringUtils.isNotEmpty(modelList.get(0).getDeliveryMode())) { + StringBuilder sb = new StringBuilder(); + Map m = JsonUtil.str2Obj(modelList.get(0).getDeliveryMode(), Map.class); + String fmfs = null; + if (m != null) { + Object b = m.get("fmfs"); + if (b != null) { + fmfs = b.toString(); + if (fmfs != null) { + if (fmfs.equals("1")) { + String fmName = FmTypeEnums.getFmNameById(fmfs); + sb.append(fmName); + if (null != m.get("scfs") && !"null".equals(m.get("scfs").toString())) { + sb.append(","); + String scfs = m.get("scfs").toString(); + sb.append(FmTypeEnums.getFmScNameById(scfs)); + } + deliveryMode = sb.toString(); + } else if (fmfs.equals("2")) { + String fmName = FmTypeEnums.getFmNameById(fmfs); + deliveryMode = fmName; } - deliveryMode = sb.toString(); - } else if (fmfs.equals("2")) { - String fmName = FmTypeEnums.getFmNameById(fmfs); - deliveryMode = fmName; } } } -- 1.8.3.1