From 8fe7805b75fceef28f00fb0124901031a287429c Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期四, 07 五月 2026 16:46:10 +0800
Subject: [PATCH] 【市一】remark 统一调整
---
smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
index 405bc68..b71c096 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
@@ -48,6 +48,8 @@
<result property="patno" column="patno"/>
<result property="inhospstate" column="inhospstate"/>
<result property="deptcheckFlag" column="deptcheck_flag"/>
+ <result property="inWardcheckFlag" column="in_wardcheck_flag"/>
+ <result property="inDeptcheckFlag" column="in_deptcheck_flag"/>
<result property="wardcheckFlag" column="wardcheck_flag"/>
<result property="diagcheckFlag" column="diagcheck_flag"/>
<result property="age" column="age"/>
@@ -98,6 +100,8 @@
nurse_name,
deptcheck_flag,
wardcheck_flag,
+ in_deptcheck_flag,
+ in_wardcheck_flag,
diagcheck_flag,
inhospstate,
patno,
@@ -157,6 +161,8 @@
b.out_way_name,
b.deptcheck_flag,
b.wardcheck_flag,
+ b.in_deptcheck_flag,
+ b.in_wardcheck_flag,
b.diagcheck_flag,
b.inhospstate,
b.patno,
@@ -248,6 +254,8 @@
<if test="nurseName != null and nurseName != ''">and b.nurse_name = #{nurseName}</if>
<if test="deptcheckFlag != null ">and b.deptcheck_flag = #{deptcheckFlag}</if>
<if test="wardcheckFlag != null ">and b.wardcheck_flag = #{wardcheckFlag}</if>
+ <if test="inDeptcheckFlag != null ">and b.in_deptcheck_flag = #{inDeptcheckFlag}</if>
+ <if test="inWardcheckFlag != null ">and b.in_wardcheck_flag = #{inWardcheckFlag}</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.inhospstate=1</if>
@@ -331,6 +339,8 @@
b.out_way_name,
b.deptcheck_flag,
b.wardcheck_flag,
+ b.in_deptcheck_flag,
+ b.in_wardcheck_flag,
b.diagcheck_flag,
b.inhospstate,
b.patno,
@@ -409,8 +419,9 @@
b.nurse_id,
b.nurse_name,
b.deptcheck_flag,
- b.diagcheck_flag,
b.wardcheck_flag,
+ b.in_deptcheck_flag,
+ b.in_wardcheck_flag,
b.inhospstate,
b.patno,
b.inhospno,
@@ -489,6 +500,8 @@
<if test="diagcheckFlag != null ">and b.diagcheck_flag = #{diagcheckFlag}</if>
<if test="deptcheckFlag != null ">and b.deptcheck_flag = #{deptcheckFlag}</if>
<if test="wardcheckFlag != null ">and b.wardcheck_flag = #{wardcheckFlag}</if>
+ <if test="inDeptcheckFlag != null ">and b.in_deptcheck_flag = #{inDeptcheckFlag}</if>
+ <if test="inWardcheckFlag != null ">and b.in_wardcheck_flag = #{inWardcheckFlag}</if>
<if test="inhospstate != null ">and b.inhospstate = #{inhospstate}</if>
<if test="schemestatus != null ">and b.schemestatus = #{schemestatus}</if>
<if test="leavediagname != null and leavediagname != ''">and b.leavediagname like concat('%',
@@ -573,6 +586,9 @@
<if test="inhospstate != null">and inhospstate = #{inhospstate}</if>
<if test="deptcheckFlag != null">and deptcheck_flag = #{deptcheckFlag}</if>
<if test="wardcheckFlag != null">and wardcheck_flag = #{wardcheckFlag}</if>
+ <if test="inDeptcheckFlag != null">and in_deptcheck_flag = #{inDeptcheckFlag}</if>
+ <if test="inWardcheckFlag != null">and in_wardcheck_flag = #{inWardcheckFlag}</if>
+ <if test="wardcheckFlag != null">and wardcheck_flag = #{wardcheckFlag}</if>
<if test="diagcheckFlag != null">and diagcheck_flag = #{diagcheckFlag}</if>
<if test="longTaskReason != null">and long_task_reason = #{longTaskReason}</if>
<if test="nurseId != null ">and nurse_id = #{nurseId}</if>
@@ -642,6 +658,8 @@
<if test="inhospstate != null">inhospstate,</if>
<if test="deptcheckFlag != null">deptcheck_flag,</if>
<if test="wardcheckFlag != null">wardcheck_flag,</if>
+ <if test="inDeptcheckFlag != null">in_deptcheck_flag,</if>
+ <if test="inWardcheckFlag != null">in_wardcheck_flag,</if>
<if test="diagcheckFlag != null">diagcheck_flag,</if>
<if test="longTaskReason != null">long_task_reason,</if>
<if test="nurseId != null ">nurse_id,</if>
@@ -707,6 +725,8 @@
<if test="inhospstate != null">#{inhospstate},</if>
<if test="deptcheckFlag != null">#{deptcheckFlag},</if>
<if test="wardcheckFlag != null">#{wardcheckFlag},</if>
+ <if test="inDeptcheckFlag != null">#{inDeptcheckFlag},</if>
+ <if test="inWardcheckFlag != null">#{inWardcheckFlag},</if>
<if test="diagcheckFlag != null">#{diagcheckFlag},</if>
<if test="longTaskReason != null">#{longTaskReason},</if>
<if test="nurseId != null ">#{nurseId},</if>
@@ -742,7 +762,7 @@
schemestatus, generalschemestatus, leaveldeptcode, leaveldeptname, hospitaldistrictid,
leavehospitaldistrictcode, leavehospitaldistrictname, leavehospitaldistrictid,
deptid, leaveldeptid, schemetime, patname, patno, inhospstate,
- deptcheck_flag, wardcheck_flag, diagcheck_flag, long_task_reason,
+ deptcheck_flag, wardcheck_flag,in_deptcheck_flag, in_wardcheck_flag, diagcheck_flag, long_task_reason,
nurse_id, nurse_name, out_way_id, out_way_name, guid,
operator, operator_id, inhospno, remark,
fuflag, fudate, fuperiod, futypecode, futypedesc, fuadvice, fuspecialadvice, management_doctor,
@@ -764,7 +784,7 @@
#{item.leavehospitaldistrictcode}, #{item.leavehospitaldistrictname}, #{item.leavehospitaldistrictid},
#{item.deptid}, #{item.leaveldeptid}, #{item.schemetime}, #{item.patname}, #{item.patno},
#{item.inhospstate},
- #{item.deptcheckFlag}, #{item.wardcheckFlag}, #{item.diagcheckFlag}, #{item.longTaskReason},
+ #{item.deptcheckFlag}, #{item.wardcheckFlag},#{item.inDeptcheckFlag}, #{item.inWardcheckFlag}, #{item.diagcheckFlag}, #{item.longTaskReason},
#{item.nurseId}, #{item.nurseName}, #{item.outWayId}, #{item.outWayName}, #{item.guid},
#{item.operator}, #{item.operatorId}, #{item.inhospno}, #{item.remark},
#{item.fuflag}, #{item.fudate}, #{item.fuperiod}, #{item.futypecode}, #{item.futypedesc}, #{item.fuadvice},
@@ -819,6 +839,8 @@
<if test="inhospstate != null">inhospstate = #{inhospstate},</if>
<if test="deptcheckFlag != null">deptcheck_flag = #{deptcheckFlag},</if>
<if test="wardcheckFlag != null">wardcheck_flag = #{wardcheckFlag},</if>
+ <if test="inDeptcheckFlag != null">in_deptcheck_flag = #{inDeptcheckFlag},</if>
+ <if test="inWardcheckFlag != null">in_wardcheck_flag = #{inWardcheckFlag},</if>
<if test="diagcheckFlag != null">diagcheck_flag = #{diagcheckFlag},</if>
<if test="longTaskReason != null">long_task_reason = #{longTaskReason},</if>
<if test="nurseId != null ">nurse_id = #{nurseId},</if>
--
Gitblit v1.9.3