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 10fcc84..da65be0 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
@@ -17,6 +17,7 @@ import com.lyms.base.common.entity.organ.Departments;
 import com.lyms.base.common.enums.ValidityEnum;
 import com.lyms.base.common.service.organ.DepartmentsService;
 import com.lyms.constants.OperationName;
+import com.lyms.util.StrUtils;
 import com.lyms.web.bean.AjaxResult;
 import com.lyms.web.controller.BaseController;
 
@@ -64,6 +65,14 @@ public class SysDepartmentsController extends BaseController {
 		Page<Departments> page = getPage();
 		EntityWrapper<Departments> ew = new EntityWrapper<Departments>();
 		ew.where("ifdel=" + ValidityEnum.VALIDITY.getValidity());
+		String searchName = getParameter("name");
+        String searchOrgId = getParameter("orgId");
+        if (StrUtils.isNotEmpty(searchName)) {
+            ew.and("name like {0}", searchName.trim() + "%");
+        }
+        if (StrUtils.isNotEmpty(searchOrgId)) {
+            ew.and("org_id = {0}", searchOrgId.trim() );
+        }
 		page = departmentService.selectPage(page, ew);
 		return toGridData(page);
 	}
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 918ccfb..583e073 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
@@ -4,27 +4,33 @@
         <form id="validForm" class="form-horizontal m-t" novalidate="novalidate">
         	<input type="hidden" id="depart.id" name="id" value="$!depart.id"/>
             <div class="form-group">
-                <label class="col-sm-3 control-label">名称:</label>
+                <label class="col-sm-3 control-label">科室名称:</label>
                 <div class="col-sm-8">
                     <input type="text" placeholder="科室名称" value="$!depart.name" aria-required="true" required="true" class="form-control" minlength="2" name="name" id="name">
                 </div>
             </div>
 
             <div class="form-group">
-                <label class="col-sm-3 control-label">医院:</label>
+                <label class="col-sm-3 control-label">医院id:</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">
+                	 <!--  
                      <select class="form-control" name="orgId" id="orgs">
                      	<option value="0">--选择--</option>
                      </select>
+                     -->
                 </div>
             </div>
             
             <div class="form-group">
-                <label class="col-sm-3 control-label">上级科室:</label>
+                <label class="col-sm-3 control-label">上级科室id:</label>
                 <div class="col-sm-8">
+                	<input type="text" placeholder="上级科室id" value="$!depart.parentId" aria-required="true" required="true" class="form-control" minlength="2" name="parentId" id="parentId">
+                	<!-- 
                      <select class="form-control" name="parentId" id="parent">
                      	<option value="0">--选择--</option>
                      </select>
+                     -->
                 </div>
             </div>
             
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 f2cbed9..6e81e81 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,14 +4,18 @@
     	<div style="padding-top:30px;">
 	        <form role="form" class="form-inline">
 	        	<div class="form-group" id="leve">
-	        		<span class="form-control">医院组</span>
-	        		<input type="text" placeholder="请输入医院组名称" id="usernameSearch" class="form-control">
+	        		<span class="form-control">医院id</span>
+	        		<input type="text" placeholder="医院id" id="searchOrgId" class="form-control">
+	        	</div>
+	        	<div class="form-group" id="leve">
+	        		<span class="form-control">科室名称</span>
+	        		<input type="text" placeholder="科室名称" id="searchName" class="form-control">
 	        	</div>
 	        </form>
         </div>
     </div>
     <div class="col-sm-2">
-        <div class="title-action">
+        <div class="title-action" onclick="search();">
             <a class="btn btn-primary"><i class="fa fa-search"></i> 查询</a>
         </div>
     </div>
@@ -33,6 +37,15 @@
 <script type="text/javascript">
 
 var controllerRequestMappint = "/sysDepartments/";
+function search(){
+	var queryParams = {
+		query:{
+			name: $("#searchName").val(),
+			orgId: $("#searchOrgId").val()
+		}
+	}
+	 $('#dataTable').bootstrapTable('refresh', queryParams );
+}
 
 function add() {
 	popWindow("添加科室/科室", APP.PATH + controllerRequestMappint + "/toEdit?orgId=",700,550);
@@ -60,7 +73,7 @@ var default_dataColumns = [{
 					    title: '编号'
 					},{
 					    field: 'name',
-					    title: '名称'
+					    title: '科室名称'
 					},{
 					    field: 'orgId',
 					    title: '医院'
diff --git a/parent/center.manager/src/main/webapp/WEB-INF/views/organ/org_list.html b/parent/center.manager/src/main/webapp/WEB-INF/views/organ/org_list.html
index 758a3f1..fb3b4ca 100644
--- a/parent/center.manager/src/main/webapp/WEB-INF/views/organ/org_list.html
+++ b/parent/center.manager/src/main/webapp/WEB-INF/views/organ/org_list.html
@@ -3,11 +3,12 @@
     <div class="col-sm-10">
     	<div style="padding-top:30px;">
 	        <form role="form" class="form-inline">
+	        	<!-- 
 	        	<div class="form-group" id="leve">
 	        		<span class="form-control">所属区域</span>
 	        		#extends("/organ/org.html")
 	        	</div>
-	        
+	        	 -->
 	            <div class="form-group">
 	                <input type="text" placeholder="请输入医院名" id="usernameSearch" class="form-control">
 	            </div>