Commit 4b4a37c73189169ddc1e4f3f859e71daad495ce2

Authored by xujiahong
1 parent 818a27387a
Exists in master

末次修改提交

Showing 3 changed files with 45 additions and 21 deletions

parent/hospital.mac/src/main/java/com/lyms/hospital/enums/business/CfEnums.java View file @ 4b4a37c
... ... @@ -10,8 +10,7 @@
10 10 * Created by Administrator on 2016/6/24 0024.
11 11 */
12 12 public enum CfEnums {
13   - O("良好","0"),
14   - O1("死亡","1");
  13 + O("良好","0"),O1("死亡","1");
15 14  
16 15 public static List<Map<String,String>> getList(){
17 16 List<Map<String,String>> list = new ArrayList<>();
parent/hospital.web/src/main/java/com/lyms/hospital/controller/childbirth/ChildbirthController.java View file @ 4b4a37c
... ... @@ -57,8 +57,8 @@
57 57 * []获取分娩页面的字典数据<br/>
58 58 * [--]保存分娩记录<br/>
59 59 * []依据cardNo或vcCardNo查询孕妇分娩记录<br/>
60   - * []查看表单<br/>
61   - * []查看页面<br/>
  60 + * []查看分娩表单<br/>
  61 + * []查看分娩页面<br/>
62 62 * 删除分娩信息<br/>
63 63 *
64 64 * @author xujiahong
65 65  
66 66  
... ... @@ -228,14 +228,17 @@
228 228 /* 产后生理 */
229 229 // 产妇情况
230 230 if (info.getWomanSituation() != null) {
231   - if (CfEnums.O.getId().equals(info.getWomanSituation())) {// 良好
  231 + if (CfEnums.O.getId().equals(info.getWomanSituation().toString())) {// 良好
232 232 map.put("maternalInfo", "良好");
233   - } else if (CfEnums.O1.getId().equals(info.getWomanSituation())) {
234   - map.put("maternalInfo", "死亡," + DeathCauseEnums.getName(info.getWomanSituation().toString()));
  233 + } else {
  234 + map.put("maternalInfo", "死亡");
  235 + if(DeathCauseEnums.O6.getId().equals(info.getWomanSituation().toString())){//其他死亡原因
  236 + map.put("deathCause",info.getOtherDeathReasonText());
  237 + }else{
  238 + map.put("deathCause",DeathCauseEnums.getName(info.getWomanSituation().toString()));
  239 + }
235 240 }
236 241 }
237   - map.put("deathCause",
238   - StringUtils.isEmpty(info.getOtherDeathReasonText()) ? "--" : info.getOtherDeathReasonText());
239 242  
240 243 // 产后血压 收缩压,舒张压
241 244 map.put("ssy", UnitConstants.splice(info.getBloodShrink(), UnitConstants.MMHG));
parent/hospital.web/src/main/java/com/lyms/hospital/request/exam/ChildbirthAddRequestWrapper.java View file @ 4b4a37c
... ... @@ -12,6 +12,7 @@
12 12 import com.lyms.hospital.entity.childbirth.ChildbirthNewborn;
13 13 import com.lyms.hospital.entity.childbirth.ChildbirthTai;
14 14 import com.lyms.hospital.entity.childbirth.ChildbirthTaipan;
  15 +import com.lyms.hospital.enums.business.CfEnums;
15 16 import com.lyms.hospital.enums.business.FmTypeEnums;
16 17 import com.lyms.hospital.request.OldNewWrapper;
17 18 import com.lyms.hospital.util.trans.XjhMapUtil;
18 19  
19 20  
... ... @@ -39,14 +40,13 @@
39 40 // { 分娩ID、居民ID、孕妇ID、分娩孕周、胎儿数、胎盘数 }
40 41 // { (剖宫产)手术原因、 会阴撕裂、缝线针数、产妇情况、造成死亡的原因 }
41 42 // { 呼吸、脉搏、产后1小时失血量、产后2小时失血量、产后24小时失血量、第三产程+产后2小时失血量 }
42   - // { 其他失血原因文本、 分娩医院、接生医生}
  43 + // { 分娩医院、接生医生}
43 44 String[] req_map = { "id", "pid", "parentId", "dueWeek", "tireNumber", "placenta", "operationCause",
44   - "siLielevel", "needleNum", "maternalInfo", "deathCause", "breath", "pulse", "oHloseBloodL",
45   - "tHloseBloodL", "rHloseBloodL", "sHloseBloodL", "deathCauseText", "fmHospital", "deliverDoctor" };
  45 + "siLielevel", "needleNum", "maternalInfo", "deathCauseText", "breath", "pulse", "oHloseBloodL",
  46 + "tHloseBloodL", "rHloseBloodL", "sHloseBloodL", "fmHospital", "deliverDoctor" };
46 47 String[] info_map = { "id", "personId", "womanId", "childbirthTimeText", "fetusNum", "placentaNum",
47 48 "operationReason", "perineumSplit", "needleNum", "womanSituation", "otherDeathReasonText", "breath",
48   - "pulse", "loseBloodA", "loseBloodB", "loseBloodC", "loseBloodD", "loseBloodOtherText", "orgId",
49   - "doctorId" };
  49 + "pulse", "loseBloodA", "loseBloodB", "loseBloodC", "loseBloodD", "orgId", "doctorId" };
50 50 Map<String, Object> reqMap = XjhMapUtil.transBean2AliasMap(req, XjhMapUtil.getKeyMap(req_map, info_map));
51 51 info = (ChildbirthInfo) XjhMapUtil.transMap2Bean(reqMap, new ChildbirthInfo());
52 52 /*
... ... @@ -83,6 +83,19 @@
83 83 } else if ("split".equals(perinealCondition)) {
84 84 info.setPerineumSituation(ChildbirthInfo.PERINEUM_SITUATION_SPLIT);
85 85 }
  86 + /*
  87 + //产妇情况 CfEnums O("良好","0"),O1("死亡","1");
  88 + private String maternalInfo;
  89 + //死亡原因 O2("产科出血", "2"), O3("妊娠高血压疾病", "3"), O4("内科合并症", "4"), O5("羊水栓塞", "5"), O6("其他", "6");
  90 + private String deathCause;
  91 + */
  92 + if(req.getMaternalInfo()!=null){
  93 + if(CfEnums.O.getId().equals(req.getMaternalInfo())){//良好
  94 + info.setWomanSituation(OldNewWrapper.obj2Int(req.getMaternalInfo()));
  95 + }else if(CfEnums.O1.getId().equals(req.getMaternalInfo())){//死亡,则保存具体的死亡原因
  96 + info.setWomanSituation(OldNewWrapper.obj2Int(req.getDeathCause()));
  97 + }
  98 + }
86 99 // 产后血压
87 100 Map<String, Object> chBp = (Map<String, Object>) req.getChBp();
88 101 if (chBp != null && !chBp.isEmpty()) {
89 102  
90 103  
... ... @@ -214,14 +227,13 @@
214 227 // { 分娩ID、居民ID、孕妇ID、分娩孕周、胎儿数、胎盘数 }
215 228 // { (剖宫产)手术原因、 会阴撕裂、缝线针数、产妇情况、造成死亡的原因 }
216 229 // { 呼吸、脉搏、产后1小时失血量、产后2小时失血量、产后24小时失血量、第三产程+产后2小时失血量 }
217   - // { 其他失血原因文本、 分娩医院、接生医生}
  230 + // { 分娩医院、接生医生}
218 231 String[] req_map = { "id", "pid", "parentId", "dueWeek", "tireNumber", "placenta", "operationCause",
219   - "siLielevel", "needleNum", "maternalInfo", "deathCause", "breath", "pulse", "oHloseBloodL",
220   - "tHloseBloodL", "rHloseBloodL", "sHloseBloodL", "deathCauseText", "fmHospital", "deliverDoctor" };
  232 + "siLielevel", "needleNum", "maternalInfo", "deathCauseText", "breath", "pulse", "oHloseBloodL",
  233 + "tHloseBloodL", "rHloseBloodL", "sHloseBloodL", "fmHospital", "deliverDoctor" };
221 234 String[] info_map = { "id", "personId", "womanId", "childbirthTimeText", "fetusNum", "placentaNum",
222 235 "operationReason", "perineumSplit", "needleNum", "womanSituation", "otherDeathReasonText", "breath",
223   - "pulse", "loseBloodA", "loseBloodB", "loseBloodC", "loseBloodD", "loseBloodOtherText", "orgId",
224   - "doctorId" };
  236 + "pulse", "loseBloodA", "loseBloodB", "loseBloodC", "loseBloodD", "orgId", "doctorId" };
