Commit c863267faa1703ccacfa9a5d1fa4b75ee7d3f521
1 parent
3927a8f624
Exists in
master
and in
1 other branch
威海分娩记录导出修改
Showing 2 changed files with 6 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java
View file @
c863267
| ... | ... | @@ -312,7 +312,11 @@ |
| 312 | 312 | map.put("num",num); |
| 313 | 313 | map.put("dueDate",queryModel.getDueDate()); |
| 314 | 314 | map.put("fmTime",queryModel.getFmTime()); |
| 315 | - map.put("zyNo",queryModel.getBhnum()); | |
| 315 | + if(StringUtils.isNotEmpty(queryModel.getBhnum())){ | |
| 316 | + map.put("zyNo",queryModel.getBhnum().toString()); | |
| 317 | + }else { | |
| 318 | + map.put("zyNo", "-"); | |
| 319 | + } | |
| 316 | 320 | map.put("name",queryModel.getName()); |
| 317 | 321 | map.put("age", queryModel.getAge()); |
| 318 | 322 | //居住地 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java
View file @
c863267
| ... | ... | @@ -500,7 +500,7 @@ |
| 500 | 500 | childbirthManagerQueryModel.setZypbfm(maternalDeliverModel.getZypbfm());//专业陪伴分娩(0:未选择；1:已选择) |
| 501 | 501 | childbirthManagerQueryModel.setDueCount(maternalDeliverModel.getDueCount());//产次 |
| 502 | 502 | childbirthManagerQueryModel.setMyzd(maternalDeliverModel.getMyzd());//母婴阻断 |
| 503 | - childbirthManagerQueryModel.setBhnum(maternalDeliverModel.getBhNum().toString());//住院号 | |
| 503 | + childbirthManagerQueryModel.setBhnum(maternalDeliverModel.getBhNum());//住院号 | |
| 504 | 504 | |
| 505 | 505 | childbirthManagerQueryModelList.add(childbirthManagerQueryModel); |
| 506 | 506 |