Commit 27208e39605a665fc33dd897ebcad2ddf2475cfa
1 parent
4c61606175
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 11 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/FmListWorker.java
View file @
27208e3
| ... | ... | @@ -58,7 +58,11 @@ |
| 58 | 58 | if (null==patient) { |
| 59 | 59 | continue; |
| 60 | 60 | } |
| 61 | - result.put("MQXM", StringUtils.isEmpty(patient.getUsername())?"":patient.getUsername());//母亲姓名 | |
| 61 | + String MQXM=""; | |
| 62 | + if(StringUtils.isNotEmpty(patient.getUsername())){ | |
| 63 | + MQXM=patient.getUsername(); | |
| 64 | + } | |
| 65 | + result.put("MQXM", MQXM);//母亲姓名 | |
| 62 | 66 | int MQNL=0; |
| 63 | 67 | if (null!= DateUtil.getAge(patient.getBirth(),model.getDueDate1())) { |
| 64 | 68 | MQNL=DateUtil.getAge(patient.getBirth(),model.getDueDate1()).intValue(); |
| ... | ... | @@ -140,7 +144,7 @@ |
| 140 | 144 | result.put("YLJGDZXQ", YLJGDZXQ);//医疗机构地址 - 县 |
| 141 | 145 | result.put("YLJGDZQHDM", organizationService.getAreaCode(YLJGDZXQ));//医疗机构地址-行政区划代码 |
| 142 | 146 | result.put("ZCJG", "T");//是否助产机构 |
| 143 | - result.put("FMDDLB", StringUtils.isEmpty(model.getFmddlb())?"":model.getFmddlb());//分娩地点类别代码 | |
| 147 | + result.put("FMDDLB", StringUtils.isEmpty(model.getFmType())?"1":model.getFmType());//分娩地点类别代码 | |
| 144 | 148 | result.put("FMDDLX", StringUtils.isEmpty(model.getFmddlx())?"":model.getFmddlx());//分娩地点类型代码 |
| 145 | 149 | result.put("CFJKDAH", "");//孕产妇健康档案编号(非必填) |
| 146 | 150 | result.put("CFZYBAH", StringUtils.isEmpty(model.getInHospitalNo())?"":model.getInHospitalNo());//产妇住院病案号 |
| 147 | 151 | |
| 148 | 152 | |
| 149 | 153 | |
| 150 | 154 | |
| ... | ... | @@ -229,18 +233,22 @@ |
| 229 | 233 | } |
| 230 | 234 | result.put("FMJJ", FMJJ);//分娩结局代码 |
| 231 | 235 | result.put("RKBM", StringUtils.isEmpty(baby.getBabySeq())?"":baby.getBabySeq());//出生人口编码 |
| 232 | - result.put("XSEXM ", StringUtils.isEmpty(baby.getXsexm())?"":baby.getXsexm());//新生儿姓名 | |
| 236 | + | |
| 233 | 237 | String XSEXB="9"; |
| 238 | + String XSEXM=""; | |
| 234 | 239 | if(StringUtils.isNotEmpty(baby.getBabyGender())) { |
| 235 | 240 | switch (baby.getBabyGender()){ |
| 236 | 241 | case "1": |
| 237 | 242 | XSEXB="1";//男 |
| 243 | + XSEXM=MQXM+"之子"; | |
| 238 | 244 | break; |
| 239 | 245 | case "0": |
| 240 | 246 | XSEXB="2";//女 |
| 247 | + XSEXM=MQXM+"之女"; | |
| 241 | 248 | break; |
| 242 | 249 | } |
| 243 | 250 | } |
| 251 | + result.put("XSEXM ", XSEXM);//新生儿姓名 | |
| 244 | 252 | result.put("XSEXB", XSEXB);//新生儿性别代码 |
| 245 | 253 | result.put("XSESC", StringUtils.isEmpty(baby.getBabyHeight())?0:Integer.parseInt(baby.getBabyHeight()));//出生身长（cm） |
| 246 | 254 | result.put("XSETZ", StringUtils.isEmpty(baby.getBabyWeight())?0:Integer.parseInt(baby.getBabyWeight()));//出生体重（g） |