jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 238bb16ff02c0a22fcfe67812ad045d0ade53128

Authored by liquanyu
1 parent 0308e97e09
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

分娩记录

Showing 2 changed files with 6 additions and 10 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientRegistrationController.java View file @ 238bb16
... ... @@ -103,9 +103,8 @@
103 103 */
104 104 @RequestMapping(value = "/queryPatientRegistrationListAll", method = RequestMethod.GET)
105 105 @ResponseBody
106   - @TokenRequired
107 106 public BaseResponse queryPatientRegistrationListAll(@Valid PatientRegistrationModelQuery modelQuery, HttpServletRequest request) {
108   - return patientRegistrationFacade.queryPatientRegistrationListAll(modelQuery,getUserId(request));
  107 + return patientRegistrationFacade.queryPatientRegistrationListAll(modelQuery);
109 108 }
110 109  
111 110  
112 111  
... ... @@ -114,9 +113,8 @@
114 113 * @Author: 武涛涛
115 114 */
116 115 @RequestMapping(value = "/exportPatientRegistration", method = RequestMethod.GET)
117   - @TokenRequired
118 116 public void exportPatientRegistration(@Valid PatientRegistrationModelQuery modelQuery, HttpServletRequest request, HttpServletResponse response) {
119   - patientRegistrationFacade.exportPatientRegistration(modelQuery,getUserId(request),response);
  117 + patientRegistrationFacade.exportPatientRegistration(modelQuery,response);
120 118 }
121 119 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientRegistrationFacade.java View file @ 238bb16
... ... @@ -307,16 +307,14 @@
307 307 * 查询全部所有记录
308 308 * @Author: 武涛涛
309 309 */
310   - public BaseListResponse queryPatientRegistrationListAll(PatientRegistrationModelQuery modelQuery,Integer userId) {
311   -
312   - String hospitalId = autoMatchFacade.getHospitalId(userId);
  310 + public BaseListResponse queryPatientRegistrationListAll(PatientRegistrationModelQuery modelQuery) {
313 311 BaseListResponse br = new BaseListResponse();
314 312 List <PatientRegistrationResult> results = new ArrayList <>();
315 313 try {
316 314 List <PatientRegistrationModel> patientRegistrationModels = new ArrayList <>();
317 315  
318 316 modelQuery.setYn(YnEnums.YES.getId());
319   - modelQuery.setHospitalId(hospitalId);
  317 + modelQuery.setHospitalId(modelQuery.getHospitalId());
320 318 modelQuery.setSort(null);
321 319 modelQuery.setQueryNo(modelQuery.getQueryNo());
322 320 if (modelQuery.getOrderDateStart() != null) {
323 321  
... ... @@ -357,10 +355,10 @@
357 355  
358 356 }
359 357  
360   - public void exportPatientRegistration(PatientRegistrationModelQuery modelQuery,Integer userId, HttpServletResponse response) {
  358 + public void exportPatientRegistration(PatientRegistrationModelQuery modelQuery, HttpServletResponse response) {
361 359  
362 360 try {
363   - BaseListResponse listResponse = (BaseListResponse) queryPatientRegistrationListAll(modelQuery,userId);
  361 + BaseListResponse listResponse = (BaseListResponse) queryPatientRegistrationListAll(modelQuery);
364 362 List <PatientRegistrationResult> list = listResponse.getData();
365 363 List<Map<String, Object>> datas = new ArrayList<>();
366 364