From fd12c3a4d5c0a247c89ab59faba189075a302ffd Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 09 六月 2025 18:50:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
index 053c52c..0314b0c 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
@@ -294,7 +294,12 @@
a.telcode,
a.id,
a.sex
- order by b.inhospid desc
+ <if test="cry==1">
+ order by b.endtime desc
+ </if>
+ <if test="cry==0">
+ order by b.starttime desc
+ </if>
</select>
<select id="selectPatMedInhospListByCondition" parameterType="com.smartor.domain.PatMedInhospVO"
resultMap="PatMedInhospResult">
@@ -646,7 +651,7 @@
FROM pat_med_outhosp
<where>
del_flag=0
- <if test="deptcodeList != null">
+ <if test="deptcodeList != null and deptcodeList.size() > 0">
and deptcode in
<foreach collection="deptcodeList" item="deptcode" open="(" separator="," close=")">
#{deptcode}
@@ -663,7 +668,7 @@
<where>
del_flag=0
and inhospstate=0
- <if test="deptcodeList != null">
+ <if test="deptcodeList != null and deptcodeList.size() > 0">
and deptcode in
<foreach collection="deptcodeList" item="deptcode" open="(" separator="," close=")">
#{deptcode}
@@ -678,7 +683,7 @@
<where>
del_flag=0
and inhospstate=1
- <if test="deptcodeList != null">
+ <if test="deptcodeList != null and deptcodeList.size() > 0">
and deptcode in
<foreach collection="deptcodeList" item="deptcode" open="(" separator="," close=")">
#{deptcode}
@@ -693,7 +698,7 @@
<where>
del_flag=0
and inhospstate=1
- <if test="deptcodeList != null">
+ <if test="deptcodeList != null and deptcodeList.size() > 0">
and deptcode in
<foreach collection="deptcodeList" item="deptcode" open="(" separator="," close=")">
#{deptcode}
@@ -703,8 +708,6 @@
</if>
) AS combined
GROUP BY deptname;
-
-
</select>
<select id="selectPatMedInhospCount" parameterType="com.smartor.domain.PatMedReq"
resultType="com.smartor.domain.PatMedRes">
@@ -725,7 +728,7 @@
and date_format(endtime,'%y%m%d') >= date_format(#{startDate},'%y%m%d')
and date_format(endtime,'%y%m%d') <= date_format(#{endDate},'%y%m%d')
</if>
- <if test="deptcodeList != null">
+ <if test="deptcodeList != null and deptcodeList.size() > 0">
and deptcode in
<foreach collection="deptcodeList" item="deptcode" open="(" separator="," close=")">
#{deptcode}
--
Gitblit v1.9.3