From fa132afa3a6942a48002c8e36e9ee47de13ee005 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 26 三月 2025 18:44:45 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
index 332b6ca..963bbe2 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
@@ -170,14 +170,14 @@
b.deptid,
b.leaveldeptid,
b.long_task_reason,
- b.schemetime,
- COALESCE (
- (
- SELECT string_agg(d.tagname, ', ')
- FROM pat_archivetag d
- WHERE d.patid = a.id
- AND d.del_flag = 0
- ), '') AS tagname
+ b.schemetime
+ -- COALESCE (
+ -- (
+ -- SELECT GROUP_CONCAT(d.tagname, ', ')
+ -- FROM pat_archivetag d
+ -- WHERE d.patid = a.id
+ -- AND d.del_flag = 0
+ -- ), '') AS tagname
FROM
pat_med_inhosp b
JOIN
@@ -189,18 +189,18 @@
AND b.del_flag = 0
AND a.idcardno IS NOT NULL
<if test="startOutHospTime != null">
- AND TO_DATE(b.endtime,'YYYY-MM-DD') >= TO_DATE(#{startOutHospTime},'YYYY-MM-DD')
+ AND STR_TO_DATE(b.endtime,'%Y-%m-%d') >= STR_TO_DATE(#{startOutHospTime},'%Y-%m-%d')
</if>
<if test="endOutHospTime != null">
- AND TO_DATE(b.endtime,'YYYY-MM-DD') <= TO_DATE(#{endOutHospTime},'YYYY-MM-DD')
+ AND STR_TO_DATE(b.endtime,'%Y-%m-%d') <= STR_TO_DATE(#{endOutHospTime},'%Y-%m-%d')
</if>
<if test="tagname != null and tagname != ''">and c.tagname like concat('%', #{tagname}, '%')</if>
<if test="startInHospTime != null">
- AND TO_DATE(b.starttime, 'YYYY-MM-DD') >= TO_DATE(#{startInHospTime}, 'YYYY-MM-DD')
+ AND STR_TO_DATE(b.starttime, '%Y-%m-%d') >= STR_TO_DATE(#{startInHospTime}, '%Y-%m-%d')
</if>
<if test="endInHospTime != null">
- AND TO_DATE(b.starttime, 'YYYY-MM-DD') <= TO_DATE(#{startInHospTime}, 'YYYY-MM-DD')
+ AND STR_TO_DATE(b.starttime, '%Y-%m-%d') <= STR_TO_DATE(#{startInHospTime}, '%Y-%m-%d')
</if>
<if test="hospitalname != null and hospitalname != ''">and hospitalname like concat('%', #{hospitalname},
'%')
@@ -359,6 +359,13 @@
order by b.inhospid desc
</select>
+ <select id="getTagnameBypatid" parameterType="Long" resultType="string">
+ SELECT GROUP_CONCAT(d.tagname, ', ')
+ FROM pat_archivetag d
+ WHERE d.patid = #{patid}
+ AND d.del_flag = 0
+ </select>
+
<select id="selectPatMedInhospByInhospid" parameterType="Long" resultMap="PatMedInhospResult">
<include refid="selectPatMedInhospVo"/>
--
Gitblit v1.9.3