diff --git a/power-admin/src/main/java/com/manage/controller/FontController.java b/power-admin/src/main/java/com/manage/controller/FontController.java
index 2dc6f01..adc4fa7 100644
--- a/power-admin/src/main/java/com/manage/controller/FontController.java
+++ b/power-admin/src/main/java/com/manage/controller/FontController.java
@@ -563,4 +563,17 @@ public class FontController {
         }
         return result;
     }
+
+    /**
+     * 通过申请医生id，获取医生名字
+     * 通过病案deptcode，获取医生对应的科室
+     */
+    @RequestMapping("/getDoctorNameAndDoctorRoom")
+    @ResponseBody
+    public String getDoctorNameAndDoctorRoom(String userId,String deptcode) throws Exception{
+        Power_User name = power_userMapper.selectForDoctorName(userId);
+        Power_User room = power_userMapper.selectForDoctorRoom(deptcode);
+        String result = room+","+name;
+        return result;
+    }
 }
diff --git a/power-dao/src/main/java/com/manage/dao/Power_UserMapper.java b/power-dao/src/main/java/com/manage/dao/Power_UserMapper.java
index 21d4d32..2dedf19 100644
--- a/power-dao/src/main/java/com/manage/dao/Power_UserMapper.java
+++ b/power-dao/src/main/java/com/manage/dao/Power_UserMapper.java
@@ -72,5 +72,9 @@ public interface Power_UserMapper {
 
     List<Power_User> selectAllForRecordRoom (String deptCode);
 
+    Power_User selectDoctorNameAndDoctorRoom(String userId);
 
+    Power_User selectForDoctorName (String userId);
+
+    Power_User selectForDoctorRoom (String deptCode);
 }
\ No newline at end of file
diff --git a/power-dao/src/main/resources/mapper/Power_UserMapper.xml b/power-dao/src/main/resources/mapper/Power_UserMapper.xml
index 35966a5..b9fc5cc 100644
--- a/power-dao/src/main/resources/mapper/Power_UserMapper.xml
+++ b/power-dao/src/main/resources/mapper/Power_UserMapper.xml
@@ -705,10 +705,11 @@
     from power_user
     where  dept_id like concat(	'%',(select dept_id
                                         from power_dept
-                                        where dept_code = #{deptCode},'%')
+                                        where dept_code = #{deptCode}<![CDATA[),]]>'%')
       and effective = 1
       and role_id in (25)
   </select>
+
   <select id="selectAllForRecordRoom" resultType="com.manage.entity.Power_User">
     SELECT user_id,
            user_name,
@@ -716,9 +717,30 @@
     from power_user
     where  dept_id like concat(	'%',(select dept_id
                                         from power_dept
-                                        where dept_code = #{deptCode},'%')
+                                        where dept_code = #{deptCode}<![CDATA[),]]>'%')
       and effective = 1
-      and role_id in (20,22)
+      and role_id in (20，22)
+  </select>
+  <select id="selectDoctorNameAndDoctorRoom" resultType="com.manage.entity.Power_User">
+    SELECT user_id,
+           user_name,
+           power_user.name
+    from power_user
+    where  dept_id like concat(	'%',(select dept_id
+                                        from power_dept
+                                        where dept_code = #{deptCode <![CDATA[}]]> ),'%')
+      and effective = 1
+  </select>
+    <select id="selectForDoctorName" resultType="com.manage.entity.Power_User">
+      select power_user.`name`
+      from
+        power_user
+      where user_name = #{userId}
+    </select>
+  <select id="selectForDoctorRoom" resultType="com.manage.entity.Power_User">
+    select
+      power_dept.dept_name dept_id
+    from power_dept
+    where power_dept.dept_code = #{deptCode}
   </select>
-
 </mapper>
\ No newline at end of file