diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java index ff8deec..9ba3891 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java @@ -181,15 +181,18 @@ public class PostReviewFacade { if(null!=patientsList.getDueStatus() && 1 == patientsList.getDueStatus()){ return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("该孕妇已终止妊娠,不能进行复查"); } - PostReviewQuery postReviewQuery = new PostReviewQuery(); - postReviewQuery.setPid(patientsList.getPid()); - postReviewQuery.setYn(YnEnums.YES.getId()); - List postReviewModels = postReviewService.findWithList(postReviewQuery); + MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); matDeliverQuery.setPid(patientsList.getPid()); matDeliverQuery.setYn(YnEnums.YES.getId()); List list = matDeliverService.query(matDeliverQuery); + + PostReviewQuery postReviewQuery = new PostReviewQuery(); + postReviewQuery.setPid(patientsList.getPid()); + postReviewQuery.setYn(YnEnums.YES.getId()); + postReviewQuery.setStart(patientsList.getFmDate()); + List postReviewModels = postReviewService.findWithList(postReviewQuery); String dueDate=""; if(CollectionUtils.isNotEmpty(list)){ dueDate= list.get(0).getDueDate(); @@ -199,6 +202,7 @@ public class PostReviewFacade { HighScoreResult highScoreResult = examinationFacade.findLastRisk(patientsList.getPid(),false); List dataList = new ArrayList<>(); + postReviewListResult.setLastBuildTime(DateUtil.getyyyy_MM_dd(patientsList.getFmDate())); if(CollectionUtils.isNotEmpty(postReviewModels)){ String hospitalName=""; for(PostReviewModel model:postReviewModels){ @@ -208,16 +212,20 @@ public class PostReviewFacade { } dataList.add(new AntData(model, hospitalName, DateUtil.parseYMD(dueDate))); } + postReviewListResult.setLastBuildTime(DateUtil.getyyyy_MM_dd(postReviewModels.get(0).getCheckTime())); } Collections.reverse(dataList); postReviewListResult.convertToResult(postReviewModels, patientsList, dueDate); postReviewListResult.setData(dataList); postReviewListResult.setRiskFactor(highScoreResult.getHighRisk()); postReviewListResult.setRiskScore(highScoreResult.getScoreStr()); + } return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(postReviewListResult); } + + /** * 根据id 获取产后记录 * diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostReviewListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostReviewListResult.java index e4695da..060a809 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostReviewListResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostReviewListResult.java @@ -38,10 +38,21 @@ public class PostReviewListResult { private String dueDate; private String addDueDate="0"; + + private String lastBuildTime; + // private List data = new ArrayList(); private String cTime; + public String getLastBuildTime() { + return lastBuildTime; + } + + public void setLastBuildTime(String lastBuildTime) { + this.lastBuildTime = lastBuildTime; + } + public String getAddDueDate() { return addDueDate; }