diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/resp/THospitalPageResp.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/resp/THospitalPageResp.java
index f9fbd90..d215cd7 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/resp/THospitalPageResp.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/resp/THospitalPageResp.java
@@ -34,6 +34,16 @@ public class THospitalPageResp {
@Excel(name = "管理员名称")
private String adminName;
+ private String delFlag;
+
+ public void setDelFlag(String delFlag) {
+ this.delFlag = delFlag;
+ }
+
+ public String getDelFlag() {
+ return delFlag;
+ }
+
public Long getId() {
return id;
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/resp/TRecordResp.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/resp/TRecordResp.java
index a9a4389..e0c3644 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/resp/TRecordResp.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/resp/TRecordResp.java
@@ -124,6 +124,18 @@ public class TRecordResp
@ApiModelProperty("响应时长")
private Long responseTime;
+ /** 删除标志(0代表存在 2代表删除) */
+ @ApiModelProperty("删除标志(0代表存在 2代表删除) ")
+ private String delFlag;
+
+ public void setDelFlag(String delFlag) {
+ this.delFlag = delFlag;
+ }
+
+ public String getDelFlag() {
+ return delFlag;
+ }
+
public String getHospitalName() {
return hospitalName;
}
diff --git a/ruoyi-system/src/main/resources/mapper/system/TDoctorMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TDoctorMapper.xml
index 97f19b1..2079604 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TDoctorMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TDoctorMapper.xml
@@ -185,34 +185,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
td.introduction,
td.medical_license AS medicalLicense,
td.medical_license2 AS medicalLicense2,
- qr_code AS qrCode,
- del_flag AS delFlag,
+ td.qr_code AS qrCode,
+ td.del_flag AS delFlag,
td.hospital_id AS hospitalId,
th.`name` AS hospitalName,
- create_time AS createTime,
- update_time AS updateTime
+ td.create_time AS createTime,
+ td.update_time AS updateTime
FROM
t_doctor td
LEFT JOIN t_hospital th ON td.hospital_id = th.id
- AND create_time between DATE_FORMAT(#{startTime},'%Y-%m-%d %H:%i:%s') and
+ AND td.create_time between DATE_FORMAT(#{startTime},'%Y-%m-%d %H:%i:%s') and
DATE_FORMAT(#{endTime},'%Y-%m-%d %H:%i:%s')
AND td.name like concat('%', #{name}, '%')
- AND identifier like concat('%', #{identifier}, '%')
+ AND td.identifier like concat('%', #{identifier}, '%')
- and hospital_id = #{hospitalId}
+ and td.hospital_id = #{hospitalId}
- and del_flag = #{delFlag}
+ and td.del_flag = #{delFlag}
- order by create_time desc
+ order by td.create_time desc