diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/organ/OrganGroupService.java b/parent/base.common/src/main/java/com/lyms/base/common/service/organ/OrganGroupService.java
index 0fa2599..76d9f30 100644
--- a/parent/base.common/src/main/java/com/lyms/base/common/service/organ/OrganGroupService.java
+++ b/parent/base.common/src/main/java/com/lyms/base/common/service/organ/OrganGroupService.java
@@ -1,6 +1,7 @@
 package com.lyms.base.common.service.organ;
 
 import java.io.Serializable;
+import java.util.List;
 
 import com.lyms.base.common.entity.organ.OrganGroup;
 import com.lyms.exception.SystemException;
@@ -59,4 +60,14 @@ public interface OrganGroupService extends BaseService<OrganGroup> {
 	 */
 	public boolean updateGroup(OrganGroup organGrooup) throws SystemException;
 	
+	/** 
+	 * <li>@Description:获取所有医院组
+	 * <li>@return
+	 * <li>创建人：方承
+	 * <li>创建时间：2017年5月25日
+	 * <li>修改人：
+	 * <li>修改时间：
+	 */  
+	public List<OrganGroup> getAllEnableGroup();
+	
 }
diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/organ/OrganizationsService.java b/parent/base.common/src/main/java/com/lyms/base/common/service/organ/OrganizationsService.java
index 3c66a75..3c10b35 100644
--- a/parent/base.common/src/main/java/com/lyms/base/common/service/organ/OrganizationsService.java
+++ b/parent/base.common/src/main/java/com/lyms/base/common/service/organ/OrganizationsService.java
@@ -95,5 +95,16 @@ public interface OrganizationsService extends BaseService<Organizations> {
      * <li>修改时间：
      */
     public List<Organizations> selectListByName(String name);
+    
+    
+    /** 
+     * <li>@Description:获取所有可用的机构
+     * <li>@return
+     * <li>创建人：方承
+     * <li>创建时间：2017年5月25日
+     * <li>修改人：
+     * <li>修改时间：
+     */  
+    public List<Organizations> getAllEnableOrg();
 
 }
diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/organ/impl/OrganGroupServiceImpl.java b/parent/base.common/src/main/java/com/lyms/base/common/service/organ/impl/OrganGroupServiceImpl.java
index d377b6d..462e635 100644
--- a/parent/base.common/src/main/java/com/lyms/base/common/service/organ/impl/OrganGroupServiceImpl.java
+++ b/parent/base.common/src/main/java/com/lyms/base/common/service/organ/impl/OrganGroupServiceImpl.java
@@ -15,6 +15,7 @@ import com.lyms.base.common.dao.organ.OrganGroupMapsMapper;
 import com.lyms.base.common.entity.organ.OrganGroup;
 import com.lyms.base.common.entity.organ.OrganGroupMaps;
 import com.lyms.base.common.enums.SyncParamEnum;
+import com.lyms.base.common.enums.ValidityEnum;
 import com.lyms.base.common.service.organ.OrganGroupService;
 import com.lyms.base.common.utils.SyncComponent;
 import com.lyms.exception.SystemException;
