diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java index 47e1b2d..75f4110 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java @@ -306,8 +306,13 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS if (org.apache.commons.collections.CollectionUtils.isNotEmpty(list2)) { temp.put("fm", 1); // 分娩 1=勾勾 2=叉叉 MaternalDeliverModel maternalDeliverModel = list2.get(0); - /** 生产方式 */ - temp.put("fmType", FmTypeEnums.getFmNameById2(maternalDeliverModel.getFmType())); + if (StringUtils.isNotEmpty(maternalDeliverModel.getDeliveryMode())) { + Map deliveryModeMap = JsonUtil.getMap(maternalDeliverModel.getDeliveryMode()); + if(deliveryModeMap.containsKey("fmfs")){ + /** 生产方式 */ + temp.put("fmType", FmTypeEnums.getFmNameById(deliveryModeMap.get("fmfs"))); + } + } } else { temp.put("fm", 2); // 分娩 1=勾勾 2=叉叉 }