jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 745e8d457b02d96e0f1211124a6aed568fa540b1

Authored by jiangjiazhi
1 parent af3814e49d
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

孕妇分娩后 变成产妇

Showing 3 changed files with 16 additions and 7 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostReviewController.java View file @ 745e8d4
... ... @@ -51,8 +51,9 @@
51 51 @RequestMapping(method = RequestMethod.GET,value = "/postreviewlist")
52 52 @ResponseBody
53 53 @TokenRequired
54   - public BaseResponse queryPostReviewList(@Valid PostReviewQueryRequest postReviewQueryRequest){
55   - return postReviewFacade.queryPostList(postReviewQueryRequest);
  54 + public BaseResponse queryPostReviewList(@Valid PostReviewQueryRequest postReviewQueryRequest,HttpServletRequest request){
  55 + LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
  56 + return postReviewFacade.queryPostList(postReviewQueryRequest,loginState.getId());
56 57 }
57 58  
58 59 /**
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ 745e8d4
... ... @@ -440,9 +440,9 @@
440 440 }
441 441 //查询产妇数据
442 442 patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, hospital, 1);
443   - if (null == patients) {
  443 + /* if (null == patients) {
444 444 patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, null, 1);
445   - }
  445 + }*/
446 446 }
447 447  
448 448 if (null == patients) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java View file @ 745e8d4
... ... @@ -11,6 +11,7 @@
11 11 import com.lyms.platform.common.utils.JsonUtil;
12 12 import com.lyms.platform.operate.web.request.PostReviewQueryRequest;
13 13 import com.lyms.platform.operate.web.request.PostReviewRequest;
  14 +import com.lyms.platform.operate.web.result.HighScoreResult;
14 15 import com.lyms.platform.operate.web.result.PostReviewListResult;
15 16 import com.lyms.platform.operate.web.result.PostReviewResult;
16 17 import com.lyms.platform.pojo.MaternalDeliverModel;
17 18  
18 19  
... ... @@ -61,13 +62,17 @@
61 62 return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
62 63 }
63 64  
64   - public BaseResponse queryPostList(PostReviewQueryRequest postReviewQueryRequest) {
65   - PatientsQuery patientsQuery = new PatientsQuery();
  65 + public BaseResponse queryPostList(PostReviewQueryRequest postReviewQueryRequest,Integer userId) {
  66 + /*PatientsQuery patientsQuery = new PatientsQuery();
66 67 patientsQuery.setYn(YnEnums.YES.getId());
67 68 patientsQuery.setCardNo(postReviewQueryRequest.getCardNo());
68 69 patientsQuery.setVcCardNo(postReviewQueryRequest.getVcCardNo());
69   - Patients patientsList = patientsService.findOnePatientByCardNo(patientsQuery);
  70 + Patients patientsList = patientsService.findOnePatientByCardNo(patientsQuery);*/
  71 + String hospitalId = autoMatchFacade.getHospitalId(userId);
  72 + //取所有医院的建档数据 优先取本院 ，然后取外院
  73 + Patients patientsList = examinationFacade.findOnePatient(postReviewQueryRequest.getCardNo(), postReviewQueryRequest.getVcCardNo(), null, hospitalId, 3);
70 74 PostReviewListResult postReviewListResult = new PostReviewListResult();
  75 +
71 76 if (null != patientsList) {
72 77 PostReviewQuery postReviewQuery = new PostReviewQuery();
73 78 postReviewQuery.setPid(patientsList.getPid());
74 79  
... ... @@ -83,7 +88,10 @@
83 88 dueDate= list.get(0).getDueDate();
84 89  
85 90 }
  91 + HighScoreResult highScoreResult = examinationFacade.findLastRisk(patientsList.getId());
86 92 postReviewListResult.convertToResult(postReviewModels, patientsList, dueDate);
  93 + postReviewListResult.setRiskFactor(highScoreResult.getHighRisk());
  94 + postReviewListResult.setRiskScore(highScoreResult.getScore()+"");
87 95 }
88 96 return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(postReviewListResult);
89 97 }