diff --git a/power-admin/src/main/java/com/manage/controller/DeptController.java b/power-admin/src/main/java/com/manage/controller/DeptController.java
index a6f94d0..7d7ff0d 100644
--- a/power-admin/src/main/java/com/manage/controller/DeptController.java
+++ b/power-admin/src/main/java/com/manage/controller/DeptController.java
@@ -304,6 +304,23 @@ public class DeptController {
             e.printStackTrace();
         }
     }
+    /**
+     * @Date 2019-4-29
+     * @Author ly
+     *  @Description 导出Excel
+     * */
+    @OptionalLog(module = "导出excel",methods = "部门管理")
+    @RequiresPermissions(value="/dept/exportBlood")
+    @RequestMapping("/exportBlood")
+    public void exportBlood(Power_DeptVo powerDept,HttpServletRequest request,HttpServletResponse response){
+        try {
+            powerDeptService.exportBlood(powerDept,request,response);
+            CacheManager.addExcCount("noExc");
+        }catch (Exception e){
+            CacheManager.addExcCount("exc");
+            e.printStackTrace();
+        }
+    }
     /**
      * @Date 2019-4-22
      * @Author ly
diff --git a/power-admin/src/main/java/com/manage/controller/RoleAndUserPowerController.java b/power-admin/src/main/java/com/manage/controller/RoleAndUserPowerController.java
index 181f86c..b8658b3 100644
--- a/power-admin/src/main/java/com/manage/controller/RoleAndUserPowerController.java
+++ b/power-admin/src/main/java/com/manage/controller/RoleAndUserPowerController.java
@@ -281,7 +281,7 @@ public class RoleAndUserPowerController {
       * @UpdateRemark:   更新说明
       * @Version:        1.0
      */
