From 3947391c30693400acc606d0a57ab834401c750a Mon Sep 17 00:00:00 2001
From: chenfei <18955928961@163.com>
Date: Thu, 11 Aug 2022 15:06:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=B1=E8=AF=8A=E5=88=97=E8=A1=A8=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=98=AF=E5=90=A6=E5=88=A0=E9=99=A4=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/domain/req/TRecordResultReq.java      | 13 +++++++++++++
 .../ruoyi/system/service/ITPatientService.java   | 16 ++++++++--------
 .../resources/mapper/system/TRecordMapper.xml    |  3 +++
 3 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/req/TRecordResultReq.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/req/TRecordResultReq.java
index 39676ac..5afb76e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/req/TRecordResultReq.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/req/TRecordResultReq.java
@@ -48,6 +48,9 @@ public class TRecordResultReq
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private String  endTime;
 
+    @ApiModelProperty("是否查看删除状态 默认null不查看,1为查看全部")
+    private String delFlag;
+
     public String getName()
     {
         return name;
@@ -178,4 +181,14 @@ public class TRecordResultReq
     {
         this.doctorName = doctorName;
     }
+
+    public String getDelFlag()
+    {
+        return delFlag;
+    }
+
+    public void setDelFlag(String delFlag)
+    {
+        this.delFlag = delFlag;
+    }
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ITPatientService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ITPatientService.java
index 504c354..076069a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ITPatientService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ITPatientService.java
@@ -7,15 +7,15 @@ import com.ruoyi.system.domain.resp.PcTPatientQueryByPageResp;
 
 /**
  * 患者信息Service接口
- * 
+ *
  * @author ruoyi
  * @date 2022-08-03
  */
-public interface ITPatientService 
+public interface ITPatientService
 {
     /**
      * 查询患者信息
-     * 
+     *
      * @param id 患者信息主键
      * @return 患者信息
      */
@@ -23,7 +23,7 @@ public interface ITPatientService
 
     /**
      * 查询患者信息列表
-     * 
+     *
      * @param tPatient 患者信息
      * @return 患者信息集合
      */
@@ -31,7 +31,7 @@ public interface ITPatientService
 
     /**
      * 新增患者信息
-     * 
+     *
      * @param tPatient 患者信息
      * @return 结果
      */
@@ -39,7 +39,7 @@ public interface ITPatientService
 
     /**
      * 修改患者信息
-     * 
+     *
      * @param tPatient 患者信息
      * @return 结果
      */
@@ -47,7 +47,7 @@ public interface ITPatientService
 
     /**
      * 批量删除患者信息
-     * 
+     *
      * @param ids 需要删除的患者信息主键集合
      * @return 结果
      */
@@ -55,7 +55,7 @@ public interface ITPatientService
 
     /**
      * 删除患者信息信息
-     * 
+     *
      * @param id 患者信息主键
      * @return 结果
      */
diff --git a/ruoyi-system/src/main/resources/mapper/system/TRecordMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TRecordMapper.xml
index bf13ea1..8504bc3 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TRecordMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TRecordMapper.xml
@@ -199,6 +199,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="age !=null">and tp.age = #{age} </if>
             <if test="sex !=null">and tp.sex = #{sex} </if>
             <if test="identifier !=null">and tp.identifier like concat('%', #{identifier}, '%')</if>
+            <if test="delFlag == null">
+                and td.del_flag = '0' and tp.del_flag = '0'
+            </if>
             <if test="createTime != null">
                and  DATE_FORMAT(tp.create_time,'%Y-%m') = DATE_FORMAT(#{createTime},'%Y-%m')
             </if>