@@ -31,29 +32,29 @@ import com.lyms.util.StrUtils;
  */
 @Service
 public class OrganGroupServiceImpl extends ServiceImpl<OrganGroupMapper, OrganGroup> implements OrganGroupService {
-    
+
     @Autowired
     private OrganGroupMapsMapper organGroupMapsMapper;
-    
+
     @Autowired
-    private SyncComponent syncComponent;
+    private SyncComponent        syncComponent;
 
     @Transactional
-	public Integer deleteLogicById(Serializable id) {
+    public Integer deleteLogicById(Serializable id) {
         organGroupMapsMapper.delete(new EntityWrapper<OrganGroupMaps>().where("GROUP_ID={0}", id));
-		return baseMapper.deleteLogicById(id);
-	}
+        return baseMapper.deleteLogicById(id);
+    }
 
-	@Override
-	@Transactional
-	public boolean create(OrganGroup organGroup) throws SystemException {
-		if (organGroup == null)
-			return false;
-		organGroup.setId(StrUtils.uuid());
-		if(StrUtils.isNotEmpty(organGroup.getOrgIds())){
+    @Override
+    @Transactional
+    public boolean create(OrganGroup organGroup) throws SystemException {
+        if (organGroup == null)
+            return false;
+        organGroup.setId(StrUtils.uuid());
+        if (StrUtils.isNotEmpty(organGroup.getOrgIds())) {
             String[] ids = organGroup.getOrgIds().split(",");
             List<OrganGroupMaps> mapsList = InstanceUtils.newArrayList();
-            for(String id : ids){
+            for (String id : ids) {
                 OrganGroupMaps maps = new OrganGroupMaps();
                 maps.setId(StrUtils.uuid());
                 maps.setGroupId(organGroup.getId());
@@ -63,37 +64,37 @@ public class OrganGroupServiceImpl extends ServiceImpl<OrganGroupMapper, OrganGr
             }
             organGroup.setOrgnumber(mapsList.size());
         }
-		Integer tag = baseMapper.insert(organGroup);
-		if(tag >= 1){
+        Integer tag = baseMapper.insert(organGroup);
+        if (tag >= 1) {
             syncComponent.addPushSyncOperation(SyncParamEnum.ORG_GROUP_INSERT, organGroup);
         }
-		return tag != null && tag > 0;
+        return tag != null && tag > 0;
 
-	}
+    }
 
-	@Override
-	@Transactional
-	public boolean deleteGroupById(String groupId) throws SystemException {
-		if (StringUtils.isBlank(groupId))
-			return false;
-		Integer tag = baseMapper.deleteById(groupId);
-		if(tag >= 1){
+    @Override
+    @Transactional
+    public boolean deleteGroupById(String groupId) throws SystemException {
+        if (StringUtils.isBlank(groupId))
+            return false;
+        Integer tag = baseMapper.deleteById(groupId);
+        if (tag >= 1) {
             syncComponent.addPushSyncOperation(SyncParamEnum.ORG_GROUP_DELETE, groupId);
         }
-		return tag != null && tag > 0;
+        return tag != null && tag > 0;
 
-	}
+    }
 
-	@Override
-	@Transactional
-	public boolean updateGroup(OrganGroup organGroup) throws SystemException {
-	    if (organGroup == null)
+    @Override
+    @Transactional
+    public boolean updateGroup(OrganGroup organGroup) throws SystemException {
+        if (organGroup == null)
             return false;
         organGroupMapsMapper.delete(new EntityWrapper<OrganGroupMaps>().where("GROUP_ID={0}", organGroup.getId()));
-        if(StrUtils.isNotEmpty(organGroup.getOrgIds())){
+        if (StrUtils.isNotEmpty(organGroup.getOrgIds())) {
             String[] ids = organGroup.getOrgIds().split(",");
             List<OrganGroupMaps> mapsList = InstanceUtils.newArrayList();
-            for(String id : ids){
+            for (String id : ids) {
                 OrganGroupMaps maps = new OrganGroupMaps();
                 maps.setId(StrUtils.uuid());
                 maps.setGroupId(organGroup.getId());
@@ -104,10 +105,17 @@ public class OrganGroupServiceImpl extends ServiceImpl<OrganGroupMapper, OrganGr
             organGroup.setOrgnumber(mapsList.size());
         }
         Integer tag = baseMapper.updateById(organGroup);
-        if(tag >= 1){
+        if (tag >= 1) {
             syncComponent.addPushSyncOperation(SyncParamEnum.ORG_GROUP_UPDATE, organGroup);
         }
         return tag != null && tag > 0;
 
-	}
+    }
+
+    @Override
+    public List<OrganGroup> getAllEnableGroup() {
+        EntityWrapper<OrganGroup> ew = new EntityWrapper<OrganGroup>();
+        ew.where("ifdel=" + ValidityEnum.VALIDITY.getValidity());
+        return selectList(ew);
+    }
 }
diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/organ/impl/OrganizationsServiceImpl.java b/parent/base.common/src/main/java/com/lyms/base/common/service/organ/impl/OrganizationsServiceImpl.java
index d085fcf..7e6c123 100644
--- a/parent/base.common/src/main/java/com/lyms/base/common/service/organ/impl/OrganizationsServiceImpl.java
+++ b/parent/base.common/src/main/java/com/lyms/base/common/service/organ/impl/OrganizationsServiceImpl.java
@@ -97,4 +97,9 @@ public class OrganizationsServiceImpl extends ServiceImpl<OrganizationsMapper, O
 		return this.selectList(ew);
 	}
 
+    @Override
+    public List<Organizations> getAllEnableOrg() {
+        return selectList(new EntityWrapper<Organizations>().where("ifdel=0").and("status!=2"));
+    }
+
 }
diff --git a/parent/center.manager/src/main/java/com/lyms/cm/controller/sys/SysRolesController.java b/parent/center.manager/src/main/java/com/lyms/cm/controller/sys/SysRolesController.java
index 627c0be..8dc4863 100644
--- a/parent/center.manager/src/main/java/com/lyms/cm/controller/sys/SysRolesController.java
+++ b/parent/center.manager/src/main/java/com/lyms/cm/controller/sys/SysRolesController.java
@@ -13,9 +13,13 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
+import com.lyms.base.common.entity.organ.OrganGroup;
+import com.lyms.base.common.entity.organ.Organizations;
 import com.lyms.base.common.entity.role.Permissions;
 import com.lyms.base.common.entity.role.RolePermissionMaps;
 import com.lyms.base.common.entity.role.Roles;
+import com.lyms.base.common.service.organ.OrganGroupService;
+import com.lyms.base.common.service.organ.OrganizationsService;
 import com.lyms.base.common.service.role.PermissionsService;
 import com.lyms.base.common.service.role.RolePermissionMapsService;
 import com.lyms.base.common.service.role.RolesService;
@@ -44,9 +48,17 @@ public class SysRolesController extends BaseController {
 
 	@Autowired
 	private RolePermissionMapsService sysRolePermissionMapsService;
+	@Autowired
+    private OrganizationsService  sysOrganizationsService;
+	@Autowired
+	private OrganGroupService sysOrganGroupService;
 
 	@RequestMapping("/toList")
-	public String list() {
+	public String list(Model model) {
+	    List<Organizations> orgs = sysOrganizationsService.getAllEnableOrg();
+	    List<OrganGroup> groups =sysOrganGroupService.getAllEnableGroup();
+	    model.addAttribute("orgs", orgs);
+	    model.addAttribute("groups", groups);
 		return "/role/role_list";
 	}
 
@@ -103,6 +115,10 @@ public class SysRolesController extends BaseController {
 			}
 			model.addAttribute("rolePermissions", permissionSB.toString().replaceFirst(",", ""));
 		}
+		List<Organizations> orgs = sysOrganizationsService.getAllEnableOrg();
+        List<OrganGroup> groups =sysOrganGroupService.getAllEnableGroup();
+        model.addAttribute("orgs", orgs);
+        model.addAttribute("groups", groups);
 		// 所有权限数据
 		List<Permissions> perList = sysPermissionsService.selectList(null);
 		model.addAttribute("perString", toJson(perList));
diff --git a/parent/center.manager/src/main/java/com/lyms/cm/controller/sys/SysUsersController.java b/parent/center.manager/src/main/java/com/lyms/cm/controller/sys/SysUsersController.java
index 24d97c7..58cd19a 100644
--- a/parent/center.manager/src/main/java/com/lyms/cm/controller/sys/SysUsersController.java
+++ b/parent/center.manager/src/main/java/com/lyms/cm/controller/sys/SysUsersController.java
@@ -87,7 +87,7 @@ public class SysUsersController extends BaseController {
 	 */
 	@RequestMapping(value = "/toList", method = { RequestMethod.GET })
 	public String toList(Model model) {
-	    List<Organizations> orgs = sysOrganizationsService.selectList(new EntityWrapper<Organizations>().where("ifdel=0").and("status!=2"));
+	    List<Organizations> orgs = sysOrganizationsService.getAllEnableOrg();
         model.addAttribute("orgs", orgs);
 		return "/user/user_list";
 	}
@@ -152,7 +152,7 @@ public class SysUsersController extends BaseController {
 		}
 		// 所有角色数据
 		List<Roles> roleList = sysRolesService.selectList(new EntityWrapper<Roles>().where("ifDel=0"));
-		List<Organizations> orgs = sysOrganizationsService.selectList(new EntityWrapper<Organizations>().where("ifdel=0").and("status!=2"));
+		List<Organizations> orgs = sysOrganizationsService.getAllEnableOrg();
 		
 		model.addAttribute("roleString", toJson(roleList));
 		model.addAttribute("orgs", orgs);
diff --git a/parent/center.manager/src/main/webapp/WEB-INF/views/role/role_edit.html b/parent/center.manager/src/main/webapp/WEB-INF/views/role/role_edit.html
index 02f27f4..b1206f6 100644
--- a/parent/center.manager/src/main/webapp/WEB-INF/views/role/role_edit.html
+++ b/parent/center.manager/src/main/webapp/WEB-INF/views/role/role_edit.html
@@ -143,13 +143,13 @@ $(function() {
 	            <div class="form-group">
 	                <label class="col-sm-3 control-label">医院id：</label>
 	                <div class="col-sm-8">
-	                    <input type="text" placeholder="医院id" value="$!role.orgId" aria-required="true" required="true" class="form-control" minlength="2" name="orgId" id="orgId">
+	                	#selector("orgId" "orgId" $orgs $!role.orgId)
 	                </div>
 	            </div>
 	            <div class="form-group">
 	                <label class="col-sm-3 control-label">医院组：</label>
 	                <div class="col-sm-8">
-	                    <input type="text" placeholder="医院组id" value="$!role.grouporgId" aria-required="true" required="true" class="form-control" minlength="2" name="grouporgId" id="grouporgId">
+	                	#selector("grouporgId" "grouporgId" $groups $!role.grouporgId)
 	                </div>
 	            </div>
 	            <div class="form-group">
diff --git a/parent/center.manager/src/main/webapp/WEB-INF/views/role/role_list.html b/parent/center.manager/src/main/webapp/WEB-INF/views/role/role_list.html
index 08a8e5a..d7a975f 100644
--- a/parent/center.manager/src/main/webapp/WEB-INF/views/role/role_list.html
+++ b/parent/center.manager/src/main/webapp/WEB-INF/views/role/role_list.html
@@ -7,21 +7,21 @@
 	                <input type="text" placeholder="角色名" id="searchName" class="form-control">
 	            </div>
 	            <div class="form-group">
-	                <input type="text" placeholder="医院id" id="searchOrgId" class="form-control">
+	            	医院：
+	            	#selector("searchOrgId" "searchOrgId" $orgs )
 	            </div>
 	            <div class="form-group">
-	                <input type="text" placeholder="医院组id" id="searchGrouporgId" class="form-control">
+	            	医院组：
+	            	#selector("searchGrouporgId" "searchGrouporgId" $groups )
 	            </div>
 	            <div class="form-group">
+	            	角色类型：
 	            	<select class="form-control m-b" name="type" id="searchType" style="margin-bottom: 0;">
 	            		<option value="">所有</option>
                         <option value="1">用户角色</option>
                         <option value="0">管理员角色</option>
                     </select>
 	            </div>
-	            <div class="form-group">
-	                <input type="text" placeholder="编号" id="searchId" class="form-control">
-	            </div>
 	        </form>
         </div>
     </div>