优化

ruoyi-admin/src/main/java/com/ruoyi/web/work/mapper/VisitMapper.java

@@ -27,7 +27,7 @@ public interface VisitMapper extends BaseMapper<Visit>{
     //根据患者id查询就诊列表
     List<Visit> selectVisitsByPatId(@Param("patId") String patId,@Param("startTime")String startTime,@Param("endTime")String endTime);
 
-    List<Visit> selectVisitsByDeptCode(Long deptId);
+    List<Visit> selectVisitsByDeptId(Long deptId);
 
     //获取当前用户部门下的患者信息
     List<Visit> selectVisitsByIdAndUserName(@Param("deptId") Long deptId,@Param("userName") String userName);

ruoyi-admin/src/main/java/com/ruoyi/web/work/service/impl/VisitServiceImpl.java

@@ -67,7 +67,7 @@ public class VisitServiceImpl extends ServiceImpl<VisitMapper, Visit> implements
             String dirDocSign = sysUser.getDirDocSign();
             if ("1".equals(dirDocSign)){
                 //获取所有部门下的所有患者
-                return visitMapper.selectVisitsByDeptCode(deptId);
+                return visitMapper.selectVisitsByDeptId(deptId);
             }else {
                 //获取当前用户部门下的患者信息
                 return visitMapper.selectVisitsByIdAndUserName(deptId,userName);

ruoyi-admin/src/main/resources/mapper/work/VisitMapper.xml

@@ -112,7 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
 
-    <select id="selectVisitsByDeptCode" resultMap="visitResultMap">
+    <select id="selectVisitsByDeptId" resultMap="visitResultMap">
         SELECT
             p.id patient_id,p.wn_pat_id,p.name,
             v.id,v.pat_id,v.card_id,v.pat_class,v.dept_code,v.department,v.bed,v.doctor_code,v.physician,v.hospital_status,v.admission_time
@@ -135,7 +135,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             LEFT JOIN tb_visit v ON u.user_name = v.doctor_code
             LEFT JOIN tb_patient p ON p.id = v.pat_id
         WHERE
-            u.dept_id = #{deptId}
+            d.dept_id = #{deptId}
         AND u.user_name = #{userName}
     </select>
 </mapper>

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java

@@ -291,10 +291,11 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
             //科主任返回所有部门列表
             List<SysDept> deptList = deptMapper.queryDeptList();
             return deptList;
+        }else {
+            Long deptId = sysUser.getDeptId();
+            SysDept sysDept = deptMapper.queryDeptByDeptId(deptId);
+            return Arrays.asList(sysDept);
         }
-        Long deptId = sysUser.getDeptId();
-        SysDept sysDept = deptMapper.queryDeptByDeptId(deptId);
-        return Arrays.asList(sysDept);
     }
 
     /**