From 0d10bc99eec75672b049339399e4f762fbd9746e Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 11 九月 2026 11:45:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
index 5f9666b..e9f230f 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
@@ -246,6 +246,7 @@
         AND a.del_flag = 0
         AND b.del_flag = 0
         AND a.idcardno IS NOT NULL
+        <if test="inhospid != null">and b.inhospid = #{inhospid}</if>
         <if test="startOutHospTime != null ">and date_format(b.endtime,'%y%m%d') &gt;=
             date_format(#{startOutHospTime},'%y%m%d')
         </if>
@@ -369,7 +370,7 @@
             order by b.endtime desc
         </if>
         <if test="cry != null and cry==0">
-            order by b.starttime desc
+            order by b.starttime desc , b.bed_no asc
         </if>
     </select>
 

--
Gitblit v1.9.3