diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/enums/business/CfEnums.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/enums/business/CfEnums.java index a32960c..3042e80 100644 --- a/parent/hospital.mac/src/main/java/com/lyms/hospital/enums/business/CfEnums.java +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/enums/business/CfEnums.java @@ -10,8 +10,7 @@ import java.util.Map; * Created by Administrator on 2016/6/24 0024. */ public enum CfEnums { - O("良好","0"), - O1("死亡","1"); + O("良好","0"),O1("死亡","1"); public static List> getList(){ List> list = new ArrayList<>(); diff --git a/parent/hospital.web/src/main/java/com/lyms/hospital/controller/childbirth/ChildbirthController.java b/parent/hospital.web/src/main/java/com/lyms/hospital/controller/childbirth/ChildbirthController.java index bd02dfb..86bc768 100644 --- a/parent/hospital.web/src/main/java/com/lyms/hospital/controller/childbirth/ChildbirthController.java +++ b/parent/hospital.web/src/main/java/com/lyms/hospital/controller/childbirth/ChildbirthController.java @@ -57,8 +57,8 @@ import com.lyms.web.controller.BaseController; * []获取分娩页面的字典数据
* [--]保存分娩记录
* []依据cardNo或vcCardNo查询孕妇分娩记录
- * []查看表单
- * []查看页面
+ * []查看分娩表单
+ * []查看分娩页面
* 删除分娩信息
* * @author xujiahong @@ -228,14 +228,17 @@ public class ChildbirthController extends BaseController { /* 产后生理 */ // 产妇情况 if (info.getWomanSituation() != null) { - if (CfEnums.O.getId().equals(info.getWomanSituation())) {// 良好 + if (CfEnums.O.getId().equals(info.getWomanSituation().toString())) {// 良好 map.put("maternalInfo", "良好"); - } else if (CfEnums.O1.getId().equals(info.getWomanSituation())) { - map.put("maternalInfo", "死亡，" + DeathCauseEnums.getName(info.getWomanSituation().toString())); + } else { + map.put("maternalInfo", "死亡"); + if(DeathCauseEnums.O6.getId().equals(info.getWomanSituation().toString())){//其他死亡原因 + map.put("deathCause",info.getOtherDeathReasonText()); + }else{ + map.put("deathCause",DeathCauseEnums.getName(info.getWomanSituation().toString())); + } } } - map.put("deathCause", - StringUtils.isEmpty(info.getOtherDeathReasonText()) ? "--" : info.getOtherDeathReasonText()); // 产后血压 收缩压，舒张压 map.put("ssy", UnitConstants.splice(info.getBloodShrink(), UnitConstants.MMHG)); diff --git a/parent/hospital.web/src/main/java/com/lyms/hospital/request/exam/ChildbirthAddRequestWrapper.java b/parent/hospital.web/src/main/java/com/lyms/hospital/request/exam/ChildbirthAddRequestWrapper.java index ece1ffa..8520e1e 100644 --- a/parent/hospital.web/src/main/java/com/lyms/hospital/request/exam/ChildbirthAddRequestWrapper.java +++ b/parent/hospital.web/src/main/java/com/lyms/hospital/request/exam/ChildbirthAddRequestWrapper.java @@ -12,6 +12,7 @@ import com.lyms.hospital.entity.childbirth.ChildbirthInfoVo; import com.lyms.hospital.entity.childbirth.ChildbirthNewborn; import com.lyms.hospital.entity.childbirth.ChildbirthTai; import com.lyms.hospital.entity.childbirth.ChildbirthTaipan; +import com.lyms.hospital.enums.business.CfEnums; import com.lyms.hospital.enums.business.FmTypeEnums; import com.lyms.hospital.request.OldNewWrapper; import com.lyms.hospital.util.trans.XjhMapUtil; @@ -39,14 +40,13 @@ public class ChildbirthAddRequestWrapper extends OldNewWrapper { // { 分娩ID、居民ID、孕妇ID、分娩孕周、胎儿数、胎盘数 } // { （剖宫产）手术原因、 会阴撕裂、缝线针数、产妇情况、造成死亡的原因 } // { 呼吸、脉搏、产后1小时失血量、产后2小时失血量、产后24小时失血量、第三产程+产后2小时失血量 } - // { 其他失血原因文本、 分娩医院、接生医生} + // { 分娩医院、接生医生} String[] req_map = { "id", "pid", "parentId", "dueWeek", "tireNumber", "placenta", "operationCause", - "siLielevel", "needleNum", "maternalInfo", "deathCause", "breath", "pulse", "oHloseBloodL", - "tHloseBloodL", "rHloseBloodL", "sHloseBloodL", "deathCauseText", "fmHospital", "deliverDoctor" }; + "siLielevel", "needleNum", "maternalInfo", "deathCauseText", "breath", "pulse", "oHloseBloodL", + "tHloseBloodL", "rHloseBloodL", "sHloseBloodL", "fmHospital", "deliverDoctor" }; String[] info_map = { "id", "personId", "womanId", "childbirthTimeText", "fetusNum", "placentaNum", "operationReason", "perineumSplit", "needleNum", "womanSituation", "otherDeathReasonText", "breath", - "pulse", "loseBloodA", "loseBloodB", "loseBloodC", "loseBloodD", "loseBloodOtherText", "orgId", - "doctorId" }; + "pulse", "loseBloodA", "loseBloodB", "loseBloodC", "loseBloodD", "orgId", "doctorId" }; Map reqMap = XjhMapUtil.transBean2AliasMap(req, XjhMapUtil.getKeyMap(req_map, info_map)); info = (ChildbirthInfo) XjhMapUtil.transMap2Bean(reqMap, new ChildbirthInfo()); /* @@ -83,6 +83,19 @@ public class ChildbirthAddRequestWrapper extends OldNewWrapper { } else if ("split".equals(perinealCondition)) { info.setPerineumSituation(ChildbirthInfo.PERINEUM_SITUATION_SPLIT); } + /* + //产妇情况 CfEnums O("良好","0"),O1("死亡","1"); + private String maternalInfo; + //死亡原因 O2("产科出血", "2"), O3("妊娠高血压疾病", "3"), O4("内科合并症", "4"), O5("羊水栓塞", "5"), O6("其他", "6"); + private String deathCause; + */ + if(req.getMaternalInfo()!=null){ + if(CfEnums.O.getId().equals(req.getMaternalInfo())){//良好 + info.setWomanSituation(OldNewWrapper.obj2Int(req.getMaternalInfo())); + }else if(CfEnums.O1.getId().equals(req.getMaternalInfo())){//死亡，则保存具体的死亡原因 + info.setWomanSituation(OldNewWrapper.obj2Int(req.getDeathCause())); + } + } // 产后血压 Map chBp = (Map) req.getChBp(); if (chBp != null && !chBp.isEmpty()) { @@ -214,14 +227,13 @@ public class ChildbirthAddRequestWrapper extends OldNewWrapper { // { 分娩ID、居民ID、孕妇ID、分娩孕周、胎儿数、胎盘数 } // { （剖宫产）手术原因、 会阴撕裂、缝线针数、产妇情况、造成死亡的原因 } // { 呼吸、脉搏、产后1小时失血量、产后2小时失血量、产后24小时失血量、第三产程+产后2小时失血量 } - // { 其他失血原因文本、 分娩医院、接生医生} + // { 分娩医院、接生医生} String[] req_map = { "id", "pid", "parentId", "dueWeek", "tireNumber", "placenta", "operationCause", - "siLielevel", "needleNum", "maternalInfo", "deathCause", "breath", "pulse", "oHloseBloodL", - "tHloseBloodL", "rHloseBloodL", "sHloseBloodL", "deathCauseText", "fmHospital", "deliverDoctor" }; + "siLielevel", "needleNum", "maternalInfo", "deathCauseText", "breath", "pulse", "oHloseBloodL", + "tHloseBloodL", "rHloseBloodL", "sHloseBloodL", "fmHospital", "deliverDoctor" }; String[] info_map = { "id", "personId", "womanId", "childbirthTimeText", "fetusNum", "placentaNum", "operationReason", "perineumSplit", "needleNum", "womanSituation", "otherDeathReasonText", "breath", - "pulse", "loseBloodA", "loseBloodB", "loseBloodC", "loseBloodD", "loseBloodOtherText", "orgId", - "doctorId" }; + "pulse", "loseBloodA", "loseBloodB", "loseBloodC", "loseBloodD", "orgId", "doctorId" }; Map reqMap = XjhMapUtil.transBean2AliasMap(this.info, XjhMapUtil.getKeyMap(req_map, info_map)); if (reqMap != null) { this.request = (ChildbirthAddRequest) XjhMapUtil.transMap2Bean(reqMap, this.request); @@ -246,7 +258,7 @@ public class ChildbirthAddRequestWrapper extends OldNewWrapper { // 分娩方式 deliveryMode Map deliveryMode = new HashMap<>(); Integer childbirthType = info.getChildbirthType(); - if(childbirthType!=null){ + if (childbirthType != null) { if (childbirthType.equals(1)) {// 剖宫产 deliveryMode.put("fmfs", "1"); } else {// 顺产 @@ -285,7 +297,7 @@ public class ChildbirthAddRequestWrapper extends OldNewWrapper { Map ch2Bp = new HashMap<>(); ch2Bp.put("szy", info.getBloodDiastoleLater()); ch2Bp.put("ssy", info.getBloodShrinkLater()); - this.request.setChBp(ch2Bp); + this.request.setCh2Bp(ch2Bp); // loseBloodCause 其他失血原因文本 Map loseBloodCause = new HashMap<>(); @@ -343,6 +355,16 @@ public class ChildbirthAddRequestWrapper extends OldNewWrapper { ocs.put("qtText", info.getComplicationOtherText()); ocs.put("yesOrNo", yesOrNo); this.request.setOcs(ocs); + + // 产妇情况 + if (info.getWomanSituation() != null) { + if (CfEnums.O.getId().equals(info.getWomanSituation().toString())) {// 良好 + this.request.setMaternalInfo(info.getWomanSituation().toString()); + } else { //死亡 + this.request.setMaternalInfo(CfEnums.O1.getId()); + this.request.setDeathCause(info.getWomanSituation().toString()); + } + } // extPlacentas 胎盘 List> extPlacentas = new ArrayList<>();