From c8fbebc0d6e4142233cffe5a1808f1df685bda2c Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 18 九月 2026 15:06:31 +0800
Subject: [PATCH] 【市一】随访增加院区限制
---
smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml | 74 ++++++++++++++++++++++++++++++++-----
1 files changed, 64 insertions(+), 10 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
index 95f1bcc..4baa70c 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
@@ -80,10 +80,16 @@
<result property="encounterSourceId" column="encounter_source_id"/>
<result property="importanceFlagCode" column="importance_flag_code"/>
<result property="emergencyLevelCode" column="emergency_level_code"/>
+ <result property="medicalCode" column="medical_code"/>
+ <result property="medicalName" column="medical_name"/>
+ <result property="medicalCompany" column="medical_company"/>
</resultMap>
<sql id="selectPatMedInhospVo">
select inhospid,
+ medical_code,
+ medical_name,
+ medical_company,
encounter_source_id,
importance_flag_code,
emergency_level_code,
@@ -158,7 +164,7 @@
</sql>
<select id="selectPatMedInhospList" parameterType="com.smartor.domain.PatMedInhosp" resultMap="PatMedInhospResult">
- select CONCAT( a.age, a.age_unit ) AS age,
+ select a.age AS age,
a.telcode as telcode,
a.sex,
b.inhospid,
@@ -228,6 +234,9 @@
b.encounter_source_id,
b.importance_flag_code,
b.emergency_level_code,
+ b.medical_code,
+ b.medical_name,
+ b.medical_company,
a.idcardno
FROM
pat_med_inhosp b
@@ -237,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') >=
date_format(#{startOutHospTime},'%y%m%d')
</if>
@@ -257,12 +267,14 @@
concat('%', #{hospitaldistrictname}, '%')
</if>
<if test="endtime != null ">and b.endtime = #{endtime}</if>
+ <if test="bedNo != null ">and b.bed_no = #{bedNo}</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>
<if test="fuflag != null ">and b.fuflag = #{fuflag}</if>
<if test="orgid != null ">and b.orgid = #{orgid}</if>
+ <if test="campusid != null ">and b.campusid = #{campusid}</if>
<if test="serialnum != null ">and b.serialnum = #{serialnum}</if>
<if test="endtime != null ">and b.endtime = #{endtime}</if>
<if test="patno != null ">and b.patno = #{patno}</if>
@@ -282,7 +294,6 @@
<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>
<if test="outWayId != null ">and b.out_way_id = #{outWayId}</if>
<if test="outWayName != null ">and b.out_way_name = #{outWayName}</if>
@@ -339,6 +350,9 @@
#{icd10code}
</foreach>
</if>
+ <if test="medicalCode != null and medicalCode != ''">and b.medical_code = #{medicalCode}</if>
+ <if test="medicalName != null and medicalName != ''">and b.medical_name = #{medicalName}</if>
+ <if test="medicalCompany != null and medicalCompany != ''">and b.medical_company = #{medicalCompany}</if>
GROUP BY
b.inhospid,
a.age,
@@ -356,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>
@@ -365,6 +379,9 @@
select
b.inhospid,
b.nurse_id,
+ b.medical_code,
+ b.medical_name,
+ b.medical_company,
b.encounter_source_id,
b.importance_flag_code,
b.emergency_level_code,
@@ -437,6 +454,9 @@
<if test="orgid != null and orgid != ''">
and orgid = #{orgid}
</if>
+ <if test="campusid != null and campusid != ''">
+ and campusid = #{campusid}
+ </if>
<if test="encounterSourceId != null and encounterSourceId != ''">
and b.encounter_source_id = #{encounterSourceId}
</if>
@@ -457,6 +477,9 @@
select CONCAT( a.age, a.age_unit ) AS age,
a.telcode as telcode,
b.inhospid,
+ b.medical_code,
+ b.medical_name,
+ b.medical_company,
b.encounter_source_id,
b.importance_flag_code,
b.emergency_level_code,
@@ -545,6 +568,9 @@
<if test="orgid != null and orgid != ''">
and a.orgid = #{orgid}
</if>
+ <if test="campusid != null and campusid != ''">
+ and a.campusid = #{campusid}
+ </if>
<if test="hospitalname != null and hospitalname != ''">and hospitalname like concat('%', #{hospitalname},
'%')
</if>
@@ -560,7 +586,6 @@
<if test="nurseId != null ">and b.nurse_id = #{nurseId}</if>
<if test="nurseName != null ">and b.nurse_name = #{nurseName}</if>
<if test="patno != null ">and b.patno = #{patno}</if>
- <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>
@@ -586,6 +611,13 @@
close=")">
#{leaveldeptcode}
</foreach>
+ </if>
+ <if test="medicalCode != null and medicalCode != ''">and b.medical_code like concat('%'#{medicalCode}, '%')
+ </if>
+ <if test="medicalName != null and medicalName != ''">and b.medical_name like concat('%'#{medicalName}, '%')
+ </if>
+ <if test="medicalCompany != null and medicalCompany != ''">and b.medical_company like
+ concat('%'#{medicalCompany}, '%')
</if>
order by b.inhospid desc
</select>
@@ -625,6 +657,7 @@
<if test="roomno != null">and roomno = #{roomno}</if>
<if test="bedNo != null">and bed_no = #{bedNo}</if>
<if test="orgid != null">and orgid = #{orgid}</if>
+ <if test="campusid != null ">and campusid = #{campusid}</if>
<if test="updateBy != null">and update_by = #{updateBy}</if>
<if test="updateTime != null">and update_time = #{updateTime}</if>
<if test="createBy != null">and create_by = #{createBy}</if>
@@ -674,10 +707,14 @@
<if test="fuspecialadvice != null ">and fuspecialadvice = #{fuspecialadvice}</if>
<if test="managementDoctor != null ">and management_doctor = #{managementDoctor}</if>
<if test="managementDoctorCode != null ">and management_doctor_code = #{managementDoctorCode}</if>
- <if test="campusid != null ">and campusid = #{campusid}</if>
<if test="importanceFlagCode != null ">and importance_flag_code = #{importanceFlagCode}</if>
<if test="emergencyLevelCode != null ">and emergency_level_code = #{emergencyLevelCode}</if>
<if test="encounterSourceId != null ">and encounter_source_id = #{encounterSourceId}</if>
+ <if test="medicalCode != null and medicalCode != ''">and medical_code like concat('%'#{medicalCode}, '%')</if>
+ <if test="medicalName != null and medicalName != ''">and medical_name like concat('%'#{medicalName}, '%')</if>
+ <if test="medicalCompany != null and medicalCompany != ''">and medical_company like
+ concat('%'#{medicalCompany}, '%')
+ </if>
</select>
@@ -699,6 +736,7 @@
<if test="roomno != null">roomno,</if>
<if test="bedNo != null">bed_no,</if>
<if test="orgid != null">orgid,</if>
+ <if test="campusid != null">campusid,</if>
<if test="delFlag != null and delFlag != ''">del_flag,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
@@ -749,11 +787,13 @@
<if test="fuspecialadvice != null ">fuspecialadvice,</if>
<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>
<if test="importanceFlagCode != null ">importance_flag_code,</if>
<if test="emergencyLevelCode != null ">emergency_level_code,</if>
<if test="encounterSourceId != null ">encounter_source_id,</if>
+ <if test="medicalCode != null and medicalCode != ''">medical_code,</if>
+ <if test="medicalName != null and medicalName != ''">medical_name,</if>
+ <if test="medicalCompany != null and medicalCompany != ''">medical_company,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="serialnum != null">#{serialnum},</if>
@@ -770,6 +810,7 @@
<if test="roomno != null">#{roomno},</if>
<if test="bedNo != null">#{bedNo},</if>
<if test="orgid != null">#{orgid},</if>
+ <if test="campusid != null">#{campusid},</if>
<if test="delFlag != null and delFlag != ''">#{delFlag},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
@@ -820,10 +861,12 @@
<if test="fuspecialadvice != null ">#{fuspecialadvice},</if>
<if test="managementDoctor != null ">#{managementDoctor},</if>
<if test="managementDoctorCode != null ">#{managementDoctorCode},</if>
- <if test="campusid != null ">#{campusid},</if>
<if test="importanceFlagCode != null ">#{importanceFlagCode},</if>
<if test="emergencyLevelCode != null ">#{emergencyLevelCode},</if>
<if test="encounterSourceId != null ">#{encounterSourceId},</if>
+ <if test="medicalCode != null and medicalCode != ''">#{medicalCode},</if>
+ <if test="medicalName != null and medicalName != ''">#{medicalName},</if>
+ <if test="medicalCompany != null and medicalCompany != ''">#{medicalCompany},</if>
</trim>
</insert>
@@ -842,7 +885,8 @@
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, inhosp_myd_flag, importance_flag_code, emergency_level_code, encounter_source_id
+ management_doctor_doctor,campusid, inhosp_myd_flag, importance_flag_code, emergency_level_code, encounter_source_id,
+ medical_code, medical_name, medical_company
)
values
<foreach collection="list" item="item" separator=",">
@@ -865,7 +909,8 @@
#{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.inhospMydFlag},
- #{item.importanceFlagCode}, #{item.emergencyLevelCode}, #{item.encounterSourceId}
+ #{item.importanceFlagCode}, #{item.emergencyLevelCode}, #{item.encounterSourceId},
+ #{item.medicalCode}, #{item.medicalName}, #{item.medicalCompany}
)
</foreach>
</insert>
@@ -888,6 +933,7 @@
<if test="roomno != null">roomno = #{roomno},</if>
<if test="bedNo != null">bed_no = #{bedNo},</if>
<if test="orgid != null">orgid = #{orgid},</if>
+ <if test="campusid != null">campusid = #{campusid},</if>
<if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
@@ -938,11 +984,13 @@
<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="inhospMydFlag != null ">inhosp_myd_flag = #{inhospMydFlag},</if>
<if test="importanceFlagCode != null ">importance_flag_code = #{importanceFlagCode},</if>
<if test="emergencyLevelCode != null ">emergency_level_code = #{emergencyLevelCode},</if>
<if test="encounterSourceId != null ">encounter_source_id = #{encounterSourceId},</if>
+ <if test="medicalCode != null and medicalCode != ''">medical_code = #{medicalCode},</if>
+ <if test="medicalName != null and medicalName != ''">medical_name = #{medicalName},</if>
+ <if test="medicalCompany != null and medicalCompany != ''">medical_company = #{medicalCompany},</if>
</trim>
where inhospid = #{inhospid}
</update>
@@ -991,6 +1039,9 @@
<if test="orgid != null and orgid != ''">
AND pat_med_inhosp.orgid = #{orgid}
</if>
+ <if test="campusid != null and campusid != ''">
+ and pat_med_inhosp.campusid = #{campusid}
+ </if>
AND pat_archive.idcardno IS NOT NULL
<if test="zy != null">
AND pat_med_inhosp.inhospstate = 0
@@ -1028,6 +1079,9 @@
<if test="orgid != null and orgid != ''">
AND orgid = #{orgid}
</if>
+ <if test="campusid != null and campusid != ''">
+ and campusid = #{campusid}
+ </if>
<if test="startDate != null">
AND visit_time >= #{startDate}
</if>
--
Gitblit v1.9.3