-    @RequestMapping(value = "getUserTreeByHospitalId")
+    @RequestMapping(value = "getUserTreeByHospitalId",produces = {"text/json;charset=UTF-8"})
     @ResponseBody
     public String getUserTreeByHospitalId(Integer hospitalId){
         try {
diff --git a/power-admin/src/main/webapp/WEB-INF/views/deptDir/dept.jsp b/power-admin/src/main/webapp/WEB-INF/views/deptDir/dept.jsp
index c698595..09511f7 100644
--- a/power-admin/src/main/webapp/WEB-INF/views/deptDir/dept.jsp
+++ b/power-admin/src/main/webapp/WEB-INF/views/deptDir/dept.jsp
@@ -4,7 +4,7 @@
 <%@ include file="/WEB-INF/jspf/confirmJsp.jspf" %>
 <html>
 <head>
-    <title>部门管理</title>
+    <title>科室管理</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <!-- 引入 Bootstrap -->
     <link rel="stylesheet" href="${path}/static/css/comm.css">
@@ -81,12 +81,12 @@
     <input type="hidden" id="userNames">
     <div class="row">
         <div class="col-md-12">
-            <div class="panel-heading"><h4>基本管理/部门管理</h4></div>
+            <div class="panel-heading"><h4>基本管理/科室管理</h4></div>
             <hr>
             <form class="form-inline" style="margin-top: 5px;" role="form">
                 <div class="">
                     <div class="form-group">
-                        <label for="dept_name">部门名</label>
+                        <label for="dept_name">科室名</label>
                         <input type="text" class="form-control input-sm" id="dept_name" maxlength="16"/>
                     </div>
                     <c:if test="${user.roleId == 0}">
@@ -146,7 +146,7 @@
             <div class="modal-body" style="height:auto">
                 <form id="updateaddform">
                     <div class="formDiv">
-                        <label class="control-label left">部门名：</label>
+                        <label class="control-label left">科室名：</label>
                         <input type="hidden" id="re_deptId" name="deptId">
                         <input type="text" class="form-control input input-sm" id="re_deptName" name="deptName" maxlength="15">
                     </div>
@@ -188,7 +188,7 @@
                        id="form1">
                     <div class="formDiv">
                         <label class="control-label left">下载模板：</label>
-                        <input class="btn btn-primary btn-sm" onclick="window.open('${path }/static/template/部门列表导入模板.xls');" type="button" value="下载模板">
+                        <input class="btn btn-primary btn-sm" onclick="window.open('${path }/static/template/科室列表导入模板.xls');" type="button" value="下载模板">
                     </div>
                     <div class="formDiv">
                         <label for="re_effective" class="control-label left">选择文件：</label>
@@ -196,12 +196,12 @@
                     </div>
                     <div class="modelBtns">
                         <input class="btn btn-primary btn-sm" type="button" value="批量导入Excel数据"
-                               onclick="importExcel('/dept/importExcel','部门')">
+                               onclick="importExcel('/dept/importExcel','科室')">
                     </div>
                     <div class="formDiv">
                         <label class="warningLabel">友情提醒:</label>
                         <div class="warningDiv">
-                            <span style="color: red"></br>1、部门名不能为空,不能重复,内容最多16个字。</span></br>
+                            <span style="color: red"></br>1、科室名不能为空,不能重复,内容最多16个字。</span></br>
                             <span style="color: red">2、是否有效不能为空,内容最多9个字。</span></br>
                             <span style="color: red">3、备注可为空,内容最多50个字。</span></br>
                             <span style="color: red">4、值包含逗号必须单元格设置为文本类型。</span></br>
diff --git a/power-admin/src/main/webapp/WEB-INF/views/userDir/user.jsp b/power-admin/src/main/webapp/WEB-INF/views/userDir/user.jsp
index 09358b2..f4af3e7 100644
--- a/power-admin/src/main/webapp/WEB-INF/views/userDir/user.jsp
+++ b/power-admin/src/main/webapp/WEB-INF/views/userDir/user.jsp
@@ -121,7 +121,7 @@
                         </div>
                     </div>
                     <div class="form-group">
-                        <label for="dept_id">所属部门:</label>
+                        <label for="dept_id">所属科室:</label>
                         <div class=" form-group form-inline">
                             <select class="form-control input-sm" style="width:106px" id="dept_id">
                                 <option value="">全部</option>
diff --git a/power-admin/src/main/webapp/static/js/blood.js b/power-admin/src/main/webapp/static/js/blood.js
index 5e3adf3..98c9df6 100644
--- a/power-admin/src/main/webapp/static/js/blood.js
+++ b/power-admin/src/main/webapp/static/js/blood.js
@@ -360,9 +360,9 @@ function exportExcel(){
     if(checks != '') {
         checks = checks.substring(0, checks.length - 1);
         if(roleId == 0){
-            url = path+"/dept/export?deptName="+$("#dept_name").val()+"&dictId="+$("#dict_id").val()+"&effective="+$("#effective").val()+"&creater="+$("#creater").val()+"&checks="+checks;
+            url = path+"/dept/exportBlood?deptName="+$("#dept_name").val()+"&dictId="+$("#dict_id").val()+"&effective="+$("#effective").val()+"&creater="+$("#creater").val()+"&checks="+checks;
         }else{
-            url = path+"/dept/export?deptName="+$("#dept_name").val()+"&effective="+$("#effective").val()+"&creater="+$("#creater").val()+"&checks="+checks;
+            url = path+"/dept/exportBlood?deptName="+$("#dept_name").val()+"&effective="+$("#effective").val()+"&creater="+$("#creater").val()+"&checks="+checks;
         }
         window.location.href = url;
     }else{
diff --git a/power-admin/src/main/webapp/static/js/dept.js b/power-admin/src/main/webapp/static/js/dept.js
index c2385cc..b53c6f5 100644
--- a/power-admin/src/main/webapp/static/js/dept.js
+++ b/power-admin/src/main/webapp/static/js/dept.js
@@ -20,7 +20,7 @@ $(function(){
             }
         },
         {
-            title:'部门名',
+            title:'科室名',
             field:'deptName',
         });
     var roleId = $("#roleId").val();
diff --git a/power-admin/src/main/webapp/static/js/user.js b/power-admin/src/main/webapp/static/js/user.js
index 49bf70e..2a69545 100644
--- a/power-admin/src/main/webapp/static/js/user.js
+++ b/power-admin/src/main/webapp/static/js/user.js
@@ -89,7 +89,7 @@ var form = '';
                     field:'roleName',
                 },
                 {
-                    title:'所属部门',
+                    title:'所属科室',
                     field:'powerDepts',
                     formatter:paramsMatter,
                 },
diff --git a/power-admin/src/main/webapp/static/template/ÓÃ»§ÁÐ±íµ¼ÈëÄ£°å.xls b/power-admin/src/main/webapp/static/template/用户列表导入模板(脐血库).xls
similarity index 99%
rename from power-admin/src/main/webapp/static/template/ÓÃ»§ÁÐ±íµ¼ÈëÄ£°å.xls
rename to power-admin/src/main/webapp/static/template/用户列表导入模板(脐血库).xls
index 80161e4..f2e4c29 100644
Binary files a/power-admin/src/main/webapp/static/template/ÓÃ»§ÁÐ±íµ¼ÈëÄ£°å.xls and b/power-admin/src/main/webapp/static/template/用户列表导入模板(脐血库).xls differ
diff --git a/power-admin/src/main/webapp/static/template/ÓÃ»§ÁÐ±íµ¼ÈëÄ£°å(ÆêÑª¿â).xls b/power-admin/src/main/webapp/static/template/用户列表导入模板.xls
similarity index 62%
rename from power-admin/src/main/webapp/static/template/ÓÃ»§ÁÐ±íµ¼ÈëÄ£°å(ÆêÑª¿â).xls
rename to power-admin/src/main/webapp/static/template/用户列表导入模板.xls
index a6f34ed..eb3ce4f 100644
Binary files a/power-admin/src/main/webapp/static/template/ÓÃ»§ÁÐ±íµ¼ÈëÄ£°å(ÆêÑª¿â).xls and b/power-admin/src/main/webapp/static/template/用户列表导入模板.xls differ
diff --git a/power-admin/src/main/webapp/static/template/科室列表导入模板.xls b/power-admin/src/main/webapp/static/template/科室列表导入模板.xls
new file mode 100644
index 0000000..88504a5
Binary files /dev/null and b/power-admin/src/main/webapp/static/template/科室列表导入模板.xls differ
diff --git a/power-admin/src/main/webapp/static/template/½ÇÉ«ÁÐ±íµ¼ÈëÄ£°å.xls b/power-admin/src/main/webapp/static/template/角色列表导入模板.xls
similarity index 99%
rename from power-admin/src/main/webapp/static/template/½ÇÉ«ÁÐ±íµ¼ÈëÄ£°å.xls
rename to power-admin/src/main/webapp/static/template/角色列表导入模板.xls
index f573438..fc1f7c0 100644
Binary files a/power-admin/src/main/webapp/static/template/½ÇÉ«ÁÐ±íµ¼ÈëÄ£°å.xls and b/power-admin/src/main/webapp/static/template/角色列表导入模板.xls differ
diff --git a/power-admin/src/main/webapp/static/template/²¿ÃÅÁÐ±íµ¼ÈëÄ£°å.xls b/power-admin/src/main/webapp/static/template/部门列表导入模板.xls
similarity index 99%
rename from power-admin/src/main/webapp/static/template/²¿ÃÅÁÐ±íµ¼ÈëÄ£°å.xls
rename to power-admin/src/main/webapp/static/template/部门列表导入模板.xls
index 4c91a0b..6de0d4e 100644
Binary files a/power-admin/src/main/webapp/static/template/²¿ÃÅÁÐ±íµ¼ÈëÄ£°å.xls and b/power-admin/src/main/webapp/static/template/部门列表导入模板.xls differ
diff --git a/power-admin/src/main/webapp/È¨ÏÞÏµÍ³°æ±¾ËµÃ÷.txt b/power-admin/src/main/webapp/权限系统版本说明.txt
similarity index 100%
rename from power-admin/src/main/webapp/È¨ÏÞÏµÍ³°æ±¾ËµÃ÷.txt
rename to power-admin/src/main/webapp/权限系统版本说明.txt
diff --git a/power-service/src/main/java/com/manage/service/Power_DeptService.java b/power-service/src/main/java/com/manage/service/Power_DeptService.java
index f522bb8..af5f5b5 100644
--- a/power-service/src/main/java/com/manage/service/Power_DeptService.java
+++ b/power-service/src/main/java/com/manage/service/Power_DeptService.java
@@ -73,6 +73,12 @@ public interface Power_DeptService {
      *  @Description 导出Excel表
      * */
     void export(Power_DeptVo powerDept,HttpServletRequest request,HttpServletResponse response)throws Exception;
+    /**
+     * @Date 2019-4-25
+     * @Author ly
+     *  @Description 导出Excel表
+     * */
+    void exportBlood(Power_DeptVo powerDept,HttpServletRequest request,HttpServletResponse response)throws Exception;
 
     /**
      * @Date 2019-07-31
diff --git a/power-service/src/main/java/com/manage/service/ipml/Power_DeptServiceImpl.java b/power-service/src/main/java/com/manage/service/ipml/Power_DeptServiceImpl.java
index b4cfa3b..9445fd1 100644
--- a/power-service/src/main/java/com/manage/service/ipml/Power_DeptServiceImpl.java
+++ b/power-service/src/main/java/com/manage/service/ipml/Power_DeptServiceImpl.java
@@ -143,6 +143,34 @@ public class Power_DeptServiceImpl implements Power_DeptService {
 
     @Override
     public void export(Power_DeptVo powerDept,HttpServletRequest request,HttpServletResponse response) throws Exception {
+        List<Power_DeptVo> depts = this.findSomeByMore(powerDept,request);
+        if(null != depts && !depts.isEmpty()){
+            for (int i = 0; i < depts.size(); i++) {
+                if(depts.get(i).getEffective() == 1){
+                    depts.get(i).setEffectiveCn("是");
+                }else{
+                    depts.get(i).setEffectiveCn("否");
+                }
+            }
+        }
+        String tableThNames = "科室名称,所属医院,是否有效,创建时间,创建人,修改时间,修改人";
+        String fieldCns = "deptName,hospitalName,effectiveCn,createDate,creater,updateDate,updater";
+        Power_User user = (Power_User)request.getSession().getAttribute("CURRENT_USER");
+        //非系统管理员不显示所属医院信息
+        if(user.getRoleId() != 0){
+            tableThNames = tableThNames.replace("所属医院,","");
+            fieldCns = fieldCns.replace("hospitalName,","");
+        }
+        //文件名
+        String fileName = "科室列表(" + new SimpleDateFormat("yyyy_MM_dd HH_mm_ss").format(new Date()) + ").xls";
+        //ExportExcelUtil
+        com.manage.util.ExportExcelUtil exportExcelUtil = new com.manage.util.ExportExcelUtil();
+        //导出excel的操作
+        exportExcelUtil.expordExcel(tableThNames,fieldCns,depts,fileName,response);
+    }
+
+    @Override
+    public void exportBlood(Power_DeptVo powerDept,HttpServletRequest request,HttpServletResponse response) throws Exception {
         List<Power_DeptVo> depts = this.findSomeByMore(powerDept,request);
         if(null != depts && !depts.isEmpty()){
             for (int i = 0; i < depts.size(); i++) {
diff --git a/power-service/src/main/java/com/manage/service/ipml/Power_UserServiceImpl.java b/power-service/src/main/java/com/manage/service/ipml/Power_UserServiceImpl.java
index 71f4971..8064666 100644
--- a/power-service/src/main/java/com/manage/service/ipml/Power_UserServiceImpl.java
+++ b/power-service/src/main/java/com/manage/service/ipml/Power_UserServiceImpl.java
@@ -206,7 +206,7 @@ public class Power_UserServiceImpl implements Power_UserService {
                 }
             }
         }
-        String tableThNames = "账号,姓名,性别,年龄,移动电话,邮箱地址,用户职位,所属角色,所属部门,是否有效,创建时间,创建人,修改时间,修改人";
+        String tableThNames = "账号,姓名,性别,年龄,移动电话,邮箱地址,用户职位,所属角色,所属科室,是否有效,创建时间,创建人,修改时间,修改人";
         String fieldCns = "userName,name,sex,userAge,userTel,userEmail,userPosition,roleName,powerDepts,effectiveCn,createDate,creater,updateDate,updater";
         //文件名
         String fileName = "用户列表(" + new SimpleDateFormat("yyyy_MM_dd HH_mm_ss").format(new Date()) + ").xls";
