From ff45c9a5affa46c9b35f0cd0c1e14db5a4de78d1 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Wed, 20 Dec 2017 14:23:44 +0800 Subject: [PATCH] 1 --- .../lyms/platform/operate/web/facade/AccessPermissionFacade.java | 7 +++---- .../main/java/com/lyms/platform/operate/web/facade/TempFacade.java | 3 ++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AccessPermissionFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AccessPermissionFacade.java index 9e5e6d1..44b6aad 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AccessPermissionFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AccessPermissionFacade.java @@ -136,14 +136,13 @@ public class AccessPermissionFacade { */ public List getCurrentUserHospPermissions(Integer userId) { - List hospitalList = new ArrayList<>(); + //权限所有的医院 + List allHospitalList = new ArrayList<>(); String hospital = autoMatchFacade.getHospitalId(userId); if (null != hospital) { - hospitalList.add(hospital); + allHospitalList.add(hospital); } - //权限所有的医院 - List allHospitalList = new ArrayList<>(); DataPermissionsModelQuery dataPermissionsModelQuery = new DataPermissionsModelQuery(); dataPermissionsModelQuery.setUserId(userId); List permissionsModels = dataPermissionService.queryPermission(dataPermissionsModelQuery); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TempFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TempFacade.java index f0ef620..535b29c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TempFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TempFacade.java @@ -120,7 +120,8 @@ private AccessPermissionFacade accessPermissionFacade; patientsQuery.setLastMensesStart(queryRequest.capEnd()); patientsQuery.setLastMensesEnd(queryRequest.capStart()); patientsQuery.setExtEnable(false); - + patientsQuery.setYn(YnEnums.YES.getId()); + patientsQuery.setType(1); Date currentDate = DateUtil.formatDate(new Date()); if (null != queryRequest.getStartAge()) { Date date = DateUtil.addYear(currentDate, -queryRequest.getStartAge()); -- 1.8.3.1