shiyang / regional-platform

Download as
Browse Code »

Commit 9f074e663e7224ed6a2481542680aa0871e16562

Authored by jiangjiazhi
1 parent 6bd2214a82
Exists in master and in 1 other branch nobuildprocess

修改新电子病历

Showing 2 changed files with 7 additions and 4 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java View file @ 9f074e6
... ... @@ -143,8 +143,10 @@
143 143 */
144 144 @RequestMapping(value = "/findp", method = RequestMethod.GET)
145 145 @ResponseBody
146   - public BaseResponse getPatent(@Valid PatientQueryRequest request){
147   - return patientFacade.findPatient(request);
  146 + @TokenRequired
  147 + public BaseResponse getPatent(@Valid PatientQueryRequest request,HttpServletRequest request1){
  148 + LoginContext loginState = (LoginContext) request1.getAttribute("loginContext");
  149 + return patientFacade.findPatient(request,loginState.getId());
148 150 }
149 151 /**
150 152 * 发送孕妇指导短信
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ 9f074e6
... ... @@ -235,13 +235,14 @@
235 235 return new BaseListResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(data).setPageInfo(patientsQuery.getPageInfo());
236 236 }
237 237  
238   - public BaseResponse findPatient(PatientQueryRequest patientQueryRequest) {
  238 + public BaseResponse findPatient(PatientQueryRequest patientQueryRequest,Integer userId) {
239 239 PatientsQuery patientsQuery = new PatientsQuery();
240 240 patientsQuery.setPid(patientQueryRequest.getPid());
241 241 patientsQuery.setId(patientQueryRequest.getId());
242 242 patientsQuery.setPhone(patientQueryRequest.getPhone());
243 243 patientsQuery.setCardNo(patientQueryRequest.getCardNo());
244   - Patients patients = patientsService.findOnePatientByCardNo(patientsQuery);
  244 + String hospital = autoMatchFacade.getHospitalId(userId);
  245 + Patients patients = antenatalExaminationFacade.findOnePatient(patientQueryRequest.getCardNo(),null,patientQueryRequest.getId(),hospital,-1,false,patientQueryRequest.getPid());
245 246 PatientBaseResult patientBaseResult = new PatientBaseResult();
246 247 if (null != patients) {
247 248 patientBaseResult.convert(patients);