Commit 3ec4baa678d3edd0d349aff2aadb1dbff4afeb3e
1 parent
1ad48f56ca
Exists in
dev
#fix:优化产妇查询逻辑
Showing 1 changed file with 23 additions and 22 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
View file @
3ec4baa
| ... | ... | @@ -3771,30 +3771,31 @@ |
| 3771 | 3771 | deliverQuery.setYn(1); |
| 3772 | 3772 | deliverQuery.setParentId(patients.getId()); |
| 3773 | 3773 | List<MaternalDeliverModel> modelList=matDeliverService.query(deliverQuery); |
| 3774 | - | |
| 3775 | 3774 | String deliveryMode = ""; |
| 3776 | - if (org.apache.commons.lang.StringUtils.isNotEmpty(modelList.get(0).getDeliveryMode())) { | |
| 3775 | + if (CollectionUtils.isNotEmpty(modelList)){ | |
| 3776 | + if (org.apache.commons.lang.StringUtils.isNotEmpty(modelList.get(0).getDeliveryMode())) { | |
| 3777 | 3777 | |
| 3778 | - StringBuilder sb = new StringBuilder(); | |
| 3779 | - Map m = JsonUtil.str2Obj(modelList.get(0).getDeliveryMode(), Map.class); | |
| 3780 | - String fmfs = null; | |
| 3781 | - if (m != null) { | |
| 3782 | - Object b = m.get("fmfs"); | |
| 3783 | - if (b != null) { | |
| 3784 | - fmfs = b.toString(); | |
| 3785 | - if (fmfs != null) { | |
| 3786 | - if (fmfs.equals("1")) { | |
| 3787 | - String fmName = FmTypeEnums.getFmNameById(fmfs); | |
| 3788 | - sb.append(fmName); | |
| 3789 | - if (null != m.get("scfs") && !"null".equals(m.get("scfs").toString())) { | |
| 3790 | - sb.append(","); | |
| 3791 | - String scfs = m.get("scfs").toString(); | |
| 3792 | - sb.append(FmTypeEnums.getFmScNameById(scfs)); | |
| 3778 | + StringBuilder sb = new StringBuilder(); | |
| 3779 | + Map m = JsonUtil.str2Obj(modelList.get(0).getDeliveryMode(), Map.class); | |
| 3780 | + String fmfs = null; | |
| 3781 | + if (m != null) { | |
| 3782 | + Object b = m.get("fmfs"); | |
| 3783 | + if (b != null) { | |
| 3784 | + fmfs = b.toString(); | |
| 3785 | + if (fmfs != null) { | |
| 3786 | + if (fmfs.equals("1")) { | |
| 3787 | + String fmName = FmTypeEnums.getFmNameById(fmfs); | |
| 3788 | + sb.append(fmName); | |
| 3789 | + if (null != m.get("scfs") && !"null".equals(m.get("scfs").toString())) { | |
| 3790 | + sb.append(","); | |
| 3791 | + String scfs = m.get("scfs").toString(); | |
| 3792 | + sb.append(FmTypeEnums.getFmScNameById(scfs)); | |
| 3793 | + } | |
| 3794 | + deliveryMode = sb.toString(); | |
| 3795 | + } else if (fmfs.equals("2")) { | |
| 3796 | + String fmName = FmTypeEnums.getFmNameById(fmfs); | |
| 3797 | + deliveryMode = fmName; | |
| 3793 | 3798 | } |
| 3794 | - deliveryMode = sb.toString(); | |
| 3795 | - } else if (fmfs.equals("2")) { | |
| 3796 | - String fmName = FmTypeEnums.getFmNameById(fmfs); | |
| 3797 | - deliveryMode = fmName; | |
| 3798 | 3799 | } |
| 3799 | 3800 | } |
| 3800 | 3801 | } |