From dec1b09883c7c0caf0dfe1dfb13a18b944a4aff6 Mon Sep 17 00:00:00 2001
From: baohanddd <baohanddd@gmail.com>
Date: Sun, 11 Sep 2016 19:39:03 +0800
Subject: [PATCH] add lis pacs check query

---
 .../java/com/lyms/hospitalapi/v1/HisService.java   |  4 +--
 .../operate/web/controller/RolesController.java    | 29 ++++++++++++++++++----
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/v1/HisService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/v1/HisService.java
index 243c116..0f95837 100644
--- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/v1/HisService.java
+++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/v1/HisService.java
@@ -112,7 +112,7 @@ public class HisService {
                                 check.setTitle(info.getP_TITLE());
                                 check.setAge(info.getP_AGE());
                                 check.setApplyDate(DateUtil.parseYMDHMS(info.getP_CHECKTIME()));
-                                check.setApplyDateStr(DateUtil.getyyyy_MM_dd_hms(DateUtil.parseYMDHMS(info.getP_CHECKTIME())));
+                                check.setApplyDateStr(DateUtil.getyyyy_MM_dd(DateUtil.parseYMDHMS(info.getP_CHECKTIME())));
                                 check.setCheckDept(info.getP_CHECKDEPARTNAME());
                                 check.setDoctor(info.getP_APPLATIONDOCNAME());
                                 if ("1".equals(info.getP_SEX())) {
@@ -166,7 +166,7 @@ public class HisService {
                                 check.setAge(info.getAGE().toString());
                             }
                             check.setApplyDate(DateUtil.parseYMDHMS(info.getAPPLY_TIME()));
-                            check.setApplyDateStr(DateUtil.getyyyy_MM_dd_hms(DateUtil.parseYMDHMS(info.getAPPLY_TIME())));
+                            check.setApplyDateStr(DateUtil.getyyyy_MM_dd(DateUtil.parseYMDHMS(info.getAPPLY_TIME())));
                             check.setCheckDept(info.getAPPLY_DEPT());
                             check.setDoctor(info.getEXECUTE_MAN());
                             if ("F".equals(info.getSEX())) {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java
index fe77f54..1d0a014 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java
@@ -371,14 +371,14 @@ public class RolesController extends BaseController {
     @RequestMapping(value = "/userRoles", method = RequestMethod.GET)
     @ResponseBody
     @TokenRequired
-    public FrontEndResult getUserList(HttpServletResponse response,
+    public FrontEndResult getUserList(HttpServletResponse response, HttpServletRequest request,
                                       @RequestParam(value = "keyword", required = false) String keyword,
                                       @RequestParam(value = "page", required = false) Integer page,
                                       @RequestParam(value = "limit", required = false) Integer limit,
                                       @RequestParam(value = "orgIds", required = false) String orgIds,
                                       @RequestParam(value = "enable", required = false) Integer enable) {
 
-        limit = limit == null ? 10 : limit;
+        limit = 200;
         page = page == null ? 1 : page;
 
         RolesQuery rolesQuery = new RolesQuery();
@@ -399,11 +399,30 @@ public class RolesController extends BaseController {
         }
         rolesQuery.setOrgIds(list);
         List<Roles> roles = rolesService.queryRoles(rolesQuery);
+        List<Roles> rolesList = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(roles)) {
-
+            LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
+            Users users = usersService.getUsers(loginState.getId());
+            if (users.getType() == 2) {
+                rolesList.addAll(roles);
+            } else {
+                UserRoleMapsQuery userRoleMapsQuery = new UserRoleMapsQuery();
+                userRoleMapsQuery.setYn(YnEnums.YES.getId());
+                userRoleMapsQuery.setUserId(users.getId());
+                List<UserRoleMaps> userRoleMapsList = userRoleMapsService.queryUserRoleMaps(userRoleMapsQuery);
+                List<Integer> onwerRoleIds = new ArrayList<>();
+                for (UserRoleMaps maps:userRoleMapsList) {
+                    onwerRoleIds.add(maps.getRoleId());
+                }
+                for (Roles roles1 : roles) {
+                    if (onwerRoleIds.contains(roles1.getId())) {
+                        rolesList.add(roles1);
+                    }
+                }
+            }
 
             List<Permissions> permissionses;
-            for (Roles roles1 : roles) {
+            for (Roles roles1 : rolesList) {
                 permissionses = permissionsService.queryPermissionByRoleIds1(roles1.getId());
 
           /*  RolePermissionMapsQuery rolePermissionMapsQuery = new RolePermissionMapsQuery();
@@ -432,7 +451,7 @@ public class RolesController extends BaseController {
 
         FrontEndResult frontEndResult = new FrontEndResult();
         frontEndResult.setPageInfo(rolesQuery.getPageInfo());
-        frontEndResult.setData(roles);
+        frontEndResult.setData(rolesList);
         frontEndResult.setErrorcode(ErrorCodeConstants.SUCCESS);
 
         return frontEndResult;
-- 
1.8.3.1