From c94dd284004894a1f88c9eed2ad42e0a60b1904e Mon Sep 17 00:00:00 2001
From: gongzhenkun <1658878546@qq.com>
Date: Thu, 13 Oct 2022 16:47:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E3=80=90=E5=B0=B1=E8=AF=8A?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E3=80=91=E6=8E=92=E5=BA=8F=E9=94=99=E4=B9=B1?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/domain/req/TRecordResultReq.java   | 21 +++++
 .../resources/mapper/system/TRecordMapper.xml | 88 +++++++------------
 2 files changed, 51 insertions(+), 58 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 0790b84..f595409 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
@@ -201,4 +201,25 @@ public class TRecordResultReq
     {
         this.delFlag = delFlag;
     }
+
+    @Override
+    public String toString() {
+        return "TRecordResultReq{" +
+                "name='" + name + '\'' +
+                ", sex='" + sex + '\'' +
+                ", age='" + age + '\'' +
+                ", identifier='" + identifier + '\'' +
+                ", doctorId=" + doctorId +
+                ", doctorName='" + doctorName + '\'' +
+                ", hospitalId=" + hospitalId +
+                ", createTime='" + createTime + '\'' +
+                ", doctorOder='" + doctorOder + '\'' +
+                ", firstVisitOder='" + firstVisitOder + '\'' +
+                ", status='" + status + '\'' +
+                ", startTime='" + startTime + '\'' +
+                ", endTime='" + endTime + '\'' +
+                ", delFlag='" + delFlag + '\'' +
+                ", patientAge=" + patientAge +
+                '}';
+    }
 }
diff --git a/ruoyi-system/src/main/resources/mapper/system/TRecordMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TRecordMapper.xml
index 2cbe1fc..5497226 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TRecordMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TRecordMapper.xml
@@ -103,60 +103,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectHomePatientList"  parameterType="TRecordResultReq" resultType="TRecordResp">
         SELECT
-            t.id,
-            t.patientId,
-            t.doctorId,
-            t.hospitalId,
-            t. STATUS,
-            t.aiResult2,
-            t.updateResult2,
-            t.createTime,
-            t.updateTime,
-            t.uploadTime,
-            t.waitingTime,
-            t.aiResultReturnTime,
-            t.aiResultModifyTime,
-            t.responseTime,
-            t.doctorName,
-            t.identifier,
-            t.patientName,
-            t.sex,
-            t.age,
-            t.disease,
-            t.firstTime,
-            max(t.trCreateTime),
-            t.trCreateTime,
-            t.tpCreateTime
+        tr.create_time AS trCreateTime,
+        tp.create_time AS tpCreateTime,
+        tr.id,
+        tr.patient_id AS patientId,
+        tr.doctor_id AS doctorId,
+        tr.hospital_id AS hospitalId,
+        tr. STATUS,
+        tr.ai_result2 AS aiResult2,
+        tr.update_result2 AS updateResult2,
+        tr.create_time AS createTime,
+        tr.update_time AS updateTime,
+        tr.upload_time AS uploadTime,
+        tr.create_time AS waitingTime,
+        tr.ai_result_return_time AS aiResultReturnTime,
+        tr.ai_result_modify_time AS aiResultModifyTime,
+        tr.response_time AS responseTime,
+        td. NAME AS doctorName,
+        tp.identifier,
+        tp. NAME AS patientName,
+        tp.sex,
+        tp.age,
+        tp.disease,
+        tp.create_time AS firstTime
         FROM
-            (
-                SELECT
-                    tr.create_time AS trCreateTime,
-                    tp.create_time AS tpCreateTime,
-                    tr.id,
-                    tr.patient_id AS patientId,
-                    tr.doctor_id AS doctorId,
-                    tr.hospital_id AS hospitalId,
-                    tr. STATUS,
-                    tr.ai_result2 AS aiResult2,
-                    tr.update_result2 AS updateResult2,
-                    tr.create_time AS createTime,
-                    tr.update_time AS updateTime,
-                    tr.upload_time AS uploadTime,
-                    tr.create_time AS waitingTime,
-                    tr.ai_result_return_time AS aiResultReturnTime,
-                    tr.ai_result_modify_time AS aiResultModifyTime,
-                    tr.response_time AS responseTime,
-                    td. NAME AS doctorName,
-                    tp.identifier,
-                    tp. NAME AS patientName,
-                    tp.sex,
-                    tp.age,
-                    tp.disease,
-                    tp.create_time AS firstTime
-                FROM
-                    t_record tr
-                        LEFT JOIN t_doctor td ON tr.doctor_id = td.id
-                        LEFT JOIN t_patient tp ON tr.patient_id = tp.id
+        t_record tr
+        <if test="doctorOder !=null and doctorOder !=''">INNER JOIN ( SELECT SUBSTRING_INDEX( GROUP_CONCAT( id ORDER BY create_time DESC ), ',', 1 ) id FROM t_record r GROUP BY r.patient_id ) i ON tr.id = i.id</if>
+        <if test="firstVisitOder!=null and firstVisitOder !=''">INNER JOIN ( SELECT SUBSTRING_INDEX( GROUP_CONCAT( id ORDER BY create_time ASC ), ',', 1 ) id FROM t_record r GROUP BY r.patient_id ) i ON tr.id = i.id</if>
+        LEFT JOIN t_doctor td ON tr.doctor_id = td.id
+        LEFT JOIN t_patient tp ON tr.patient_id = tp.id
         <where>
             <if test="name != null  and name != ''"> and tp.name like concat('%', #{name}, '%')</if>
             <if test="doctorId != null "> and tr.doctor_id = #{doctorId}</if>
@@ -181,11 +156,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="startTime == null  and endTime != '' and endTime != null "> and tr.create_time &lt;= #{endTime}</if>
             <if test="startTime != null  and endTime != null "> and tr.create_time between #{startTime} and #{endTime}</if>
         </where>
-            ) t
-        GROUP BY
-            t.patientId
-        <if test="doctorOder !=null and doctorOder !=''" >order by  t.trCreateTime ${doctorOder}</if>
-        <if test="firstVisitOder!=null and firstVisitOder !=''" >order by t.tpCreateTime ${firstVisitOder}</if>
+        <if test="doctorOder !=null and doctorOder !=''" >order by  trCreateTime ${doctorOder}</if>
+        <if test="firstVisitOder!=null and firstVisitOder !=''" >order by tpCreateTime ${firstVisitOder}</if>
     </select>
 
     <!--====================工作台相关接口=====================-->