From fcb98e4558897945a316d04555923355b8e60605 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期二, 21 七月 2026 10:16:56 +0800
Subject: [PATCH] Merge branch 'master' into master-任务组
---
smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml | 47 ++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 40 insertions(+), 7 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
index b71c096..bff4c2b 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
@@ -52,6 +52,7 @@
<result property="inDeptcheckFlag" column="in_deptcheck_flag"/>
<result property="wardcheckFlag" column="wardcheck_flag"/>
<result property="diagcheckFlag" column="diagcheck_flag"/>
+ <result property="scheduleCheckFlag" column="schedulecheck_flag"/>
<result property="age" column="age"/>
<result property="sex" column="sex"/>
<result property="telcode" column="telcode"/>
@@ -75,11 +76,13 @@
<result property="managementDoctor" column="management_doctor"/>
<result property="managementDoctorCode" column="management_doctor_code"/>
<result property="campusid" column="campusid"/>
+ <result property="inhospMydFlag" column="inhosp_myd_flag"/>
</resultMap>
<sql id="selectPatMedInhospVo">
select inhospid,
patname,
+ inhosp_myd_flag,
campusid,
fuflag,
management_doctor,
@@ -103,6 +106,7 @@
in_deptcheck_flag,
in_wardcheck_flag,
diagcheck_flag,
+ schedulecheck_flag,
inhospstate,
patno,
long_task_reason,
@@ -164,6 +168,7 @@
b.in_deptcheck_flag,
b.in_wardcheck_flag,
b.diagcheck_flag,
+ b.schedulecheck_flag,
b.inhospstate,
b.patno,
b.inhospno,
@@ -213,6 +218,7 @@
b.futypedesc,
b.fuadvice,
b.fuspecialadvice,
+ b.inhosp_myd_flag,
a.idcardno
FROM
pat_med_inhosp b
@@ -242,6 +248,7 @@
concat('%', #{hospitaldistrictname}, '%')
</if>
<if test="endtime != null ">and b.endtime = #{endtime}</if>
+ <if test="inhospMydFlag != null ">and b.inhosp_myd_flag = #{inhospMydFlag}</if>
<if test="managementDoctor != null ">and b.management_doctor = #{managementDoctor}</if>
<if test="managementDoctorCode != null ">and b.management_doctor_code = #{managementDoctorCode}</if>
<if test="inhospno != null ">and b.inhospno = #{inhospno}</if>
@@ -253,12 +260,15 @@
<if test="nurseId != null ">and b.nurse_id = #{nurseId}</if>
<if test="nurseName != null and nurseName != ''">and b.nurse_name = #{nurseName}</if>
<if test="deptcheckFlag != null ">and b.deptcheck_flag = #{deptcheckFlag}</if>
+ <if test="scheduleCheckFlag != null ">and b.schedulecheck_flag = #{scheduleCheckFlag}</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>
+ <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>
@@ -310,6 +320,13 @@
#{deptcode}
</foreach>
</if>
+ <if test="icd10codeList != null and icd10codeList.size()>0">
+ AND b.leaveicd10code IN
+ <foreach collection="icd10codeList" item="icd10code" open="(" separator=","
+ close=")">
+ #{icd10code}
+ </foreach>
+ </if>
GROUP BY
b.inhospid,
a.age,
@@ -317,10 +334,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>
@@ -342,6 +365,7 @@
b.in_deptcheck_flag,
b.in_wardcheck_flag,
b.diagcheck_flag,
+ b.schedulecheck_flag,
b.inhospstate,
b.patno,
b.inhospno,
@@ -389,14 +413,16 @@
b.futypecode,
b.futypedesc,
b.fuadvice,
+ b.inhosp_myd_flag,
b.fuspecialadvice
FROM
pat_med_inhosp b
where 1=1
+ <if test="inhospMydFlag != null ">and b.inhosp_myd_flag = #{inhospMydFlag}</if>
<if test="orgid != null and orgid != ''">
and orgid = #{orgid}
</if>
- <if test="serialnum != null ">
+ <if test="serialnum != null and serialnum != ''">
and b.serialnum = #{serialnum}
</if>
order by b.inhospid desc
@@ -469,6 +495,7 @@
b.futypedesc,
b.fuadvice,
b.fuspecialadvice,
+ b.inhosp_myd_flag,
b.schemetime
FROM
pat_med_inhosp b,
@@ -478,6 +505,7 @@
and b.del_flag=0
and a.id = b.patid
AND a.idcardno != ''
+ <if test="inhospMydFlag != null ">and b.inhosp_myd_flag = #{inhospMydFlag}</if>
<if test="orgid != null and orgid != ''">
and a.orgid = #{orgid}
</if>
@@ -499,6 +527,7 @@
<if test="campusid != null ">and b.campusid = #{campusid}</if>
<if test="diagcheckFlag != null ">and b.diagcheck_flag = #{diagcheckFlag}</if>
<if test="deptcheckFlag != null ">and b.deptcheck_flag = #{deptcheckFlag}</if>
+ <if test="scheduleCheckFlag != null ">and b.schedulecheck_flag = #{scheduleCheckFlag}</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>
@@ -545,6 +574,7 @@
<if test="cry != null and cry == 0 ">and inhospstate=0</if>
<if test="cry != null and cry == 1 ">and inhospstate=1</if>
<if test="cry != null and cry == 3 ">and inhospstate=3</if>
+ <if test="inhospMydFlag != null ">and inhosp_myd_flag = #{inhospMydFlag}</if>
<if test="serialnum != null">and serialnum = #{serialnum}</if>
<if test="hospitalname != null">and hospitalname = #{hospitalname}</if>
<if test="hospitalcode != null">and hospitalcode = #{hospitalcode}</if>
@@ -681,6 +711,7 @@
<if test="managementDoctor != null ">management_doctor,</if>
<if test="managementDoctorCode != null ">management_doctor_code,</if>
<if test="campusid != null ">campusid,</if>
+ <if test="inhospMydFlag != null ">inhosp_myd_flag,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="serialnum != null">#{serialnum},</if>
@@ -748,6 +779,7 @@
<if test="managementDoctor != null ">#{managementDoctor},</if>
<if test="managementDoctorCode != null ">#{managementDoctorCode},</if>
<if test="campusid != null ">#{campusid},</if>
+ <if test="inhospMydFlag != null ">#{inhospMydFlag},</if>
</trim>
</insert>
@@ -766,7 +798,7 @@
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,
- management_doctor_doctor,campusid
+ management_doctor_doctor,campusid, inhosp_myd_flag
)
values
<foreach collection="list" item="item" separator=",">
@@ -788,7 +820,7 @@
#{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},
- #{item.fuspecialadvice}, #{item.managementDoctor}, #{item.managementDoctorCode}, #{item.campusid}
+ #{item.fuspecialadvice}, #{item.managementDoctor}, #{item.managementDoctorCode}, #{item.campusid}, #{item.inhospMydFlag}
)
</foreach>
</insert>
@@ -838,6 +870,7 @@
<if test="patno != null">patno = #{patno},</if>
<if test="inhospstate != null">inhospstate = #{inhospstate},</if>
<if test="deptcheckFlag != null">deptcheck_flag = #{deptcheckFlag},</if>
+ <if test="scheduleCheckFlag != null">schedulecheck_flag = #{scheduleCheckFlag},</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>
@@ -860,8 +893,8 @@
<if test="fuspecialadvice != null ">fuspecialadvice = #{fuspecialadvice},</if>
<if test="managementDoctor != null ">management_doctor = #{managementDoctor},</if>
<if test="managementDoctorCode != null ">management_doctor_code = #{managementDoctorCode},</if>
- <if test="campusid != null ">campusid = #{campusid}</if>
-
+ <if test="campusid != null ">campusid = #{campusid},</if>
+ <if test="inhospMydFlag != null ">inhosp_myd_flag = #{inhospMydFlag},</if>
</trim>
where inhospid = #{inhospid}
</update>
--
Gitblit v1.9.3