diff --git a/postdischarge-admin/src/main/java/com/xinelu/web/controller/system/SysUserController.java b/postdischarge-admin/src/main/java/com/xinelu/web/controller/system/SysUserController.java
index 64afa86a..7e2f7e67 100644
--- a/postdischarge-admin/src/main/java/com/xinelu/web/controller/system/SysUserController.java
+++ b/postdischarge-admin/src/main/java/com/xinelu/web/controller/system/SysUserController.java
@@ -141,6 +141,22 @@ public class SysUserController extends BaseController {
         return toAjax(userService.updateUser(user));
     }
 
+    /**
+     * 修改用户机构科室
+     */
+    @PostMapping("/editAgency")
+    public AjaxResult editAgency(@RequestBody SysUser user) {
+        return toAjax(userService.editAgency(user));
+    }
+
+    /**
+     * 修改用户机构科室
+     */
+    @PostMapping("/editDepartment")
+    public AjaxResult editDepartment(@RequestBody SysUser user) {
+        return toAjax(userService.editDepartment(user));
+    }
+
     /**
      * 删除用户
      */
diff --git a/postdischarge-system/src/main/java/com/xinelu/system/mapper/SysUserMapper.java b/postdischarge-system/src/main/java/com/xinelu/system/mapper/SysUserMapper.java
index 8dc197f0..29ec63d6 100644
--- a/postdischarge-system/src/main/java/com/xinelu/system/mapper/SysUserMapper.java
+++ b/postdischarge-system/src/main/java/com/xinelu/system/mapper/SysUserMapper.java
@@ -68,6 +68,22 @@ public interface SysUserMapper {
      */
     public int updateUser(SysUser user);
 
+    /**
+     * 修改用户信息
+     *
+     * @param user 用户信息
+     * @return 结果
+     */
+     int updateUserAgency(SysUser user);
+
+    /**
+     * 修改用户信息
+     *
+     * @param user 用户信息
+     * @return 结果
+     */
+    int updateUserDepartment(SysUser user);
+
     /**
      * 修改用户头像
      *
diff --git a/postdischarge-system/src/main/java/com/xinelu/system/service/ISysUserService.java b/postdischarge-system/src/main/java/com/xinelu/system/service/ISysUserService.java
index 94d3617f..c361bc62 100644
--- a/postdischarge-system/src/main/java/com/xinelu/system/service/ISysUserService.java
+++ b/postdischarge-system/src/main/java/com/xinelu/system/service/ISysUserService.java
@@ -130,6 +130,22 @@ public interface ISysUserService {
      */
     public int updateUser(SysUser user);
 
+    /**
+     * 修改用户机构信息
+     *
+     * @param user 用户信息
+     * @return 结果
+     */
+    int editAgency(SysUser user);
+
+    /**
+     * 修改用户科室信息
+     *
+     * @param user 用户信息
+     * @return 结果
+     */
+    int editDepartment(SysUser user);
+
     /**
      * 用户授权角色
      *
diff --git a/postdischarge-system/src/main/java/com/xinelu/system/service/impl/SysUserServiceImpl.java b/postdischarge-system/src/main/java/com/xinelu/system/service/impl/SysUserServiceImpl.java
index 4a29dc4d..910b4444 100644
--- a/postdischarge-system/src/main/java/com/xinelu/system/service/impl/SysUserServiceImpl.java
+++ b/postdischarge-system/src/main/java/com/xinelu/system/service/impl/SysUserServiceImpl.java
@@ -278,6 +278,16 @@ public class SysUserServiceImpl implements ISysUserService {
         return userMapper.updateUser(user);
     }
 
+    @Override
+    public int editAgency(SysUser user) {
+        return userMapper.updateUserAgency(user);
+    }
+
+    @Override
+    public int editDepartment(SysUser user) {
+        return userMapper.updateUserDepartment(user);
+    }
+
     /**
      * 用户授权角色
      *
diff --git a/postdischarge-system/src/main/resources/mapper/system/SysUserMapper.xml b/postdischarge-system/src/main/resources/mapper/system/SysUserMapper.xml
index 92abb3c1..ba35feca 100644
--- a/postdischarge-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/postdischarge-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -255,13 +255,27 @@
             <if test="remark != null">remark = #{remark},</if>
             <if test="userCardNo != null and userCardNo != ''">user_card_no = #{userCardNo},</if>
             <if test="userBirthDate != null">user_birth_date = #{userBirthDate},</if>
-            agency_id =#{agencyId},
-            department_id = #{departmentId},
+            <if test="agencyId != null">agency_id =#{agencyId},</if>
+            <if test="departmentId != null">department_id = #{departmentId},</if>
             update_time = sysdate()
         </set>
         where user_id = #{userId}
     </update>
 
+    <update id="updateUserAgency" parameterType="SysUser">
+        update sys_user
+        set agency_id   =#{agencyId},
+            update_time = sysdate()
+        where user_id = #{userId}
+    </update>
+
+    <update id="updateUserDepartment" parameterType="SysUser">
+        update sys_user
+        set department_id = #{departmentId},
+            update_time   = sysdate()
+        where user_id = #{userId}
+    </update>
+
     <update id="updateUserStatus" parameterType="SysUser">
         update sys_user
         set status = #{status}
@@ -349,11 +363,11 @@
             and id &lt;&gt; #{departmentId}
         </if>
         <if test="agencyId != null ">
-            and id = #{agencyId}
+            and agency_id = #{agencyId}
         </if>
         ) as departmentNum
         from department
-        where agency_status = 'ON' and node_type = 'HOSPITAL'
+        where node_type = 'DEPARTMENT'
         <if test="departmentName != null and departmentName != ''">
             and department_name = #{departmentName}
             or department_code = #{departmentName}
@@ -362,7 +376,7 @@
             and id &lt;&gt; #{departmentId}
         </if>
         <if test="agencyId != null ">
-            and id = #{agencyId}
+            and agency_id = #{agencyId}
         </if>
     </select>