225 237 Map<String, Object> reqMap = XjhMapUtil.transBean2AliasMap(this.info, XjhMapUtil.getKeyMap(req_map, info_map));
226 238 if (reqMap != null) {
227 239 this.request = (ChildbirthAddRequest) XjhMapUtil.transMap2Bean(reqMap, this.request);
... ... @@ -246,7 +258,7 @@
246 258 // 分娩方式 deliveryMode
247 259 Map<String, Object> deliveryMode = new HashMap<>();
248 260 Integer childbirthType = info.getChildbirthType();
249   - if(childbirthType!=null){
  261 + if (childbirthType != null) {
250 262 if (childbirthType.equals(1)) {// 剖宫产
251 263 deliveryMode.put("fmfs", "1");
252 264 } else {// 顺产
... ... @@ -285,7 +297,7 @@
285 297 Map<String, Object> ch2Bp = new HashMap<>();
286 298 ch2Bp.put("szy", info.getBloodDiastoleLater());
287 299 ch2Bp.put("ssy", info.getBloodShrinkLater());
288   - this.request.setChBp(ch2Bp);
  300 + this.request.setCh2Bp(ch2Bp);
289 301  
290 302 // loseBloodCause 其他失血原因文本
291 303 Map<String, Object> loseBloodCause = new HashMap<>();
... ... @@ -343,6 +355,16 @@
343 355 ocs.put("qtText", info.getComplicationOtherText());
344 356 ocs.put("yesOrNo", yesOrNo);
345 357 this.request.setOcs(ocs);
  358 +
  359 + // 产妇情况
  360 + if (info.getWomanSituation() != null) {
  361 + if (CfEnums.O.getId().equals(info.getWomanSituation().toString())) {// 良好
  362 + this.request.setMaternalInfo(info.getWomanSituation().toString());
  363 + } else { //死亡
  364 + this.request.setMaternalInfo(CfEnums.O1.getId());
  365 + this.request.setDeathCause(info.getWomanSituation().toString());
  366 + }
  367 + }
346 368  
347 369 // extPlacentas 胎盘
348 370 List<Map<String, Object>> extPlacentas = new ArrayList<>();