Commit 2a440a4e6f7d3448b979d07e25095da256016448
1 parent
fadf17a786
Exists in
master
and in
8 other branches
增加设置parentid
Showing 2 changed files with 5 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java
View file @
2a440a4
... | ... | @@ -154,7 +154,7 @@ |
154 | 154 | if(null!=organization){ |
155 | 155 | hospitalName=organization.getName(); |
156 | 156 | } |
157 | - dataList.add(new PostReviewListResult.AntData(model,hospitalName)); | |
157 | + dataList.add(new PostReviewListResult.AntData(model,hospitalName,patientsList.getFmDate())); | |
158 | 158 | } |
159 | 159 | } |
160 | 160 | postReviewListResult.convertToResult(postReviewModels, patientsList, dueDate); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostReviewListResult.java
View file @
2a440a4
... | ... | @@ -172,6 +172,7 @@ |
172 | 172 | } |
173 | 173 | int days = DateUtil.daysBetween(patients.getLastMenses(), new Date()); |
174 | 174 | this.dueWeek = StringUtils.dueWeek(days); |
175 | + | |
175 | 176 | if (null != patients.getLastMenses()) { |
176 | 177 | setLastMenses(DateUtil.getyyyy_MM_dd(patients.getLastMenses())); |
177 | 178 | } |
178 | 179 | |
... | ... | @@ -187,9 +188,10 @@ |
187 | 188 | private String hospitalName; |
188 | 189 | private String hospitalId; |
189 | 190 | |
190 | - public AntData(PostReviewModel model, String hospitalName) { | |
191 | + public AntData(PostReviewModel model, String hospitalName,Date dueDate) { | |
191 | 192 | this.id = model.getId(); |
192 | - this.dueWeek = model.getDay(); | |
193 | + int days = DateUtil.daysBetween(dueDate,model.getCheckTime()); | |
194 | + this.dueWeek= "产后"+days+"天"; | |
193 | 195 | this.checkTime = DateUtil.getyyyy_MM_dd(model.getCheckTime()); |
194 | 196 | this.hospitalId = model.getHospitalId(); |
195 | 197 | this.hospitalName = hospitalName; |