From 0a10b51863b939e646661394ae7e03acb0cb0039 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 14 四月 2025 19:08:47 +0800
Subject: [PATCH] 代码提交

---
 smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml |   30 +++++++++++++-----------------
 1 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml b/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
index ca1e06f..d742b33 100644
--- a/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
@@ -485,7 +485,6 @@
                     #{tagId}
                 </foreach>
             </if>
-
         </where>
         order by a.update_time desc
     </select>
@@ -493,7 +492,6 @@
 
     <select id="selectPatArchiveInfoByInhosp" parameterType="com.smartor.domain.PatArchiveReq"
             resultMap="PatArchiveOthreInfoResult">
-
         select
         a.id,
         a.age_unit,
@@ -540,7 +538,6 @@
         d.endtime,
         d.nurse_name,
         d.nurse_id,
-        d.endtime,
         d.out_way_id,
         d.leavehospitaldistrictname AS leavehospitaldistrictname,
         d.leavehospitaldistrictcode AS leavehospitaldistrictcode,
@@ -548,7 +545,7 @@
         FROM
         pat_med_inhosp d
         JOIN pat_archive a ON a.id = d.patid
-        LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag GROUP BY patid ) t ON t.patid =
+        LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag where del_flag=0 GROUP BY patid ) t ON t.patid =
         d.patid
         <where>
             d.del_flag != 1
@@ -630,7 +627,6 @@
 
     <select id="selectPatArchiveInfoByOuthosp" parameterType="com.smartor.domain.PatArchiveReq"
             resultMap="PatArchiveOthreInfoResult">
-
         select
         a.id,
         a.age_unit,
@@ -670,9 +666,10 @@
         a.create_time,
         a.isupload,
         a.upload_time,
+        t.tagname,
         a.pattype
         from pat_med_outhosp d JOIN pat_archive a ON a.id = d.patid
-        LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag GROUP BY patid ) t ON t.patid =
+        LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag where del_flag=0 GROUP BY patid ) t ON t.patid =
         d.patid
         <where>
             d.del_flag != 1
@@ -756,9 +753,10 @@
         a.create_time,
         a.isupload,
         a.upload_time,
+        t.tagname,
         a.pattype
         from pat_med_physical d JOIN pat_archive a ON a.id = d.patid
-        LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag GROUP BY patid ) t ON t.patid =
+        LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag where del_flag=0 GROUP BY patid ) t ON t.patid =
         d.patid
         <where>
             d.del_flag != 1
@@ -805,7 +803,7 @@
             resultMap="PatArchiveOthreInfoResult">
 
         select
-        distinct a.idcardno,
+        a.idcardno,
         a.id,
         a.age_unit,
         a.age_unit2,
@@ -857,7 +855,7 @@
         FROM
         pat_med_inhosp d
         JOIN pat_archive a ON a.id = d.patid
-        LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag GROUP BY patid ) t ON t.patid =
+        LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag where del_flag=0 GROUP BY patid ) t ON t.patid =
         d.patid
         <where>
             d.del_flag != 1
@@ -892,9 +890,6 @@
             <if test="diagname != null and diagname != ''">
                 AND d.diagname LIKE concat('%',#{diagname}, '%')
             </if>
-            <if test="deptname != null and deptname != ''">
-                AND d.deptname LIKE concat('%',#{deptname}, '%')
-            </if>
             <if test="leavehospitaldistrictcodes != null and leavehospitaldistrictcodes.size()>0">
                 AND d.leavehospitaldistrictcode IN
                 <foreach collection="leavehospitaldistrictcodes" item="leavehospitaldistrictcode" open="(" separator=","
@@ -919,14 +914,13 @@
                 AND NOT exists ( SELECT 1 FROM pat_filterlist f where d.patid=f.patid)
             </if>
         </where>
-        order by a.update_time desc
     </select>
 
     <select id="selectPatArchiveInfoByOuthospQC" parameterType="com.smartor.domain.PatArchiveReq"
             resultMap="PatArchiveOthreInfoResult">
 
         select
-        distinct a.idcardno,
+        a.idcardno,
         a.id,
         a.age_unit,
         a.age_unit2,
@@ -964,9 +958,10 @@
         a.create_time,
         a.isupload,
         a.upload_time,
+        t.tagname,
         a.pattype
         from pat_med_outhosp d JOIN pat_archive a ON a.id = d.patid
-        LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag GROUP BY patid ) t ON t.patid =
+        LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag where del_flag=0 GROUP BY patid ) t ON t.patid =
         d.patid
         <where>
             d.del_flag != 1
@@ -1012,7 +1007,7 @@
             resultMap="PatArchiveOthreInfoResult">
 
         select
-        distinct a.idcardno,
+        a.idcardno,
         a.id,
         a.age_unit,
         a.age_unit2,
@@ -1050,9 +1045,10 @@
         a.create_time,
         a.isupload,
         a.upload_time,
+        t.tagname,
         a.pattype
         from pat_med_physical d JOIN pat_archive a ON a.id = d.patid
-        LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag GROUP BY patid ) t ON t.patid =
+        LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag where del_flag=0 GROUP BY patid ) t ON t.patid =
         d.patid
         <where>
             d.del_flag != 1

--
Gitblit v1.9.3