From c93b5be2de361e5625ed199dbbeb42704d5e1cb1 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期一, 13 七月 2026 16:22:41 +0800
Subject: [PATCH] Merge branch 'master' into master-任务组
---
smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
index 1550953..4933abe 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
@@ -263,6 +263,8 @@
<if test="diagcheckFlag != null ">and b.diagcheck_flag = #{diagcheckFlag}</if>
<if test="cry != null and cry == 0 ">and b.endtime is null</if>
<if test="cry != null and cry == 1 ">and b.inhospstate=1</if>
+ <if test="cry != null and cry == 2 ">and b.inhospstate=2</if>
+ <if test="cry != null and cry == 3 ">and b.inhospstate=3</if>
<if test="inhospstate != null ">and b.inhospstate = #{inhospstate}</if>
<if test="campusid != null ">and b.campusid = #{campusid}</if>
<if test="schemestatus != null ">and b.schemestatus = #{schemestatus}</if>
@@ -328,10 +330,16 @@
a.telcode,
a.id,
a.sex
- <if test="cry==1">
+ <if test="cry != null and cry==1">
order by b.endtime desc
</if>
- <if test="cry==0">
+ <if test="cry != null and cry==2">
+ order by b.endtime desc
+ </if>
+ <if test="cry != null and cry==3">
+ order by b.endtime desc
+ </if>
+ <if test="cry != null and cry==0">
order by b.starttime desc
</if>
</select>
--
Gitblit v1.9.3