From ed5ea36ad596aca123c11d63d59a8ebb31b84de7 Mon Sep 17 00:00:00 2001 From: yangfei Date: Sat, 10 Mar 2018 17:31:09 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90=E8=BF=BD?= =?UTF-8?q?=E8=AE=BF=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/service/impl/TrackDownServiceImpl.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) 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=叉叉 } -- 1.8.3.1