Commit 54f9149d2ee8cb1d0f631b91ddc379d4018bce4e
1 parent
097a6749ca
Exists in
master
and in
7 other branches
分娩作废产检劵
Showing 1 changed file with 2 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java
View file @
54f9149
| ... | ... | @@ -316,9 +316,9 @@ |
| 316 | 316 | } |
| 317 | 317 | } |
| 318 | 318 | // 全部产妇管理-如果当前孕妇已终止妊娠则分娩日期显示为“终止妊娠” 2、全部产妇管理-如果当前孕妇自动分娩则分娩日期显示为“-” |
| 319 | - if(null!=destModel.getDueStatus() &&1 ==destModel.getDueStatus()){ | |
| 319 | + if(StringUtils.isEmpty(dueWeek)&&null!=destModel.getDueStatus() &&1 ==destModel.getDueStatus()){ | |
| 320 | 320 | setDueWeek("终止妊娠"); |
| 321 | - }else if(null!=destModel.getBuildType() &&2==destModel.getBuildType()){ | |
| 321 | + }else if(StringUtils.isEmpty(dueWeek)&&null!=destModel.getBuildType() &&2==destModel.getBuildType()){ | |
| 322 | 322 | setDueWeek("-"); |
| 323 | 323 | } |
| 324 | 324 | if(null!=destModel.getServiceType()){ |