From 97f1d6f24f34c27f2ebe5e59671949b7e0d0b76f Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Tue, 10 Jan 2017 17:32:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=A8=A9=E4=BD=9C=E5=BA=9F=E4=BA=A7?=
 =?UTF-8?q?=E6=A3=80=E5=8A=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/controller/UsersController.java    | 38 +++++++++++++++++-----
 1 file changed, 30 insertions(+), 8 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java
index f069edd..b1b1010 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java
@@ -452,7 +452,7 @@ public class UsersController extends BaseController {
             for (Integer roleMaps : userRoleMapses) {
                 Roles roles1 = rolesService.getRoles(roleMaps);
                 if (roles1 != null && StringUtils.isNotEmpty(orgId)) {
-                    if(roles1.getOrgId() == null||roles1.getOrgId() == rog){
+                    if (roles1.getOrgId() == null || roles1.getOrgId() == rog) {
                         roles.add(roles1);
                     }
                 }
@@ -484,14 +484,14 @@ public class UsersController extends BaseController {
             //是否是建档医院
             users.setbStatus(organization.getbStatus());
 
-            String hospital=autoMatchFacade.getHospitalId(loginContext.getId());
+            String hospital = autoMatchFacade.getHospitalId(loginContext.getId());
             //设置建档方式
-            String groupId= groupsFacade.findByCurrentUserId(hospital);
-            Integer bType= GroupEnums.BuildType.SINGLE.getbType();
-            if(StringUtils.isNotEmpty(groupId)){
-                OrganizationGroups groups= groupsService.findById(groupId);
-                if(null!=groups){
-                    bType= groups.getbType();
+            String groupId = groupsFacade.findByCurrentUserId(hospital);
+            Integer bType = GroupEnums.BuildType.SINGLE.getbType();
+            if (StringUtils.isNotEmpty(groupId)) {
+                OrganizationGroups groups = groupsService.findById(groupId);
+                if (null != groups) {
+                    bType = groups.getbType();
                 }
             }
             users.setbType(bType);
@@ -1175,4 +1175,26 @@ public class UsersController extends BaseController {
         result.put("errormsg", "update");
         return result;
     }
+
+    @RequestMapping(value = "/getUserById", method = RequestMethod.GET)
+    @ResponseBody
+    public Map<String, Object> getUser(@RequestParam("id") String id) {
+        Map<String, Object> result = new HashMap<>();
+        Users users = usersService.getUsers(Integer.valueOf(id));
+        result.put("errorcode", ConstantInterface.BUSINESS_ERROR);
+        result.put("errormsg", "数据不存在");
+        if (null != users) {
+            Departments departments = departmentsService.getDepartments(users.getKsId());
+            Organization organization = organizationService.getOrganization(users.getOrgId());
+            if (null != organization) {
+                result.put("hName", organization.getName());
+            }
+            result.put("errorcode", ConstantInterface.SUCCESS);
+            result.put("errormsg", "成功");
+            if (null != departments) {
+                result.put("kName", departments.getName());
+            }
+        }
+        return result;
+    }
 }
-- 
1.8.3.1