From 3d047130b059efd46f56be37465a751ab16ee8cb Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期三, 11 十一月 2026 14:06:56 +0800
Subject: [PATCH] Merge branch 'smartor_ls_merge' into 20261111-妇幼档案随访
---
smartor/src/main/resources/mapper/smartor/PatChildArchiveDetailMapper.xml | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/PatChildArchiveDetailMapper.xml b/smartor/src/main/resources/mapper/smartor/PatChildArchiveDetailMapper.xml
index 591f495..bd865d7 100644
--- a/smartor/src/main/resources/mapper/smartor/PatChildArchiveDetailMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatChildArchiveDetailMapper.xml
@@ -9,6 +9,9 @@
<result property="archiveid" column="archiveid"/>
<result property="archiveType" column="archive_type"/>
<result property="sourceType" column="source_type"/>
+ <result property="sourceBizId" column="source_biz_id"/>
+ <result property="sourceBizNo" column="source_biz_no"/>
+ <result property="sourceSubId" column="source_sub_id"/>
<result property="outhospno" column="outhospno"/>
<result property="inhospno" column="inhospno"/>
<result property="serialnum" column="serialnum"/>
@@ -47,6 +50,7 @@
<result property="highRiskChildType" column="high_risk_child_type"/>
<result property="highRiskChildName" column="high_risk_child_name"/>
<result property="plannedFollowTime" column="planned_follow_time"/>
+ <result property="followupPeriod" column="followup_period"/>
<result property="hrcGrowthDevelopmentMonitoring" column="hrc_growth_development_monitoring"/>
<result property="hrcNeurologicalEvaluation" column="hrc_neurological_evaluation"/>
<result property="hrcInterventionRecords" column="hrc_intervention_records"/>
@@ -69,6 +73,9 @@
archiveid,
archive_type,
source_type,
+ source_biz_id,
+ source_biz_no,
+ source_sub_id,
outhospno,
inhospno,
serialnum,
@@ -107,6 +114,7 @@
high_risk_child_type,
high_risk_child_name,
planned_follow_time,
+ followup_period,
hrc_growth_development_monitoring,
hrc_neurological_evaluation,
hrc_intervention_records,
@@ -132,7 +140,11 @@
and del_flag = '0'
<if test="archiveid != null">and archiveid = #{archiveid}</if>
<if test="archiveType != null and archiveType != ''">and archive_type = #{archiveType}</if>
+ <if test="followupPeriod != null and followupPeriod != ''">and followup_period = #{followupPeriod}</if>
<if test="sourceType != null and sourceType != ''">and source_type = #{sourceType}</if>
+ <if test="sourceBizId != null">and source_biz_id = #{sourceBizId}</if>
+ <if test="sourceBizNo != null and sourceBizNo != ''">and source_biz_no = #{sourceBizNo}</if>
+ <if test="sourceSubId != null">and source_sub_id = #{sourceSubId}</if>
<if test="outhospno != null and outhospno != ''">and outhospno = #{outhospno}</if>
<if test="inhospno != null and inhospno != ''">and inhospno = #{inhospno}</if>
<if test="serialnum != null and serialnum != ''">and serialnum = #{serialnum}</if>
@@ -174,6 +186,7 @@
<select id="selectPatChildArchiveDetailById" parameterType="Long" resultMap="PatChildArchiveDetailResult">
<include refid="selectPatChildArchiveDetailVo"/>
where id = #{id}
+ and del_flag = '0'
</select>
<insert id="insertPatChildArchiveDetail" parameterType="com.smartor.domain.PatChildArchiveDetail"
@@ -183,6 +196,9 @@
<if test="archiveid != null">archiveid,</if>
<if test="archiveType != null">archive_type,</if>
<if test="sourceType != null">source_type,</if>
+ <if test="sourceBizId != null">source_biz_id,</if>
+ <if test="sourceBizNo != null">source_biz_no,</if>
+ <if test="sourceSubId != null">source_sub_id,</if>
<if test="outhospno != null">outhospno,</if>
<if test="inhospno != null">inhospno,</if>
<if test="serialnum != null">serialnum,</if>
@@ -221,6 +237,7 @@
<if test="highRiskChildType != null">high_risk_child_type,</if>
<if test="highRiskChildName != null">high_risk_child_name,</if>
<if test="plannedFollowTime != null">planned_follow_time,</if>
+ <if test="followupPeriod != null">followup_period,</if>
<if test="hrcGrowthDevelopmentMonitoring != null">hrc_growth_development_monitoring,</if>
<if test="hrcNeurologicalEvaluation != null">hrc_neurological_evaluation,</if>
<if test="hrcInterventionRecords != null">hrc_intervention_records,</if>
@@ -241,6 +258,9 @@
<if test="archiveid != null">#{archiveid},</if>
<if test="archiveType != null">#{archiveType},</if>
<if test="sourceType != null">#{sourceType},</if>
+ <if test="sourceBizId != null">#{sourceBizId},</if>
+ <if test="sourceBizNo != null">#{sourceBizNo},</if>
+ <if test="sourceSubId != null">#{sourceSubId},</if>
<if test="outhospno != null">#{outhospno},</if>
<if test="inhospno != null">#{inhospno},</if>
<if test="serialnum != null">#{serialnum},</if>
@@ -279,6 +299,7 @@
<if test="highRiskChildType != null">#{highRiskChildType},</if>
<if test="highRiskChildName != null">#{highRiskChildName},</if>
<if test="plannedFollowTime != null">#{plannedFollowTime},</if>
+ <if test="followupPeriod != null">#{followupPeriod},</if>
<if test="hrcGrowthDevelopmentMonitoring != null">#{hrcGrowthDevelopmentMonitoring},</if>
<if test="hrcNeurologicalEvaluation != null">#{hrcNeurologicalEvaluation},</if>
<if test="hrcInterventionRecords != null">#{hrcInterventionRecords},</if>
@@ -303,6 +324,9 @@
<if test="archiveid != null">archiveid = #{archiveid},</if>
<if test="archiveType != null">archive_type = #{archiveType},</if>
<if test="sourceType != null">source_type = #{sourceType},</if>
+ <if test="sourceBizId != null">source_biz_id = #{sourceBizId},</if>
+ <if test="sourceBizNo != null">source_biz_no = #{sourceBizNo},</if>
+ <if test="sourceSubId != null">source_sub_id = #{sourceSubId},</if>
<if test="outhospno != null">outhospno = #{outhospno},</if>
<if test="inhospno != null">inhospno = #{inhospno},</if>
<if test="serialnum != null">serialnum = #{serialnum},</if>
@@ -341,6 +365,7 @@
<if test="highRiskChildType != null">high_risk_child_type = #{highRiskChildType},</if>
<if test="highRiskChildName != null">high_risk_child_name = #{highRiskChildName},</if>
<if test="plannedFollowTime != null">planned_follow_time = #{plannedFollowTime},</if>
+ <if test="followupPeriod != null">followup_period = #{followupPeriod},</if>
<if test="hrcGrowthDevelopmentMonitoring != null">hrc_growth_development_monitoring = #{hrcGrowthDevelopmentMonitoring},</if>
<if test="hrcNeurologicalEvaluation != null">hrc_neurological_evaluation = #{hrcNeurologicalEvaluation},</if>
<if test="hrcInterventionRecords != null">hrc_intervention_records = #{hrcInterventionRecords},</if>
@@ -374,4 +399,11 @@
#{id}
</foreach>
</update>
+
+ <update id="deletePatChildArchiveDetailByArchiveIds" parameterType="String">
+ update pat_child_archive_detail set del_flag = '1' where archiveid in
+ <foreach item="archiveId" collection="array" open="(" separator="," close=")">
+ #{archiveId}
+ </foreach>
+ </update>
</mapper>
--
Gitblit v1.9.3