From 431a71a7ef66d2ac78423d1148b0c84e4f625541 Mon Sep 17 00:00:00 2001 From: yangfei Date: Sat, 10 Mar 2018 15:09:06 +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 --- .../web/service/impl/TrackDownServiceImpl.java | 24 ++++++++++++---------- 1 file changed, 13 insertions(+), 11 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 eef07b5..038bb39 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 @@ -3,10 +3,7 @@ package com.lyms.platform.operate.web.service.impl; import com.lyms.platform.biz.service.*; import com.lyms.platform.common.enums.*; import com.lyms.platform.common.result.*; -import com.lyms.platform.common.utils.DateUtil; -import com.lyms.platform.common.utils.EnumUtil; -import com.lyms.platform.common.utils.StringUtils; -import com.lyms.platform.common.utils.SystemConfig; +import com.lyms.platform.common.utils.*; import com.lyms.platform.operate.web.facade.AutoMatchFacade; import com.lyms.platform.operate.web.service.ITrackDownService; import com.lyms.platform.operate.web.utils.CollectionUtils; @@ -164,9 +161,14 @@ 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())); - }else{ + 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=叉叉 } } @@ -241,7 +243,7 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS } } - if(trackDownRecord.getTrackType()>TrackDownDateEnums.A.getId()){ + if (trackDownRecord.getTrackType() > TrackDownDateEnums.A.getId()) { temp.put("check", checkNum > 0 ? 1 : 2); // 婚检 1=勾勾 2=叉叉 } isExitTrackDown(trackDownRecord, temp); @@ -287,7 +289,7 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS temp.put("bookbuild", 1); // 孕期建档 1=勾勾 2=叉叉 //终止妊娠,或自动分娩 - if ((patient.getDueStatus()!=null && patient.getDueStatus() == 1) || (patient.getIsAutoFm() != null && patient.getIsAutoFm() == 1)) { + if ((patient.getDueStatus() != null && patient.getDueStatus() == 1) || (patient.getIsAutoFm() != null && patient.getIsAutoFm() == 1)) { temp.put("fm", 2); // 分娩 1=勾勾 2=叉叉 } else if (patient.getType() == 3) { //本院已分娩 if (patient.getIsAutoFm() != null && patient.getIsAutoFm() == 1) { @@ -306,7 +308,7 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS MaternalDeliverModel maternalDeliverModel = list2.get(0); /** 生产方式 */ temp.put("fmType", FmTypeEnums.getFmNameById2(maternalDeliverModel.getFmType())); - }else{ + } else { temp.put("fm", 2); // 分娩 1=勾勾 2=叉叉 } } @@ -325,7 +327,7 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS temp.put("chfc", 1); temp.put("chfcCount", postInt); // 复查次数 } else { - if (patient.getDueStatus()!=null && patient.getDueStatus() == 1) {//终止妊娠 + if (patient.getDueStatus() != null && patient.getDueStatus() == 1) {//终止妊娠 //当前孕妇是孕28周后，进入产后复查追访，否则结束流程 int dueWeek = DateUtil.getWeek2(patient.getLastMenses(), patient.getFmDate()); if (dueWeek < 28) {//进入产后复查 -- 1.8.3.1