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/PatMaternityArchiveDetailMapper.xml | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 56 insertions(+), 0 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/PatMaternityArchiveDetailMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMaternityArchiveDetailMapper.xml
index 731cdac..7c2ba79 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMaternityArchiveDetailMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMaternityArchiveDetailMapper.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"/>
@@ -39,6 +42,12 @@
<result property="dueDate" column="due_date"/>
<result property="registerUser" column="register_user"/>
<result property="followupPeriod" column="followup_period"/>
+ <result property="followupCycleTimes" column="followup_cycle_times"/>
+ <result property="lastMenstrualTime" column="last_menstrual_time"/>
+ <result property="firstDoctorCode" column="first_doctor_code"/>
+ <result property="firstDoctorName" column="first_doctor_name"/>
+ <result property="contactPhone" column="contact_phone"/>
+ <result property="address" column="address"/>
<result property="epEarlyPregnancyFollowupForm" column="ep_early_pregnancy_followup_form"/>
<result property="mhiMenopauseFollowupSystemIssuesForm" column="mhi_menopause_followup_system_issues_form"/>
<result property="mhiMhtInitialVisitMedicalRecordForm" column="mhi_mht_initial_visit_medical_record_form"/>
@@ -61,6 +70,9 @@
archiveid,
archive_type,
source_type,
+ source_biz_id,
+ source_biz_no,
+ source_sub_id,
outhospno,
inhospno,
serialnum,
@@ -91,6 +103,12 @@
due_date,
register_user,
followup_period,
+ followup_cycle_times,
+ last_menstrual_time,
+ first_doctor_code,
+ first_doctor_name,
+ contact_phone,
+ address,
ep_early_pregnancy_followup_form,
mhi_menopause_followup_system_issues_form,
mhi_mht_initial_visit_medical_record_form,
@@ -117,6 +135,9 @@
<if test="archiveid != null">and archiveid = #{archiveid}</if>
<if test="archiveType != null and archiveType != ''">and archive_type = #{archiveType}</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>
@@ -152,6 +173,7 @@
<select id="selectPatMaternityArchiveDetailById" parameterType="Long" resultMap="PatMaternityArchiveDetailResult">
<include refid="selectPatMaternityArchiveDetailVo"/>
where id = #{id}
+ and del_flag = '0'
</select>
<insert id="insertPatMaternityArchiveDetail" parameterType="com.smartor.domain.PatMaternityArchiveDetail"
@@ -161,6 +183,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>
@@ -191,6 +216,12 @@
<if test="dueDate != null">due_date,</if>
<if test="registerUser != null">register_user,</if>
<if test="followupPeriod != null">followup_period,</if>
+ <if test="followupCycleTimes != null">followup_cycle_times,</if>
+ <if test="lastMenstrualTime != null">last_menstrual_time,</if>
+ <if test="firstDoctorCode != null">first_doctor_code,</if>
+ <if test="firstDoctorName != null">first_doctor_name,</if>
+ <if test="contactPhone != null">contact_phone,</if>
+ <if test="address != null">address,</if>
<if test="epEarlyPregnancyFollowupForm != null">ep_early_pregnancy_followup_form,</if>
<if test="mhiMenopauseFollowupSystemIssuesForm != null">mhi_menopause_followup_system_issues_form,</if>
<if test="mhiMhtInitialVisitMedicalRecordForm != null">mhi_mht_initial_visit_medical_record_form,</if>
@@ -211,6 +242,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>
@@ -241,6 +275,12 @@
<if test="dueDate != null">#{dueDate},</if>
<if test="registerUser != null">#{registerUser},</if>
<if test="followupPeriod != null">#{followupPeriod},</if>
+ <if test="followupCycleTimes != null">#{followupCycleTimes},</if>
+ <if test="lastMenstrualTime != null">#{lastMenstrualTime},</if>
+ <if test="firstDoctorCode != null">#{firstDoctorCode},</if>
+ <if test="firstDoctorName != null">#{firstDoctorName},</if>
+ <if test="contactPhone != null">#{contactPhone},</if>
+ <if test="address != null">#{address},</if>
<if test="epEarlyPregnancyFollowupForm != null">#{epEarlyPregnancyFollowupForm},</if>
<if test="mhiMenopauseFollowupSystemIssuesForm != null">#{mhiMenopauseFollowupSystemIssuesForm},</if>
<if test="mhiMhtInitialVisitMedicalRecordForm != null">#{mhiMhtInitialVisitMedicalRecordForm},</if>
@@ -265,6 +305,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>
@@ -295,6 +338,12 @@
<if test="dueDate != null">due_date = #{dueDate},</if>
<if test="registerUser != null">register_user = #{registerUser},</if>
<if test="followupPeriod != null">followup_period = #{followupPeriod},</if>
+ <if test="followupCycleTimes != null">followup_cycle_times = #{followupCycleTimes},</if>
+ <if test="lastMenstrualTime != null">last_menstrual_time = #{lastMenstrualTime},</if>
+ <if test="firstDoctorCode != null">first_doctor_code = #{firstDoctorCode},</if>
+ <if test="firstDoctorName != null">first_doctor_name = #{firstDoctorName},</if>
+ <if test="contactPhone != null">contact_phone = #{contactPhone},</if>
+ <if test="address != null">address = #{address},</if>
<if test="epEarlyPregnancyFollowupForm != null">ep_early_pregnancy_followup_form = #{epEarlyPregnancyFollowupForm},</if>
<if test="mhiMenopauseFollowupSystemIssuesForm != null">mhi_menopause_followup_system_issues_form = #{mhiMenopauseFollowupSystemIssuesForm},</if>
<if test="mhiMhtInitialVisitMedicalRecordForm != null">mhi_mht_initial_visit_medical_record_form = #{mhiMhtInitialVisitMedicalRecordForm},</if>
@@ -328,4 +377,11 @@
#{id}
</foreach>
</update>
+
+ <update id="deletePatMaternityArchiveDetailByArchiveIds" parameterType="String">
+ update pat_maternity_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