jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 2a1c792ee9357448d194766c65a80d6735e560e9

Authored by litao@lymsh.com
2 parents 2359c203d3 a18a74c44d
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 2 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AccessPermissionFacade.java View file @ 2a1c792
... ... @@ -136,14 +136,13 @@
136 136 */
137 137 public List<String> getCurrentUserHospPermissions(Integer userId)
138 138 {
139   - List<String> hospitalList = new ArrayList<>();
  139 + //权限所有的医院
  140 + List<String> allHospitalList = new ArrayList<>();
140 141 String hospital = autoMatchFacade.getHospitalId(userId);
141 142 if (null != hospital) {
142   - hospitalList.add(hospital);
  143 + allHospitalList.add(hospital);
143 144 }
144 145  
145   - //权限所有的医院
146   - List<String> allHospitalList = new ArrayList<>();
147 146 DataPermissionsModelQuery dataPermissionsModelQuery = new DataPermissionsModelQuery();
148 147 dataPermissionsModelQuery.setUserId(userId);
149 148 List<DataPermissionsModel> permissionsModels = dataPermissionService.queryPermission(dataPermissionsModelQuery);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TempFacade.java View file @ 2a1c792
... ... @@ -120,7 +120,8 @@
120 120 patientsQuery.setLastMensesStart(queryRequest.capEnd());
121 121 patientsQuery.setLastMensesEnd(queryRequest.capStart());
122 122 patientsQuery.setExtEnable(false);
123   -
  123 + patientsQuery.setYn(YnEnums.YES.getId());
  124 + patientsQuery.setType(1);
124 125 Date currentDate = DateUtil.formatDate(new Date());
125 126 if (null != queryRequest.getStartAge()) {
126 127 Date date = DateUtil.addYear(currentDate, -queryRequest.getStartAge());