Commit 0f64973c966b923c6937de1e7a522df0f9c3e3c1
1 parent
f9f104928e
Exists in
master
and in
6 other branches
分娩记录导出
Showing 1 changed file with 7 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java
View file @
0f64973
| ... | ... | @@ -357,6 +357,11 @@ |
| 357 | 357 | map.put("cc",antExChuModel.getProdTime() == null ? "" : antExChuModel.getProdTime()); |
| 358 | 358 | |
| 359 | 359 | } |
| 360 | + else | |
| 361 | + { | |
| 362 | + map.put("yc",""); | |
| 363 | + map.put("cc",""); | |
| 364 | + } | |
| 360 | 365 | map.put("week",queryModel.getDueWeek()); |
| 361 | 366 | HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getPid(), false); |
| 362 | 367 | //妊娠期高危因素 |
| 363 | 368 | |
| ... | ... | @@ -382,11 +387,11 @@ |
| 382 | 387 | map.put("deliveryMode2", ""); |
| 383 | 388 | map.put("deliveryMode3", reslult2); |
| 384 | 389 | map.put("deliveryMode4",""); |
| 385 | - map.put("thloseBloodL",queryModel.getThloseBloodL()); | |
| 390 | + map.put("thloseBloodL",queryModel.getThloseBloodL() == null ? "" : queryModel.getThloseBloodL()); | |
| 386 | 391 | map.put("sex",queryModel.getSex()); |
| 387 | 392 | map.put("height",queryModel.getBabyHeight()); |
| 388 | 393 | map.put("weight",queryModel.getBabyWeight()); |
| 389 | - map.put("malformation",queryModel.getMalformation()); | |
| 394 | + map.put("malformation",queryModel.getMalformation() == null ? "" : queryModel.getMalformation()); | |
| 390 | 395 | //queryModel.getTireNumber()-queryModel.getLivingNumber() |
| 391 | 396 | map.put("sc","-");//死产 |
| 392 | 397 | map.put("jzsx","-");//皮肤接触及早吸吮≥30分钟 |