From 4bd9498d45b4d9f4bc948c04ec8efc9bb02d937e Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期六, 06 七月 2024 10:12:25 +0800
Subject: [PATCH] 代码提交

---
 smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml |   22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml b/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
index 3af7acc..31d5826 100644
--- a/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
@@ -279,7 +279,7 @@
 
         select
         a.patid,
-        a.name,
+        a.NAME,
         d.deptname,
         a.sex,
         a.nation,
@@ -307,10 +307,14 @@
         a.upload_time,
         a.pattype,
         d.bed_no,
-        d.starttime as inhosptime
-        from pat_archive a,pat_med_inhosp d
+        d.starttime AS inhosptime,
+        t.tagname
+        FROM
+        pat_med_inhosp d
+        JOIN pat_archive a ON a.patid = d.patid
+        LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag GROUP BY patid ) t ON t.patid =
+        d.patid
         <where>
-            a.patid = d.patid
             <if test="name != null  and name != ''">and a.name like concat('%', #{name}, '%')</if>
             <if test="idcardno != null  and idcardno != ''">and a.idcardno = #{idcardno}</if>
             <if test="pid != null  and pid != ''">and a.patid = #{pid}</if>
@@ -386,9 +390,10 @@
         a.isupload,
         a.upload_time,
         a.pattype
-        from pat_archive a, pat_med_outhosp d
+        from pat_med_outhosp d JOIN pat_archive a ON a.patid = d.patid
+        LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag GROUP BY patid ) t ON t.patid =
+        d.patid
         <where>
-            a.patid = d.patid
             <if test="pid != null  and pid != ''">and a.patid = #{pid}</if>
             <if test="name != null  and name != ''">and a.name like concat('%', #{name}, '%')</if>
             <if test="idcardno != null  and idcardno != ''">and a.idcardno = #{idcardno}</if>
@@ -454,9 +459,10 @@
         a.isupload,
         a.upload_time,
         a.pattype
-        from pat_archive a, pat_med_physical d
+        from pat_med_physical d JOIN pat_archive a ON a.patid = d.patid
+        LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag GROUP BY patid ) t ON t.patid =
+        d.patid
         <where>
-            a.patid = d.patid
             <if test="pid != null  and pid != ''">and a.patid = #{pid}</if>
             <if test="name != null  and name != ''">and a.name like concat('%', #{name}, '%')</if>
             <if test="idcardno != null  and idcardno != ''">and a.idcardno = #{idcardno}</if>

--
Gitblit v1.9.3