From 745e8d457b02d96e0f1211124a6aed568fa540b1 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Fri, 5 Aug 2016 17:04:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=95=E5=A6=87=E5=88=86=E5=A8=A9=E5=90=8E?= =?UTF-8?q?=20=E5=8F=98=E6=88=90=E4=BA=A7=E5=A6=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/controller/PostReviewController.java | 5 +++-- .../operate/web/facade/AntenatalExaminationFacade.java | 4 ++-- .../lyms/platform/operate/web/facade/PostReviewFacade.java | 14 +++++++++++--- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostReviewController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostReviewController.java index 9a9292b..a69836f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostReviewController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostReviewController.java @@ -51,8 +51,9 @@ public class PostReviewController extends BaseController { @RequestMapping(method = RequestMethod.GET,value = "/postreviewlist") @ResponseBody @TokenRequired - public BaseResponse queryPostReviewList(@Valid PostReviewQueryRequest postReviewQueryRequest){ - return postReviewFacade.queryPostList(postReviewQueryRequest); + public BaseResponse queryPostReviewList(@Valid PostReviewQueryRequest postReviewQueryRequest,HttpServletRequest request){ + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + return postReviewFacade.queryPostList(postReviewQueryRequest,loginState.getId()); } /** diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index fcd98c7..bf7fa0b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -440,9 +440,9 @@ public class AntenatalExaminationFacade { } //查询产妇数据 patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, hospital, 1); - if (null == patients) { + /* if (null == patients) { patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, null, 1); - } + }*/ } if (null == patients) { 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 fd1ad28..9614719 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 @@ -11,6 +11,7 @@ import com.lyms.platform.common.utils.Assert; import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.operate.web.request.PostReviewQueryRequest; import com.lyms.platform.operate.web.request.PostReviewRequest; +import com.lyms.platform.operate.web.result.HighScoreResult; import com.lyms.platform.operate.web.result.PostReviewListResult; import com.lyms.platform.operate.web.result.PostReviewResult; import com.lyms.platform.pojo.MaternalDeliverModel; @@ -61,13 +62,17 @@ public class PostReviewFacade { return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } - public BaseResponse queryPostList(PostReviewQueryRequest postReviewQueryRequest) { - PatientsQuery patientsQuery = new PatientsQuery(); + public BaseResponse queryPostList(PostReviewQueryRequest postReviewQueryRequest,Integer userId) { + /*PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setYn(YnEnums.YES.getId()); patientsQuery.setCardNo(postReviewQueryRequest.getCardNo()); patientsQuery.setVcCardNo(postReviewQueryRequest.getVcCardNo()); - Patients patientsList = patientsService.findOnePatientByCardNo(patientsQuery); + Patients patientsList = patientsService.findOnePatientByCardNo(patientsQuery);*/ + String hospitalId = autoMatchFacade.getHospitalId(userId); + //取所有医院的建档数据 优先取本院 ，然后取外院 + Patients patientsList = examinationFacade.findOnePatient(postReviewQueryRequest.getCardNo(), postReviewQueryRequest.getVcCardNo(), null, hospitalId, 3); PostReviewListResult postReviewListResult = new PostReviewListResult(); + if (null != patientsList) { PostReviewQuery postReviewQuery = new PostReviewQuery(); postReviewQuery.setPid(patientsList.getPid()); @@ -83,7 +88,10 @@ public class PostReviewFacade { dueDate= list.get(0).getDueDate(); } + HighScoreResult highScoreResult = examinationFacade.findLastRisk(patientsList.getId()); postReviewListResult.convertToResult(postReviewModels, patientsList, dueDate); + postReviewListResult.setRiskFactor(highScoreResult.getHighRisk()); + postReviewListResult.setRiskScore(highScoreResult.getScore()+""); } return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(postReviewListResult); } -- 1.8.3.1