diff --git a/parent/base.common/src/main/java/com/lyms/base/common/dao/organ/OrganGroupMapsMapper.java b/parent/base.common/src/main/java/com/lyms/base/common/dao/organ/OrganGroupMapsMapper.java
index 6955eda..6e52344 100644
--- a/parent/base.common/src/main/java/com/lyms/base/common/dao/organ/OrganGroupMapsMapper.java
+++ b/parent/base.common/src/main/java/com/lyms/base/common/dao/organ/OrganGroupMapsMapper.java
@@ -7,8 +7,8 @@ import org.springframework.stereotype.Repository;
 
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.baomidou.mybatisplus.plugins.Page;
-import com.lyms.base.common.entity.organ.OrganGroup;
 import com.lyms.base.common.entity.organ.OrganGroupMaps;
+import com.lyms.base.common.entity.organ.Organizations;
 
 /**
  * <p>
@@ -23,6 +23,8 @@ public interface OrganGroupMapsMapper extends BaseMapper<OrganGroupMaps> {
 
 	public Integer deleteLogicById(Serializable id);
 	
-	public List<OrganGroup> getOrgList(Page<OrganGroup> page,Serializable groupId);
+	public List<Organizations> getOrgList(Serializable groupId);
+	
+	public List<Organizations> getPageOrgList(Page<Organizations> page,Serializable groupId);
 
 }
\ No newline at end of file
diff --git a/parent/base.common/src/main/java/com/lyms/base/common/dao/organ/OrganGroupMapsMapper.xml b/parent/base.common/src/main/java/com/lyms/base/common/dao/organ/OrganGroupMapsMapper.xml
index 0d04b39..3f8a807 100644
--- a/parent/base.common/src/main/java/com/lyms/base/common/dao/organ/OrganGroupMapsMapper.xml
+++ b/parent/base.common/src/main/java/com/lyms/base/common/dao/organ/OrganGroupMapsMapper.xml
@@ -13,8 +13,15 @@
     <sql id="Base_Column_List">
         ID AS id, GROUP_ID AS group_id, ORGAN_ID AS organ_id
     </sql>
+    <sql id="getOrgList_SQL">
+        select o.* from SYS_ORGANIZATIONS o left join SYS_ORGAN_GROUP_MAPS  g on o.ID = g.ORGAN_ID where g.GROUP_ID = #{groupId}
+    </sql>
     
     <select id="getOrgList" resultType="Organizations">
-		select o.* from SYS_ORGANIZATIONS o left join SYS_ORGAN_GROUP_MAPS  g on o.ID = g.ORGAN_ID where g.GROUP_ID = #{groupId}
+		<include refid="getOrgList_SQL" />
+	</select>
+	
+	<select id="getPageOrgList" resultType="Organizations">
+		<include refid="getOrgList_SQL" />
 	</select>
 </mapper>
diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/organ/OrganGroupMapsService.java b/parent/base.common/src/main/java/com/lyms/base/common/service/organ/OrganGroupMapsService.java
index b56c247..6d8b022 100644
--- a/parent/base.common/src/main/java/com/lyms/base/common/service/organ/OrganGroupMapsService.java
+++ b/parent/base.common/src/main/java/com/lyms/base/common/service/organ/OrganGroupMapsService.java
@@ -1,10 +1,12 @@
 package com.lyms.base.common.service.organ;
 
 import java.io.Serializable;
+import java.util.List;
 
 import com.baomidou.mybatisplus.plugins.Page;
 import com.lyms.base.common.entity.organ.OrganGroup;
 import com.lyms.base.common.entity.organ.OrganGroupMaps;
+import com.lyms.base.common.entity.organ.Organizations;
 import com.lyms.web.service.BaseService;
 
 /**
@@ -33,7 +35,18 @@ public interface OrganGroupMapsService extends BaseService<OrganGroupMaps> {
 	 * <li>修改人：
 	 * <li>修改时间：
 	 */  
-	public Page<OrganGroup> getOrgList(Page<OrganGroup> page,Serializable groupId);
+	public Page<Organizations> getOrgList(Page<Organizations> page,Serializable groupId);
+	
+	/** 
+	 * <li>@Description:根据组id获取所有机构
+	 * <li>@param groupId
+	 * <li>@return
+	 * <li>创建人：方承
+	 * <li>创建时间：2017年5月26日
+	 * <li>修改人：
+	 * <li>修改时间：
+	 */  
+	public List<Organizations> getOrgListByGroupId(Serializable groupId);
 	
 	
 }
diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/organ/impl/OrganGroupMapsServiceImpl.java b/parent/base.common/src/main/java/com/lyms/base/common/service/organ/impl/OrganGroupMapsServiceImpl.java
index 0f69ddf..3071a33 100644
--- a/parent/base.common/src/main/java/com/lyms/base/common/service/organ/impl/OrganGroupMapsServiceImpl.java
+++ b/parent/base.common/src/main/java/com/lyms/base/common/service/organ/impl/OrganGroupMapsServiceImpl.java
@@ -1,6 +1,7 @@
 package com.lyms.base.common.service.organ.impl;
 
 import java.io.Serializable;
+import java.util.List;
 
 import org.springframework.stereotype.Service;
 
@@ -9,6 +10,7 @@ import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 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.entity.organ.Organizations;
 import com.lyms.base.common.service.organ.OrganGroupMapsService;
 
 /**
@@ -27,11 +29,16 @@ public class OrganGroupMapsServiceImpl extends ServiceImpl<OrganGroupMapsMapper,
 	}
 
     @Override
-    public Page<OrganGroup> getOrgList(Page<OrganGroup> page,Serializable groupId) {
-        page.setRecords(baseMapper.getOrgList(page,groupId));
+    public Page<Organizations> getOrgList(Page<Organizations> page,Serializable groupId) {
+        page.setRecords(baseMapper.getPageOrgList(page,groupId));
         return page; 
     }
 
+    @Override
+    public List<Organizations> getOrgListByGroupId(Serializable groupId) {
+        return baseMapper.getOrgList(groupId);
+    }
+
    
 
 }
diff --git a/parent/center.manager/src/main/java/com/lyms/cm/controller/sys/SysOrganGroupController.java b/parent/center.manager/src/main/java/com/lyms/cm/controller/sys/SysOrganGroupController.java
index e089efc..e3f41da 100644
--- a/parent/center.manager/src/main/java/com/lyms/cm/controller/sys/SysOrganGroupController.java
+++ b/parent/center.manager/src/main/java/com/lyms/cm/controller/sys/SysOrganGroupController.java
@@ -1,25 +1,30 @@
 package com.lyms.cm.controller.sys;
 
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+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.UserRoleMaps;
 import com.lyms.base.common.enums.ValidityEnum;
 import com.lyms.base.common.service.organ.OrganGroupMapsService;
 import com.lyms.base.common.service.organ.OrganGroupService;
+import com.lyms.base.common.service.organ.OrganizationsService;
 import com.lyms.constants.OperationName;
 import com.lyms.util.StrUtils;
 import com.lyms.web.bean.AjaxResult;
 import com.lyms.web.controller.BaseController;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import java.util.Map;
 
 /**
  * <p>
@@ -37,6 +42,9 @@ public class SysOrganGroupController extends BaseController {
 	
 	@Autowired
 	private OrganGroupMapsService organGroupMapsService;
+	
+	@Autowired
+    private OrganizationsService  sysOrganizationsService;
 
 	/**
 	 * <li>@Description:跳转到租列表
@@ -47,7 +55,9 @@ public class SysOrganGroupController extends BaseController {
 	 * <li>修改时间：
 	 */
 	@RequestMapping(value = "/toList", method = RequestMethod.GET)
