From 2d84b9771e11b64f4224c57ebc36a157fe9a15b4 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 21 十月 2025 14:52:59 +0800
Subject: [PATCH] Merge branch 'master' into 0929-master
---
smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml | 84 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 79 insertions(+), 5 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
index 986f899..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>
@@ -300,6 +300,78 @@
order by b.starttime desc
</if>
</select>
+
+ <select id="selectPatMedInhospListBySerialnum" parameterType="com.smartor.domain.PatMedInhosp" resultMap="PatMedInhospResult">
+ select
+ b.inhospid,
+ b.nurse_id,
+ b.nurse_name,
+ b.patname,
+ b.management_doctor,
+ b.management_doctor_code,
+ b.out_way_id,
+ b.out_way_name,
+ b.deptcheck_flag,
+ b.wardcheck_flag,
+ b.diagcheck_flag,
+ b.inhospstate,
+ b.patno,
+ b.inhospno,
+ b.serialnum,
+ b.hospitalname,
+ b.hospitalcode,
+ b.hospitaldistrictcode,
+ b.hospitaldistrictname,
+ b.icd10code,
+ b.diagname,
+ b.starttime,
+ b.endtime,
+ b.deptcode,
+ b.deptname,
+ b.roomno,
+ b.bed_no,
+ b.orgid,
+ b.del_flag,
+ b.update_by,
+ b.update_time,
+ b.create_by,
+ b.create_time,
+ b.isupload,
+ b.upload_time,
+ b.patid,
+ b.leavediagname,
+ b.leaveicd10code,
+ b.drcode,
+ b.drname,
+ b.schemestatus,
+ b.generalschemestatus,
+ b.leaveldeptcode,
+ b.leaveldeptname,
+ b.hospitaldistrictid,
+ b.leavehospitaldistrictcode,
+ b.leavehospitaldistrictname,
+ b.leavehospitaldistrictid,
+ b.deptid,
+ b.leaveldeptid,
+ b.long_task_reason,
+ b.schemetime,
+ b.fuflag,
+ b.fudate,
+ b.fuperiod,
+ b.futypecode,
+ b.futypedesc,
+ b.fuadvice,
+ b.fuspecialadvice
+ FROM
+ pat_med_inhosp b
+
+ <where>
+ <if test="serialnum != null ">and b.serialnum = #{serialnum}</if>
+
+ </where>
+ order by b.inhospid desc
+ </select>
+
<select id="selectPatMedInhospListByCondition" parameterType="com.smartor.domain.PatMedInhospVO"
resultMap="PatMedInhospResult">
select CONCAT( a.age, a.age_unit ) AS age,
@@ -315,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,
@@ -364,7 +436,7 @@
b.futypecode,
b.futypedesc,
b.fuadvice,
- b.fuspecialadvice
+ b.fuspecialadvice,
b.schemetime
FROM
pat_med_inhosp b,
@@ -384,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>
@@ -415,6 +488,7 @@
order by b.inhospid desc
</select>
+
<select id="getTagnameBypatid" parameterType="Long" resultType="string">
SELECT GROUP_CONCAT(d.tagname, ', ')
FROM pat_archivetag d
--
Gitblit v1.9.3