diff --git a/parent/center.manager/src/main/java/com/lyms/cm/controller/sys/SysDepartmentsController.java b/parent/center.manager/src/main/java/com/lyms/cm/controller/sys/SysDepartmentsController.java
index da65be0..7834800 100644
--- a/parent/center.manager/src/main/java/com/lyms/cm/controller/sys/SysDepartmentsController.java
+++ b/parent/center.manager/src/main/java/com/lyms/cm/controller/sys/SysDepartmentsController.java
@@ -1,5 +1,6 @@
 package com.lyms.cm.controller.sys;
 
+import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.lang3.StringUtils;
@@ -14,8 +15,10 @@ 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.Departments;
+import com.lyms.base.common.entity.organ.Organizations;
 import com.lyms.base.common.enums.ValidityEnum;
 import com.lyms.base.common.service.organ.DepartmentsService;
+import com.lyms.base.common.service.organ.OrganizationsService;
 import com.lyms.constants.OperationName;
 import com.lyms.util.StrUtils;
 import com.lyms.web.bean.AjaxResult;
@@ -35,6 +38,10 @@ public class SysDepartmentsController extends BaseController {
 
 	@Autowired
 	private DepartmentsService departmentService;
+	@Autowired
+    private OrganizationsService  sysOrganizationsService;
+	@Autowired
+    private DepartmentsService sysDepartmentsService;
 
 	/**
 	 * <li>@Description:到部门科室列表
@@ -45,7 +52,9 @@ public class SysDepartmentsController 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 "/depart/depart_list";
 	}
 
@@ -90,7 +99,11 @@ public class SysDepartmentsController extends BaseController {
 		if (StringUtils.isNotBlank(id)) {
 			Departments departments = departmentService.selectById(id);
 			model.addAttribute("depart", departments);
+			List<Departments> depts = sysDepartmentsService.selectList(new EntityWrapper<Departments>().where("ifdel=0").and("ORG_ID={0}",departments.getOrgId()));
+            model.addAttribute("depts", depts);
 		}
+		List<Organizations> orgs = sysOrganizationsService.getAllEnableOrg();
+        model.addAttribute("orgs", orgs);
 		return "/depart/depart_edit";
 	}
 
diff --git a/parent/center.manager/src/main/webapp/WEB-INF/views/depart/depart_edit.html b/parent/center.manager/src/main/webapp/WEB-INF/views/depart/depart_edit.html
index 3ddfb1b..a2d8ae0 100644
--- a/parent/center.manager/src/main/webapp/WEB-INF/views/depart/depart_edit.html
+++ b/parent/center.manager/src/main/webapp/WEB-INF/views/depart/depart_edit.html
@@ -11,9 +11,9 @@
             </div>
 
             <div class="form-group">
-                <label class="col-sm-3 control-label">医院id:</label>
+                <label class="col-sm-3 control-label">医院:</label>
                 <div class="col-sm-8">
-                	<input type="text" placeholder="医院id" value="$!depart.orgId" aria-required="true" required="true" class="form-control" minlength="2" name="orgId" id="orgId">
+                	#selector("orgId" "orgId" $orgs $!depart.orgId)
                 	 <!--  
                      <select class="form-control" name="orgId" id="orgs">
                      	<option value="0">--选择--</option>
@@ -25,7 +25,7 @@
             <div class="form-group">
                 <label class="col-sm-3 control-label">上级科室id:</label>
                 <div class="col-sm-8">
-                	<input type="text" placeholder="上级科室id" value="$!depart.parentId" class="form-control"  name="parentId" id="parentId">
+                	#selector("parentId" "parentId" $depts $!depart.parentId)
                 	<!-- 
                      <select class="form-control" name="parentId" id="parent">
                      	<option value="0">--选择--</option>
@@ -72,6 +72,37 @@
     </div>
 </div>
 <script type="text/javascript">
+$(function () {
+    var orgId_select = $('#orgId');
+    orgId_select.on("change",function(){
+    	if(orgId_select.val() != ""){
+    		var url = APP.PATH +"/sysDepartments/list";
+    		$.ajax({
+                url: url,
+                cache: false,
+                data: { orgId : orgId_select.val() },
+                dataType: "json",
+                success: function(data){
+                    if(data && data.rows){
+                    	var deptOpt = $("#parentId option");
+                    	deptOpt.remove();
+                    	$('#parentId').append('<option value="">&nbsp;</option>'); 
+                    	for(idx in data.rows){
+                    		$('#parentId').append('<option value="' + data.rows[idx].id + '">' + data.rows[idx].name + '</option>'); 
+                    	}
+                    	$('#parentId').selectator('destroy');
+                    	$('#parentId').selectator({
+							labels: {
+								search: 'Search here...'
+							}
+						});
+
+                    }
+                }
+            });
+    	}
+    });
+})
 	function save(){
 		if($('#validForm').valid()){
 			var data = $('#validForm').serialize();
diff --git a/parent/center.manager/src/main/webapp/WEB-INF/views/depart/depart_list.html b/parent/center.manager/src/main/webapp/WEB-INF/views/depart/depart_list.html
index 6e81e81..5de32e6 100644
--- a/parent/center.manager/src/main/webapp/WEB-INF/views/depart/depart_list.html
+++ b/parent/center.manager/src/main/webapp/WEB-INF/views/depart/depart_list.html
@@ -4,11 +4,11 @@
     	<div style="padding-top:30px;">
 	        <form role="form" class="form-inline">
 	        	<div class="form-group" id="leve">
-	        		<span class="form-control">医院id</span>
-	        		<input type="text" placeholder="医院id" id="searchOrgId" class="form-control">
+	        		医院：
+	        		#selector("searchOrgId" "orgId" $orgs)
 	        	</div>
 	        	<div class="form-group" id="leve">
-	        		<span class="form-control">科室名称</span>
+	        		科室名称
 	        		<input type="text" placeholder="科室名称" id="searchName" class="form-control">
 	        	</div>
 	        </form>