diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index 4e75568..d30b07c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -3771,30 +3771,31 @@ public class PatientFacade extends BaseServiceImpl { 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; } } }