From 9dd748e0352f31b6255be2860c177db0d20ac40e Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 21 十月 2025 14:41:35 +0800
Subject: [PATCH] Merge branch 'master' into 0929-master
---
smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
index 272f207..032b5b7 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
@@ -249,7 +249,7 @@
<if test="wardcheckFlag != null ">and b.wardcheck_flag = #{wardcheckFlag}</if>
<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.endtime is not null</if>
+ <if test="cry != null and cry == 1 ">and b.inhospstate=1</if>
<if test="inhospstate != null ">and b.inhospstate = #{inhospstate}</if>
<if test="schemestatus != null ">and b.schemestatus = #{schemestatus}</if>
<if test="outWayId != null ">and b.out_way_id = #{outWayId}</if>
@@ -387,9 +387,9 @@
b.out_way_name,
b.nurse_id,
b.nurse_name,
- b.deptcheckFlag,
- b.diagcheckFlag,
- b.wardcheckFlag,
+ b.deptcheck_flag,
+ b.diagcheck_flag,
+ b.wardcheck_flag,
b.inhospstate,
b.patno,
b.inhospno,
@@ -436,7 +436,7 @@
b.futypecode,
b.futypedesc,
b.fuadvice,
- b.fuspecialadvice
+ b.fuspecialadvice,
b.schemetime
FROM
pat_med_inhosp b,
@@ -456,6 +456,7 @@
concat('%', #{hospitaldistrictname}, '%')
</if>
<if test="endtime != null ">and b.endtime = #{endtime}</if>
+ <if test="serialnum != null ">and b.serialnum = #{serialnum}</if>
<if test="fuflag != null ">and b.fuflag = #{fuflag}</if>
<if test="nurseId != null ">and b.nurse_id = #{nurseId}</if>
<if test="nurseName != null ">and b.nurse_name = #{nurseName}</if>
--
Gitblit v1.9.3