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