From c6461ee45e27ad7f6f1a89d5aab103fbab6e79d3 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 11 四月 2025 17:58:17 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml b/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
index ca1e06f..6d19dff 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,
@@ -630,7 +627,6 @@
<select id="selectPatArchiveInfoByOuthosp" parameterType="com.smartor.domain.PatArchiveReq"
resultMap="PatArchiveOthreInfoResult">
-
select
a.id,
a.age_unit,
@@ -670,6 +666,7 @@
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 =
@@ -756,6 +753,7 @@
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 =
@@ -805,7 +803,7 @@
resultMap="PatArchiveOthreInfoResult">
select
- distinct a.idcardno,
+ a.idcardno,
a.id,
a.age_unit,
a.age_unit2,
@@ -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,6 +958,7 @@
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 =
@@ -1012,7 +1007,7 @@
resultMap="PatArchiveOthreInfoResult">
select
- distinct a.idcardno,
+ a.idcardno,
a.id,
a.age_unit,
a.age_unit2,
@@ -1050,6 +1045,7 @@
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 =
--
Gitblit v1.9.3