Commit aadfdb6b068cdef44a17df5e3f6a366e7cb7e86c
1 parent
398c9e14dd
Exists in
master
and in
8 other branches
修改新电子病历
Showing 1 changed file with 9 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientBaseResult.java
View file @
aadfdb6
| ... | ... | @@ -129,10 +129,15 @@ |
| 129 | 129 | setRemarks(patients.getMremark()); |
| 130 | 130 | setRiskScore("60"); |
| 131 | 131 | |
| 132 | - if(null!=patients.getLastMenses()){ | |
| 133 | - setLastMenses(DateUtil.getyyyy_MM_dd(patients.getLastMenses())); | |
| 134 | - int days= DateUtil.daysBetween(patients.getLastMenses(),new Date()); | |
| 135 | - this.dueWeek=StringUtils.dueWeek(days); | |
| 132 | + if (null!=patients.getDueStatus() && 1 == patients.getDueStatus()) { | |
| 133 | + this.dueWeek = "终止妊娠"; | |
| 134 | + } else if (3 == patients.getType()) { | |
| 135 | + this.dueWeek = "已分娩"; | |
| 136 | + } else { | |
| 137 | + if (null != patients.getLastMenses()) { | |
| 138 | + int days = DateUtil.daysBetween(patients.getLastMenses(), new Date()); | |
| 139 | + this.dueWeek = StringUtils.dueWeek(days); | |
| 140 | + } | |
| 136 | 141 | } |
| 137 | 142 | return this; |
| 138 | 143 | } |