Commit 9df472ca3f73b04b017c9d450cb72e6fcc4d392f
1 parent
8d27ce583a
Exists in
master
and in
8 other branches
增加是否通知
Showing 8 changed files with 24 additions and 1 deletions
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientBaseResult.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostReviewListResult.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ReferralApplyOrderResult.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveApplyOrderResult.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveDetailResult.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java
View file @
9df472c
... | ... | @@ -143,6 +143,9 @@ |
143 | 143 | } |
144 | 144 | }catch (Exception e){ |
145 | 145 | } |
146 | + if(null!=patients.getDueDate()){ | |
147 | + setyChanQi(DateUtil.getyyyy_MM_dd(patients.getDueDate())); | |
148 | + } | |
146 | 149 | setName(patients.getUsername()); |
147 | 150 | setPhone(patients.getPhone()); |
148 | 151 | setRemarks(patients.getMremark()); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java
View file @
9df472c
... | ... | @@ -55,6 +55,9 @@ |
55 | 55 | if(null!=patients.getLastMenses()){ |
56 | 56 | setLastMenses(DateUtil.getyyyy_MM_dd(patients.getLastMenses())); |
57 | 57 | } |
58 | + if(null!=patients.getDueDate()){ | |
59 | + setyChanQi(DateUtil.getyyyy_MM_dd(patients.getDueDate())); | |
60 | + } | |
58 | 61 | setName(patients.getUsername()); |
59 | 62 | setPhone(patients.getPhone()); |
60 | 63 | setRemarks(patients.getMremark()); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientBaseResult.java
View file @
9df472c
... | ... | @@ -117,6 +117,9 @@ |
117 | 117 | } |
118 | 118 | }catch (Exception e){ |
119 | 119 | } |
120 | + if(null!=patients.getDueDate()){ | |
121 | + setyChanQi(DateUtil.getyyyy_MM_dd(patients.getDueDate())); | |
122 | + } | |
120 | 123 | setName(patients.getUsername()); |
121 | 124 | setPhone(patients.getPhone()); |
122 | 125 | setRemarks(patients.getMremark()); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostReviewListResult.java
View file @
9df472c
... | ... | @@ -160,7 +160,9 @@ |
160 | 160 | setPhone(patients.getPhone()); |
161 | 161 | setRemarks(patients.getMremark()); |
162 | 162 | setRiskScore("60"); |
163 | - | |
163 | + if(null!=patients.getDueDate()){ | |
164 | + setyChanQi(DateUtil.getyyyy_MM_dd(patients.getDueDate())); | |
165 | + } | |
164 | 166 | int days= DateUtil.daysBetween(patients.getLastMenses(),new Date()); |
165 | 167 | String week= (days/7)+""; |
166 | 168 | int day = (days%7); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ReferralApplyOrderResult.java
View file @
9df472c
... | ... | @@ -236,6 +236,9 @@ |
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 | setCardNo(destModel.getCardNo()); |
240 | 243 | setDueDate(DateUtil.getyyyy_MM_dd(destModel.getDueDate())); |
241 | 244 | setrLevel(destModel.getrLevel()); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveApplyOrderResult.java
View file @
9df472c
... | ... | @@ -111,6 +111,9 @@ |
111 | 111 | } |
112 | 112 | }catch (Exception e){ |
113 | 113 | } |
114 | + if(null!=patients.getDueDate()){ | |
115 | + setyChanQi(DateUtil.getyyyy_MM_dd(patients.getDueDate())); | |
116 | + } | |
114 | 117 | setName(patients.getUsername()); |
115 | 118 | setPhone(patients.getPhone()); |
116 | 119 | setRemarks(patients.getMremark()); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveDetailResult.java
View file @
9df472c
... | ... | @@ -214,6 +214,9 @@ |
214 | 214 | } |
215 | 215 | }catch (Exception e){ |
216 | 216 | } |
217 | + if(null!=patients.getDueDate()){ | |
218 | + setyChanQi(DateUtil.getyyyy_MM_dd(patients.getDueDate())); | |
219 | + } | |
217 | 220 | setName(patients.getUsername()); |
218 | 221 | setPhone(patients.getPhone()); |
219 | 222 | setRemarks(patients.getMremark()); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveResult.java
View file @
9df472c
... | ... | @@ -189,6 +189,9 @@ |
189 | 189 | } |
190 | 190 | }catch (Exception e){ |
191 | 191 | } |
192 | + if(null!=patients.getDueDate()){ | |
193 | + setyChanQi(DateUtil.getyyyy_MM_dd(patients.getDueDate())); | |
194 | + } | |
192 | 195 | setName(patients.getUsername()); |
193 | 196 | setPhone(patients.getPhone()); |
194 | 197 | setRemarks(patients.getMremark()); |