-	public String toList() {
+	public String toList(Model model) {
+	    List<Organizations> orgs = sysOrganizationsService.getAllEnableOrg();
+	    model.addAttribute("orgs", orgs);
 		return "/group/group_list";
 	}
 
@@ -78,10 +88,18 @@ public class SysOrganGroupController extends BaseController {
 	 */
 	@RequestMapping(value = { "/{id}/toEdit" }, method = RequestMethod.GET)
 	public String toEdit(@PathVariable String id, Model model) {
-		if (!StringUtils.isBlank(id)) {
+		if (!StringUtils.isBlank(id) && ! "0".equals(id)) {
 			OrganGroup group = groupService.selectById(id);
 			model.addAttribute("group", group);
+			List<Organizations> includeOrgs = organGroupMapsService.getOrgListByGroupId(group.getId());
+			StringBuilder orgSB = new StringBuilder();
+            for (Organizations orgEntity : includeOrgs) {
+                orgSB.append("," + orgEntity.getId());
+            }
+            model.addAttribute("includeOrgs", orgSB.toString().replaceFirst(",", ""));
 		}
+		List<Organizations> orgs = sysOrganizationsService.getAllEnableOrg();
+	    model.addAttribute("orgs", orgs);
 		return "/group/group_edit";
 	}
     @ResponseBody
@@ -109,7 +127,7 @@ public class SysOrganGroupController extends BaseController {
     @ResponseBody
     @RequestMapping(value = "/listGroupOrg/{groupId}", method = { RequestMethod.GET, RequestMethod.POST })
     public Map<String, Object> listGroupOrg(@PathVariable String groupId) {
-        Page<OrganGroup> page = getPage();
+        Page<Organizations> page = getPage();
         if(StrUtils.isNotEmpty(groupId)){
             page = organGroupMapsService.getOrgList(page,groupId);
         }
diff --git a/parent/center.manager/src/main/webapp/WEB-INF/views/group/group_edit.html b/parent/center.manager/src/main/webapp/WEB-INF/views/group/group_edit.html
index 35e7c6e..a8f602a 100644
--- a/parent/center.manager/src/main/webapp/WEB-INF/views/group/group_edit.html
+++ b/parent/center.manager/src/main/webapp/WEB-INF/views/group/group_edit.html
@@ -36,11 +36,7 @@
 	            </div>
                 <div class="form-group">
 	                <label class="col-sm-3 control-label">医院列表:</label>
-	                <button class="btn btn-info " type="button" onclick="del();"><i class="fa fa-trash"></i> 移除</button>
-	            </div>
-	            <div class="form-group">
-	            	<input type="hidden" id="orgIds" name="orgIds"/>
-	                <table id="orgList"></table>
+	                #selector("orgIds" "orgIds" $orgs $!includeOrgs true)
 	            </div>
 	            <div class="hr-line-dashed"></div>
 	            <div class="form-group">
@@ -51,62 +47,9 @@
 	            </div>
 	        </form>
 		</div>
-		<!-- 所有医院 -->
-		<div class="col-sm-8">
-			<div style="padding-top:30px;">
-				<form class="form-inline">
-					<div class="form-group">
-		                <input type="text" placeholder="请输入医院名过滤" id="groupName" name="groupName" class="form-control">
-		            </div>
-		            <div class="form-group" onclick="search();">
-		                 <a class="btn btn-primary"><i class="fa fa-search"></i> 查询</a>
-		            </div>
-		            <div class="form-group" onclick="add();">
-		                 <a class="btn btn-primary"><i class="fa fa-plus"></i> 添加</a>
-		            </div>
-		        </form>
-	        </div>
-		<table id="dataTable"></table>
     </div>
 </div>
 <script type="text/javascript">
-function search(){
-	var queryParams = {
-		query:{
-			name: $("#groupName").val()
-		}
-	}
-	 $('#dataTable').bootstrapTable('refresh', queryParams );
-}
-function add(){
-	var list = $('#dataTable').bootstrapTable('getSelections');
-	for(var i = 0 ; i< list.length ; i++){
-		if(! $('#orgList').bootstrapTable('getRowByUniqueId', list[i]['id'])){
-			var row = [];
-			row.push({
-	            id: list[i]['id'],
-	            name: list[i]['name']
-	        });
-			$('#orgList').bootstrapTable('append', row);
-		}
-	}
-	$('#orgIds').val(getOrgIds());
-}
-function del(){
-	var list = $('#orgList').bootstrapTable('getSelections');
-	for(var i = 0 ; i< list.length ; i++){
-		 $('#orgList').bootstrapTable('remove', {field: 'id', values: list[i]['id']});
-	}
-	$('#orgIds').val(getOrgIds());
-}
-function getOrgIds(){
-	var list = $('#orgList').bootstrapTable('getData');
-	var ids = [];
-	for(var i = 0 ;i < list.length ;i++){
-		ids.push(list[i]['id']);
-	}
-	return ids.join(',');
-}
 function save(){
 	if($('#validForm').valid()){
 		var data = $('#validForm').serialize();
@@ -119,159 +62,6 @@ function save(){
 		parent.reloadGrid('dataTable');
 	}
 }
-
-var controllerRequestMappint = "/sysOrganizations/";
-
-## 参考 base_table_init.js 或者根据empty_bootstrap_table_init.js 来自己创建特殊的table
-## 注意:自己创建的特殊的table不能extends base_list.html
-var default_dataUrl = APP.PATH + controllerRequestMappint + "list";
-var default_dataColumns = [{
-					    field: 'check_state',
-					    title: '',
-					    checkbox: true
-					},{
-					    field: 'id',
-					    title: '编号'
-					},{
-					    field: 'name',
-					    title: '名称'
-					},{
-					    field: 'type',
-					    title: '类型',
-					    formatter:function(value,row,index){  
-					    	//1:卫生与计划生育委员会,2:妇幼保健院/站,3:妇产(科)医院,4:综合医院,5:计生站,6:卫生院,7:卫生所,8:其他
-					    	switch(value){
-					    	case 1:return "卫生与计划生育委员会";
-					    	case 2:return "妇幼保健院/站";
-					    	case 3:return "妇产(科)医院";
-					    	case 4:return "综合医院";
-					    	case 5:return "计生站";
-					    	case 6:return "卫生院";
-					    	case 7:return "卫生所";
-					    	case 8:return "其他";
-					    	}
-					    }
-					},{
-					    field: 'shortCode',
-					    title: '简码'
-					},{
-					    field: 'level',
-					    title: '等级',
-					    formatter:function(value,row,index){
-					    	switch (value) {
-							case 1:return "省";
-							case 2:return "市";
-							case 3:return "区县";
-							case 4:return "乡镇";
-							case 5:return "村";
-							case 6:return "其他";
-
-							default:
-								return "";
-							}
-					    }
-					},{
-					    field: 'gradeLevel',
-					    title: '医院等级'
-					},{
-					    field: 'mobile',
-					    title: '服务热线'
-					},{
-					    field: 'starLevel',
-					    title: '星级'
-					},{
-					    field: 'status',
-					    title: '状态',
-					    formatter:function(value,row,index){
-					    	switch (value) {
-							case 0: return "正式运行";
-							case 1: return "试运行";
-							case 2: return "停止运行";
-							default:
-								break;
-							}
-					    }
-					},{
-					    field: 'address',
-					    title: '地址'
-					}];
-					
 </script>
 #end 
-#extends("/common/base_list.html")
-
-<script type="text/javascript">
-//拥有医院列表
-$(function () {
-    var orgListTable = new orgLostTableInit();
-    orgListTable.Init();
-})
-
-
-
-var orgLostTableInit = function () {
-    var orgListTableInit = new Object();
-    //初始化Table
-    orgListTableInit.Init = function () {
-        $('#orgList').bootstrapTable({
-            url: '${ctx}/sysOrganGroup/listGroupOrg/$!group.id',     //请求后台的URL（*）
-            method: 'get',           //请求方式（*）
-            striped: true,           //是否显示行间隔色
-            cache: false,            //是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）
-            sortable: false,           //是否启用排序
-            queryParams: orgListTableInit.queryParams,//传递参数（*）
-            sidePagination: "server",      //分页方式：client客户端分页，server服务端分页（*）
-            pageNumber:1,            //初始化加载第一页，默认第一页
-            pageSize: 999,            //每页的记录行数（*）
-            pageList: [999],    //可供选择的每页的行数（*）
-            strictSearch: true,
-            clickToSelect: true,        //是否启用点击选中行
-            //height: 600,            //行高，如果没有设置height属性，表格自动根据记录条数觉得表格高度
-            uniqueId: "id",           //每一行的唯一标识，一般为主键列
-            cardView: false,          //是否显示详细视图
-            detailView: false,          //是否显示父子表
-            columns: [{
-                field: 'check_state',
-                title: '',
-                checkbox: true
-            },{
-                field: 'id',
-                title: '序号',
-                visible: false
-            }, {
-                field: 'name',
-                title: '医院名称'
-            }],
-            onLoadSuccess: function(){  //加载成功时执行  
-           		var list = $('#orgList').bootstrapTable('getData');
-           		var ids = [];
-           		for(var i = 0 ;i< list.length ; i++	){
-           			ids.push(list[i]['id']);
-           		}
-           		$('#orgIds').val(ids.join(','));
-            }
-        });
-    };
-
-    //得到查询的参数
-    orgListTableInit.queryParams = function (params) {
-        var temp = {  //这里的键的名字和控制器的变量名必须一直，这边改动，控制器也需要改成一样的
-    		_size: 999,  //每页记录数
-			_offset: 1 , //偏移量
-            /*sdate: $("#stratTime").val(),
-            edate: $("#endTime").val(),
-            sellerid: $("#sellerid").val(),
-            orderid: $("#orderid").val(),
-            CardNumber: $("#CardNumber").val(),
-            maxrows: params.limit,
-            pageindex: params.pageNumber,
-            portid: $("#portid").val(),
-            CardNumber: $("#CardNumber").val(),
-            tradetype: $('input:radio[name="tradetype"]:checked').val(),
-            success: $('input:radio[name="success"]:checked').val(),*/
-        };
-        return temp;
-    };
-    return orgListTableInit;
-};
-</script>
\ No newline at end of file
+#extends("/common/base_list.html")
\ No newline at end of file
diff --git a/parent/center.manager/src/main/webapp/WEB-INF/views/group/group_list.html b/parent/center.manager/src/main/webapp/WEB-INF/views/group/group_list.html
index 0bb8dab..55f4dec 100644
--- a/parent/center.manager/src/main/webapp/WEB-INF/views/group/group_list.html
+++ b/parent/center.manager/src/main/webapp/WEB-INF/views/group/group_list.html
@@ -1,6 +1,6 @@
 #override("body")
 
-<div class="ibox float-e-margins"><div class="row wrapper border-bottom white-bg page-heading">
+<!-- <div class="ibox float-e-margins"><div class="row wrapper border-bottom white-bg page-heading">
     <div class="col-sm-10">
     	<div style="padding-top:30px;">
 	        <form role="form" class="form-inline">
@@ -25,7 +25,7 @@
             <a class="btn btn-primary"><i class="fa fa-search"></i> 查询</a>
         </div>
     </div>
-</div>
+</div> -->
 <div class="wrapper wrapper-content">
     <div class="row">
         <div class="col-sm-12">