fangcheng / regional-platform

Download as
Browse Code »

Commit dfe3970b98cd578f07ffc93996a6c85935cc140f

Authored by liquanyu
2 parents 8b8db96474 dbee830b65
Exists in master and in 1 other branch nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 8 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostReviewController.java View file @ dfe3970
... ... @@ -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 @ dfe3970
... ... @@ -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 @ dfe3970
... ... @@ -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 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/QuideQuery.java View file @ dfe3970
  1 +package com.lyms.platform.operate.web.request;
  2 +
  3 +/**
  4 + * Created by Administrator on 2016/8/5 0005.
  5 + */
  6 +public class QuideQuery {
  7 +}
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyApplyOrderResult.java View file @ dfe3970
1 1 package com.lyms.platform.operate.web.result;
2 2  
3 3 import com.lyms.platform.common.utils.DateUtil;
  4 +import com.lyms.platform.common.utils.StringUtils;
4 5 import com.lyms.platform.pojo.ReferralApplyOrderModel;
5 6  
6 7 /**
... ... @@ -76,7 +77,7 @@
76 77 setBabyId(referralApplyOrderModel.getParentId());
77 78 setmName(referralApplyOrderModel.getMname());
78 79 setSex("女");
79   - setPhone(referralApplyOrderModel.getPhone());
  80 + setPhone(StringUtils.encryPhone(referralApplyOrderModel.getPhone()));
80 81 setApplyDoctor(referralApplyOrderModel.getApplyDoctor());
81 82 if (null != referralApplyOrderModel.getReceived()) {
82 83 setReceived(DateUtil.getyyyy_MM_dd(referralApplyOrderModel.getReceived()));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java View file @ dfe3970
... ... @@ -2,6 +2,7 @@
2 2  
3 3 import com.lyms.platform.common.base.IBasicResultConvert;
4 4 import com.lyms.platform.common.utils.DateUtil;
  5 +import com.lyms.platform.common.utils.StringUtils;
5 6 import com.lyms.platform.pojo.Patients;
6 7  
7 8 import java.util.Date;
... ... @@ -118,7 +119,7 @@
118 119 setAge(destModel.getAge());
119 120 setCheckDoctor(destModel.getLastReportDoctorName());
120 121 setName(destModel.getUsername());
121   - setPhone(destModel.getPhone());
  122 + setPhone(StringUtils.encryPhone(destModel.getPhone()));
122 123 if (null != destModel.getFmDate()) {
123 124 setDueWeek(DateUtil.getyyyy_MM_dd(destModel.getFmDate()));
124 125 setcTime(DateUtil.daysBetween(destModel.getFmDate(),new Date())+"天");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanPatientsResult.java View file @ dfe3970
... ... @@ -4,6 +4,7 @@
4 4 import com.lyms.platform.common.enums.ServiceTypeEnums;
5 5 import com.lyms.platform.common.utils.DateUtil;
6 6 import com.lyms.platform.common.utils.JsonUtil;
  7 +import com.lyms.platform.common.utils.StringUtils;
7 8 import com.lyms.platform.pojo.Patients;
8 9  
9 10 /**
... ... @@ -147,7 +148,7 @@
147 148 if(null!=destModel.getDueDate()){
148 149 setDueDate(DateUtil.getyyyy_MM_dd(destModel.getDueDate()));
149 150 }
150   - setPhone(destModel.getPhone());
  151 + setPhone(StringUtils.encryPhone(destModel.getPhone()));
151 152 setCheckDoctor(destModel.getLastReportDoctorName());
152 153 setlName("登记人");
153 154 if(null!=destModel.getServiceType()){
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/RiskPatientsResult.java View file @ dfe3970
... ... @@ -5,6 +5,7 @@
5 5 import com.lyms.platform.common.core.annotation.form.FormParam;
6 6 import com.lyms.platform.common.utils.DateUtil;
7 7 import com.lyms.platform.common.utils.JsonUtil;
  8 +import com.lyms.platform.common.utils.StringUtils;
8 9 import com.lyms.platform.operate.web.request.BasePageQueryRequest;
9 10 import com.lyms.platform.pojo.Patients;
10 11 import com.lyms.platform.pojo.PuerperaModel;
... ... @@ -160,7 +161,7 @@
160 161 sethScore(destModel.getRiskScore());
161 162 setcTime(DateUtil.getyyyy_MM_dd(destModel.getNextCheckTime()));
162 163 setDueDate(DateUtil.getyyyy_MM_dd(destModel.getDueDate()));
163   - setPhone(destModel.getPhone());
  164 + setPhone(StringUtils.encryPhone(destModel.getPhone()));
164 165 setCheckDoctor(destModel.getLastReportDoctorName());
165 166 setlName("登记人");
166 167 return this;