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"
and tp.age = #{age}
and tp.sex = #{sex}
and tp.identifier like concat('%', #{identifier}, '%')
+
+ and td.del_flag = '0' and tp.del_flag = '0'
+
and DATE_FORMAT(tp.create_time,'%Y-%m') = DATE_FORMAT(#{createTime},'%Y-%m')