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 5c9eb0e..d231ed2 100644
--- a/power-admin/src/main/java/com/manage/controller/FontController.java
+++ b/power-admin/src/main/java/com/manage/controller/FontController.java
@@ -639,14 +639,30 @@ public class FontController {
 
 
     /**
-     * 通过申请医生id，获取医生名字,
-     * 通过病案deptcode，获取医生对应的科室
+     * 通过申请医生id，获取医生名字
      */
     @RequestMapping(value = "/getDoctorNameAndDoctorRoom", produces = "text/plain;charset=UTF-8")
     @ResponseBody
-    public String getDoctorNameAndDoctorRoom(String userId, String deptcode) {
+    public String getDoctorNameAndDoctorRoom(String userId) {
         String name = power_userMapper.selectForDoctorName(userId);
-        String room = power_userMapper.selectForDoctorRoom(deptcode);
+        if (null == name || name.isEmpty()) {
+            name = "未设置名字账号";
+        }
+//        获取的是deptId数组
+        String deptIDResult = powerDeptMapper.selectAllDeptId(userId);
+//        拆分成单一的deptId
+        String[] deptIdAll = deptIDResult.split(",");
+        String room = "";
+        if (deptIdAll.length != 0) {
+            for (int i = 0; i < deptIdAll.length; i++) {
+                String deptIdOne = power_userMapper.selectForDoctorRoom(deptIdAll[i]);
+                if (null != deptIdOne && !deptIdOne.isEmpty()) {
+                    room += deptIdOne + "&";
+                } else {
+                    room = "未分配科室账号";
+                }
+            }
+        }
         String result = room + "," + name;
         return result;
     }
diff --git a/power-dao/src/main/java/com/manage/dao/Power_DeptMapper.java b/power-dao/src/main/java/com/manage/dao/Power_DeptMapper.java
index f0f4447..64b2181 100644
--- a/power-dao/src/main/java/com/manage/dao/Power_DeptMapper.java
+++ b/power-dao/src/main/java/com/manage/dao/Power_DeptMapper.java
@@ -48,4 +48,7 @@ public interface Power_DeptMapper {
     List<Power_Dept> getDeptCodeAndDeptCodeChinese(String s);
 
     List<Power_Dept> selectDeptCode(String deptId);
+
+    //这里闯入的其实是power的userName，因为系统定义有不同，采取了保持实际调用入参名字
+    String selectAllDeptId(String userId);
 }
\ No newline at end of file
diff --git a/power-dao/src/main/resources/mapper/Power_DeptMapper.xml b/power-dao/src/main/resources/mapper/Power_DeptMapper.xml
index 58e73d8..a4dfc08 100644
--- a/power-dao/src/main/resources/mapper/Power_DeptMapper.xml
+++ b/power-dao/src/main/resources/mapper/Power_DeptMapper.xml
@@ -306,6 +306,11 @@
     FROM power_dept
     WHERE dept_id = #{deptId}
   </select>
+  <select id="selectAllDeptId" resultType="java.lang.String">
+    select *
+    from power_user
+    WHERE power_user.user_name = #{userId}
+  </select>
 
   <!--批量插入-->
   <insert id="SimpleInsert" parameterType="java.util.List">