Commit d2b5d2269ae855279d23d61562f3531a95627d2d
1 parent
3ec4baa678
Exists in
dev
#fix:优化产妇基本信息查询
Showing 1 changed file with 22 additions and 22 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java
View file @
d2b5d22
| ... | ... | @@ -915,30 +915,30 @@ |
| 915 | 915 | deliverQuery.setYn(1); |
| 916 | 916 | deliverQuery.setParentId(patients.getId()); |
| 917 | 917 | List<MaternalDeliverModel> modelList=matDeliverService.query(deliverQuery); |
| 918 | - | |
| 919 | 918 | String deliveryMode = ""; |
| 920 | - if (org.apache.commons.lang.StringUtils.isNotEmpty(modelList.get(0).getDeliveryMode())) { | |
| 921 | - | |
| 922 | - StringBuilder sb = new StringBuilder(); | |
| 923 | - Map m = JsonUtil.str2Obj(modelList.get(0).getDeliveryMode(), Map.class); | |
| 924 | - String fmfs = null; | |
| 925 | - if (m != null) { | |
| 926 | - Object b = m.get("fmfs"); | |
| 927 | - if (b != null) { | |
| 928 | - fmfs = b.toString(); | |
| 929 | - if (fmfs != null) { | |
| 930 | - if (fmfs.equals("1")) { | |
| 931 | - String fmName = FmTypeEnums.getFmNameById(fmfs); | |
| 932 | - sb.append(fmName); | |
| 933 | - if (null != m.get("scfs") && !"null".equals(m.get("scfs").toString())) { | |
| 934 | - sb.append(","); | |
| 935 | - String scfs = m.get("scfs").toString(); | |
| 936 | - sb.append(FmTypeEnums.getFmScNameById(scfs)); | |
| 919 | + if (CollectionUtils.isNotEmpty(modelList)){ | |
| 920 | + if (org.apache.commons.lang.StringUtils.isNotEmpty(modelList.get(0).getDeliveryMode())) { | |
| 921 | + StringBuilder sb = new StringBuilder(); | |
| 922 | + Map m = JsonUtil.str2Obj(modelList.get(0).getDeliveryMode(), Map.class); | |
| 923 | + String fmfs = null; | |
| 924 | + if (m != null) { | |
| 925 | + Object b = m.get("fmfs"); | |
| 926 | + if (b != null) { | |
| 927 | + fmfs = b.toString(); | |
| 928 | + if (fmfs != null) { | |
| 929 | + if (fmfs.equals("1")) { | |
| 930 | + String fmName = FmTypeEnums.getFmNameById(fmfs); | |
| 931 | + sb.append(fmName); | |
| 932 | + if (null != m.get("scfs") && !"null".equals(m.get("scfs").toString())) { | |
| 933 | + sb.append(","); | |
| 934 | + String scfs = m.get("scfs").toString(); | |
| 935 | + sb.append(FmTypeEnums.getFmScNameById(scfs)); | |
| 936 | + } | |
| 937 | + deliveryMode = sb.toString(); | |
| 938 | + } else if (fmfs.equals("2")) { | |
| 939 | + String fmName = FmTypeEnums.getFmNameById(fmfs); | |
| 940 | + deliveryMode = fmName; | |
| 937 | 941 | } |
| 938 | - deliveryMode = sb.toString(); | |
| 939 | - } else if (fmfs.equals("2")) { | |
| 940 | - String fmName = FmTypeEnums.getFmNameById(fmfs); | |
| 941 | - deliveryMode = fmName; | |
| 942 | 942 | } |
| 943 | 943 | } |
| 944 | 944 | } |