From 569e8be78cc357147a403daa1af8dfe6dd7d5308 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 18 八月 2026 18:22:10 +0800
Subject: [PATCH] 1.处理药品宣教的问题 2.处理南华满意度的功能 3.处理随访导出的问题 4.处理南华短信的问题
---
smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml | 42 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 39 insertions(+), 3 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
index b003d6b..5f9666b 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
@@ -257,6 +266,7 @@
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>
@@ -463,6 +473,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,
@@ -593,6 +606,13 @@
#{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>
@@ -684,6 +704,11 @@
<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>
@@ -760,6 +785,9 @@
<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>
@@ -830,6 +858,9 @@
<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>
@@ -848,7 +879,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=",">
@@ -871,7 +903,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>
@@ -949,6 +982,9 @@
<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>
--
Gitblit v1.9.3