fix：visit和patient查询添加限制条件

ruoyi-admin/src/main/java/com/ruoyi/web/work/controller/VisitController.java

@@ -37,7 +37,7 @@ public class VisitController extends BaseController {
     @Anonymous
     @GetMapping("/department")
     public TableDataInfo getAllDepartment() {
-        List<PatientCardDto> list=visitService.getAllDepartment();
+        List<String> list=visitService.getAllDepartment();
         return getDataTable(list);
     }
 

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

@@ -3,6 +3,7 @@ package com.ruoyi.web.work.mapper;
 
 import java.util.List;
 
+import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.web.work.domain.Visit;
 import com.ruoyi.web.work.domain.dto.PatientCardDto;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -12,12 +13,12 @@ import org.apache.ibatis.annotations.Param;
  * @author lsw
  * @date 2024-07-23
  */
-public interface VisitMapper extends BaseMapper<Visit> {
+public interface VisitMapper extends BaseMapper<Visit>{
     List<Visit> selectList(Visit visit);
 
     List<PatientCardDto> getPatientCardByNameOrDepartmentOrPhysician(@Param("patientName") String patientName, @Param("departmentName") String departmentName, @Param("physician") String physician);
 
-    List<PatientCardDto> getAllDepartment();
+    List<String> getAllDepartment();
 
     List<Visit> getVisitByTime(String beginTime, String endTime, Long patId);
 

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

@@ -17,7 +17,7 @@ public interface IVisitService extends IService<Visit>{
 
     List<PatientCardDto> getPatientCardByNameOrDepartmentOrPhysician(String patientName, String departmentName, String physician);
 
-    List<PatientCardDto> getAllDepartment();
+    List<String> getAllDepartment();
 
     List<Visit> getVisitByTime(String beginTime, String endTime, Long patId);
 

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

@@ -36,7 +36,7 @@ public class VisitServiceImpl extends ServiceImpl<VisitMapper, Visit> implements
 
 
     @Override
-    public List<PatientCardDto> getAllDepartment() {
+    public List<String> getAllDepartment() {
         return visitMapper.getAllDepartment();
     }
 

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

@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectList" resultType="com.ruoyi.web.work.domain.Patient">
         select * from tb_patient
         <where>
+            tb_patient.event_type='7'
             <if test="id != null "> and id = #{id}</if>
             <if test="patId != null  and patId != ''"> and pat_id = #{patId}</if>
             <if test="patientCode != null  and patientCode != ''"> and patient_code = #{patientCode}</if>
@@ -48,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             tb_pv1
                 JOIN
             tb_patient ON tb_pv1.patient_id = tb_patient.id
-        where tb_pv1.department=#{department}
+        where tb_pv1.department=#{department} and tb_patient.event_type='7'
     </select>
 
 

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

@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectList" resultType="com.ruoyi.web.work.domain.Visit">
         select * from tb_visit
         <where>
+            tb_visit.hospital_status = '3'
             <if test="id != null "> and id = #{id}</if>
             <if test="patId != null "> and pat_id = #{patId}</if>
             <if test="cardId != null "> and card_id = #{cardId}</if>
@@ -47,6 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 JOIN
             tb_patient ON tb_visit.pat_id = tb_patient.id
         <where>
+            tb_visit.hospital_status = '3'
             <if test="patientName!='' and patientName!=null">
                AND tb_patient.`name` like concat('%', #{patientName}, '%')
             </if>
@@ -76,7 +78,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectVisitsByCardId" resultType="com.ruoyi.web.work.domain.Visit">
-        select * from tb_visit where card_id=#{cardId}
+        select * from tb_visit  where card_id=#{cardId}
+                                        and tb_visit.hospital_status = '3'
     </select>
 
     <select id="selectVisitsByPatId" resultType="com.ruoyi.web.work.domain.Visit">