就诊、患者、医生、医院增加状态字段

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;
     }

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;
     }

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
         <where>
             <if test="startTime != null and endTime != null">
-                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')
             </if>
             <if test="name != null and name != ''">
                 AND td.name like concat('%', #{name}, '%')
             </if>
             <if test="identifier != null and identifier != ''">
-                AND identifier like concat('%', #{identifier}, '%')
+                AND td.identifier like concat('%', #{identifier}, '%')
             </if>
             <if test="hospitalId != null">
-                and hospital_id = #{hospitalId}
+                and td.hospital_id = #{hospitalId}
             </if>
             <if test="delFlag != null">
-                and del_flag = #{delFlag}
+                and td.del_flag = #{delFlag}
             </if>
         </where>
-        order by create_time desc
+        order by td.create_time desc
     </select>
 
     <select id="queryPatintCountByDoctor" resultType="int">
@@ -230,22 +230,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectAppDoctorDetailById" resultType="com.ruoyi.system.domain.resp.AppDoctorResp">
         SELECT
             td.id,
-            user_id AS userId,
-            identifier,
+            td.user_id AS userId,
+            td.identifier,
             td.`name`,
             th.`id` AS hospitalId,
             th.`name` AS hospitalName,
-            phone,
-            sex,
-            age,
-            marriage,
-            title,
-            speciality,
-            introduction,
-            medical_license AS medicalLicense,
-            medical_license2 AS medicalLicense2,
-            qr_code AS qrCode,
-            hospital_id AS hospitalId
+            td.phone,
+            td.sex,
+            td.age,
+            td.marriage,
+            td.title,
+            td.speciality,
+            td.introduction,
+            td.medical_license AS medicalLicense,
+            td.medical_license2 AS medicalLicense2,
+            td.qr_code AS qrCode,
+            td.hospital_id AS hospitalId
         FROM
             t_doctor td
                 LEFT JOIN t_hospital th ON th.id = td.hospital_id

ruoyi-system/src/main/resources/mapper/system/TRecordMapper.xml

@@ -91,6 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             tr.ai_result_return_time AS aiResultReturnTime,
             tr.ai_result_modify_time AS aiResultModifyTime,
             tr.response_time AS responseTime,
+            tr.del_flag as delFlag,
             td.NAME AS doctorName,
             tp.identifier,
             tp.NAME AS patientName,