Commit b10f9273c5f50815fad8933315a7db84a0b69d20
1 parent
ba44f1fcd1
Exists in
master
and in
8 other branches
修改新电子病历
Showing 1 changed file with 31 additions and 27 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java
View file @
b10f927
| ... | ... | @@ -182,39 +182,43 @@ |
| 182 | 182 | } |
| 183 | 183 | |
| 184 | 184 | public AntexListResult convertToResult(List<AntenatalExaminationModel> destModel, Patients patients, List<AntExChuModel> antExChuModel) { |
| 185 | - setId(patients.getId()); | |
| 186 | - try { | |
| 187 | - if (null != patients.getBirth()) { | |
| 188 | - setAge(DateUtil.getAge(patients.getBirth())); | |
| 189 | - setBirth(DateUtil.getyyyy_MM_dd(patients.getBirth())); | |
| 185 | + if(null!=patients){ | |
| 186 | + setId(patients.getId()); | |
| 187 | + try { | |
| 188 | + if (null != patients.getBirth()) { | |
| 189 | + setAge(DateUtil.getAge(patients.getBirth())); | |
| 190 | + setBirth(DateUtil.getyyyy_MM_dd(patients.getBirth())); | |
| 191 | + } | |
| 192 | + | |
| 193 | + } catch (Exception e) { | |
| 190 | 194 | } |
| 195 | + if (null != patients.getDueDate()) { | |
| 196 | + setyChanQi(DateUtil.getyyyy_MM_dd(patients.getDueDate())); | |
| 197 | + } | |
| 198 | + setBuildTime(DateUtil.getyyyy_MM_dd(patients.getBookbuildingDate())); | |
| 199 | + setName(patients.getUsername()); | |
| 200 | + setPhone(patients.getPhone()); | |
| 201 | + setRemarks(patients.getMremark()); | |
| 202 | + setCardNo(patients.getCardNo()); | |
| 191 | 203 | |
| 192 | - } catch (Exception e) { | |
| 193 | - } | |
| 194 | - if (null != patients.getDueDate()) { | |
| 195 | - setyChanQi(DateUtil.getyyyy_MM_dd(patients.getDueDate())); | |
| 196 | - } | |
| 197 | - setBuildTime(DateUtil.getyyyy_MM_dd(patients.getBookbuildingDate())); | |
| 198 | - setName(patients.getUsername()); | |
| 199 | - setPhone(patients.getPhone()); | |
| 200 | - setRemarks(patients.getMremark()); | |
| 201 | - setCardNo(patients.getCardNo()); | |
| 204 | + setVcCardNo(patients.getVcCardNo()); | |
| 205 | + if (null!=patients.getDueStatus() && 1 == patients.getDueStatus()) { | |
| 206 | + this.dueWeek = "终止妊娠"; | |
| 207 | + } else if (3 == patients.getType()) { | |
| 208 | + this.dueWeek = "已分娩"; | |
| 209 | + } else { | |
| 210 | + if (null != patients.getLastMenses()) { | |
| 211 | + int days = DateUtil.daysBetween(patients.getLastMenses(), new Date()); | |
| 212 | + this.dueWeek = StringUtils.dueWeek(days); | |
| 213 | + } | |
| 214 | + } | |
| 202 | 215 | |
| 203 | - setVcCardNo(patients.getVcCardNo()); | |
| 204 | - if (null!=patients.getDueStatus() && 1 == patients.getDueStatus()) { | |
| 205 | - this.dueWeek = "终止妊娠"; | |
| 206 | - } else if (3 == patients.getType()) { | |
| 207 | - this.dueWeek = "已分娩"; | |
| 208 | - } else { | |
| 209 | 216 | if (null != patients.getLastMenses()) { |
| 210 | - int days = DateUtil.daysBetween(patients.getLastMenses(), new Date()); | |
| 211 | - this.dueWeek = StringUtils.dueWeek(days); | |
| 217 | + setLastMenses(DateUtil.getyyyy_MM_dd(patients.getLastMenses())); | |
| 212 | 218 | } |
| 213 | 219 | } |
| 214 | 220 | |
| 215 | - if (null != patients.getLastMenses()) { | |
| 216 | - setLastMenses(DateUtil.getyyyy_MM_dd(patients.getLastMenses())); | |
| 217 | - } | |
| 221 | + | |
| 218 | 222 | return this; |
| 219 | 223 | } |
| 220 | 224 |