Commit a6923e47e2cead0766c3bf8cd678496275bd6b4c
1 parent
7030d3bfbe
Exists in
master
and in
8 other branches
增加是否通知
Showing 1 changed file with 20 additions and 16 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ReferralApplyOrderResult.java
View file @
a6923e4
... | ... | @@ -221,24 +221,28 @@ |
221 | 221 | setTransferMode(destModel.getTransferMode()); |
222 | 222 | setApplyDoctor(destModel.getApplyDoctor()); |
223 | 223 | |
224 | - try { | |
225 | - if(null!=patients.getBirth()){ | |
226 | - setAge(DateUtil.getAge(patients.getBirth())); | |
224 | + | |
225 | + if(null!=patients){ | |
226 | + setName(patients.getUsername()); | |
227 | + setPhone(patients.getPhone()); | |
228 | + setRemarks(patients.getMremark()); | |
229 | + setRiskScore("60"); | |
230 | + | |
231 | + int days= DateUtil.daysBetween(patients.getLastMenses(),new Date()); | |
232 | + String week= (days/7)+""; | |
233 | + int day = (days%7); | |
234 | + this.dueWeek="孕"+week+"周" +(day>0?"+"+day+"天":""); | |
235 | + if(null!=patients.getLastMenses()){ | |
236 | + setLastMenses(DateUtil.getyyyy_MM_dd(patients.getLastMenses())); | |
227 | 237 | } |
228 | - }catch (Exception e){ | |
238 | + try { | |
239 | + if(null!=patients.getBirth()){ | |
240 | + setAge(DateUtil.getAge(patients.getBirth())); | |
241 | + } | |
242 | + }catch (Exception e){ | |
243 | + } | |
229 | 244 | } |
230 | - setName(patients.getUsername()); | |
231 | - setPhone(patients.getPhone()); | |
232 | - setRemarks(patients.getMremark()); | |
233 | - setRiskScore("60"); | |
234 | 245 | |
235 | - int days= DateUtil.daysBetween(patients.getLastMenses(),new Date()); | |
236 | - String week= (days/7)+""; | |
237 | - int day = (days%7); | |
238 | - this.dueWeek="孕"+week+"周" +(day>0?"+"+day+"天":""); | |
239 | - if(null!=patients.getLastMenses()){ | |
240 | - setLastMenses(DateUtil.getyyyy_MM_dd(patients.getLastMenses())); | |
241 | - } | |
242 | 246 | return this; |
243 | 247 | } |
244 | 248 |