From 52090feae011e520e0a5c1fb280d11bd33d85d04 Mon Sep 17 00:00:00 2001 From: yangfei Date: Fri, 9 Mar 2018 17:49:44 +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 --- .../operate/web/service/impl/TrackDownServiceImpl.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 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 a0b3ad4..7017e13 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 @@ -147,21 +147,25 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS if (patients.getDueStatus() == 1 || (patients.getIsAutoFm() != null && patients.getIsAutoFm() == 1)) {//终止妊娠,或自动分娩 temp.put("fm", 2); // 分娩 1=勾勾 2=叉叉 - } else if (patients.getType() == 3) { - temp.put("fm", 1); // 分娩 1=勾勾 2=叉叉 + } else if (patients.getType() == 3) { //本院已分娩 if (patients.getIsAutoFm() != null && patients.getIsAutoFm() == 1) { /** 生产方式 */ temp.put("fmType", "自动分娩"); + temp.put("fm", 2); // 分娩 1=勾勾 2=叉叉 } else { MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); matDeliverQuery.setParentId(patients.getId()); matDeliverQuery.setYn(YnEnums.YES.getId()); + matDeliverQuery.setHospitalId(patients.getHospitalId()); //查询分娩记录 List list2 = matDeliverService.query(matDeliverQuery); 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{ + temp.put("fm", 2); // 分娩 1=勾勾 2=叉叉 } } } @@ -284,20 +288,24 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS if (patient.getDueStatus() == 1 || (patient.getIsAutoFm() != null && patient.getIsAutoFm() == 1)) {//终止妊娠,或自动分娩 temp.put("fm", 2); // 分娩 1=勾勾 2=叉叉 } else if (patient.getType() == 3) { //本院已分娩 - temp.put("fm", 1); // 分娩 1=勾勾 2=叉叉 if (patient.getIsAutoFm() != null && patient.getIsAutoFm() == 1) { /** 生产方式 */ temp.put("fmType", "自动分娩"); + temp.put("fm", 2); // 分娩 1=勾勾 2=叉叉 } else { MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); matDeliverQuery.setParentId(patient.getId()); matDeliverQuery.setYn(YnEnums.YES.getId()); + matDeliverQuery.setHospitalId(patient.getHospitalId()); //查询分娩记录 List list2 = matDeliverService.query(matDeliverQuery); 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{ + temp.put("fm", 2); // 分娩 1=勾勾 2=叉叉 } } } -- 1.8.3.1