Commit 4b5b71831fd40d5e0cf8f7f69adc74e7e59d2f43
1 parent
8907f2b9d1
Exists in
master
and in
3 other branches
修改复查查询本产程
Showing 2 changed files with 23 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java
View file @
4b5b718
| ... | ... | @@ -181,15 +181,18 @@ |
| 181 | 181 | if(null!=patientsList.getDueStatus() && 1 == patientsList.getDueStatus()){ |
| 182 | 182 | return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("该孕妇已终止妊娠，不能进行复查"); |
| 183 | 183 | } |
| 184 | - PostReviewQuery postReviewQuery = new PostReviewQuery(); | |
| 185 | - postReviewQuery.setPid(patientsList.getPid()); | |
| 186 | - postReviewQuery.setYn(YnEnums.YES.getId()); | |
| 187 | - List<PostReviewModel> postReviewModels = postReviewService.findWithList(postReviewQuery); | |
| 184 | + | |
| 188 | 185 | MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); |
| 189 | 186 | matDeliverQuery.setPid(patientsList.getPid()); |
| 190 | 187 | matDeliverQuery.setYn(YnEnums.YES.getId()); |
| 191 | 188 | |
| 192 | 189 | List<MaternalDeliverModel> list = matDeliverService.query(matDeliverQuery); |
| 190 | + | |
| 191 | + PostReviewQuery postReviewQuery = new PostReviewQuery(); | |
| 192 | + postReviewQuery.setPid(patientsList.getPid()); | |
| 193 | + postReviewQuery.setYn(YnEnums.YES.getId()); | |
| 194 | + postReviewQuery.setStart(patientsList.getFmDate()); | |
| 195 | + List<PostReviewModel> postReviewModels = postReviewService.findWithList(postReviewQuery); | |
| 193 | 196 | String dueDate=""; |
| 194 | 197 | if(CollectionUtils.isNotEmpty(list)){ |
| 195 | 198 | dueDate= list.get(0).getDueDate(); |
| ... | ... | @@ -199,6 +202,7 @@ |
| 199 | 202 | HighScoreResult highScoreResult = examinationFacade.findLastRisk(patientsList.getPid(),false); |
| 200 | 203 | |
| 201 | 204 | List<AntData> dataList = new ArrayList<>(); |
| 205 | + postReviewListResult.setLastBuildTime(DateUtil.getyyyy_MM_dd(patientsList.getFmDate())); | |
| 202 | 206 | if(CollectionUtils.isNotEmpty(postReviewModels)){ |
| 203 | 207 | String hospitalName=""; |
| 204 | 208 | for(PostReviewModel model:postReviewModels){ |
| 205 | 209 | |
| 206 | 210 | |
| ... | ... | @@ -208,15 +212,19 @@ |
| 208 | 212 | } |
| 209 | 213 | dataList.add(new AntData(model, hospitalName, DateUtil.parseYMD(dueDate))); |
| 210 | 214 | } |
| 215 | + postReviewListResult.setLastBuildTime(DateUtil.getyyyy_MM_dd(postReviewModels.get(0).getCheckTime())); | |
| 211 | 216 | } |
| 212 | 217 | Collections.reverse(dataList); |
| 213 | 218 | postReviewListResult.convertToResult(postReviewModels, patientsList, dueDate); |
| 214 | 219 | postReviewListResult.setData(dataList); |
| 215 | 220 | postReviewListResult.setRiskFactor(highScoreResult.getHighRisk()); |
| 216 | 221 | postReviewListResult.setRiskScore(highScoreResult.getScoreStr()); |
| 222 | + | |
| 217 | 223 | } |
| 218 | 224 | return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(postReviewListResult); |
| 219 | 225 | } |
| 226 | + | |
| 227 | + | |
| 220 | 228 | |
| 221 | 229 | /** |
| 222 | 230 | * 根据id 获取产后记录 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostReviewListResult.java
View file @
4b5b718
| ... | ... | @@ -38,9 +38,20 @@ |
| 38 | 38 | private String dueDate; |
| 39 | 39 | |
| 40 | 40 | private String addDueDate="0"; |
| 41 | + | |
| 42 | + private String lastBuildTime; | |
| 43 | + | |
| 41 | 44 | //<!---------基本信息-----------> |
| 42 | 45 | private List data = new ArrayList(); |
| 43 | 46 | private String cTime; |
| 47 | + | |
| 48 | + public String getLastBuildTime() { | |
| 49 | + return lastBuildTime; | |
| 50 | + } | |
| 51 | + | |
| 52 | + public void setLastBuildTime(String lastBuildTime) { | |
| 53 | + this.lastBuildTime = lastBuildTime; | |
| 54 | + } | |
| 44 | 55 | |
| 45 | 56 | public String getAddDueDate() { |
| 46 | 57 | return addDueDate; |