Commit 79cedc686323875b5a33b22fdcdf261ab44d0a2a
1 parent
6d7726f0b7
Exists in
master
and in
1 other branch
增加是否通知
Showing 1 changed file with 4 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ReferralApplyOrderResult.java
View file @
79cedc6
... | ... | @@ -236,9 +236,7 @@ |
236 | 236 | int day = (days%7); |
237 | 237 | this.dueWeek="孕"+week+"周" +(day>0?"+"+day+"天":""); |
238 | 238 | } |
239 | - if(null!=patients.getDueDate()){ | |
240 | - setyChanQi(DateUtil.getyyyy_MM_dd(patients.getDueDate())); | |
241 | - } | |
239 | + | |
242 | 240 | setCardNo(destModel.getCardNo()); |
243 | 241 | setDueDate(DateUtil.getyyyy_MM_dd(destModel.getDueDate())); |
244 | 242 | setrLevel(destModel.getrLevel()); |
... | ... | @@ -256,7 +254,9 @@ |
256 | 254 | setPhone(patients.getPhone()); |
257 | 255 | setRemarks(patients.getMremark()); |
258 | 256 | setRiskScore("60"); |
259 | - | |
257 | + if(null!=patients.getDueDate()){ | |
258 | + setyChanQi(DateUtil.getyyyy_MM_dd(patients.getDueDate())); | |
259 | + } | |
260 | 260 | int days= DateUtil.daysBetween(patients.getLastMenses(),new Date()); |
261 | 261 | String week= (days/7)+""; |
262 | 262 | int day = (days%7); |