From d44eab2d72314934ef08963863d4b6082056b8ff Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期一, 09 十一月 2026 14:30:14 +0800
Subject: [PATCH] feat: 统一档案随访周期 followupPeriod

---
 smartor/src/main/resources/mapper/smartor/PatSpecificArchiveGenerateConfigMapper.xml |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/smartor/src/main/resources/mapper/smartor/PatSpecificArchiveGenerateConfigMapper.xml b/smartor/src/main/resources/mapper/smartor/PatSpecificArchiveGenerateConfigMapper.xml
index 9e35f07..48a8c86 100644
--- a/smartor/src/main/resources/mapper/smartor/PatSpecificArchiveGenerateConfigMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatSpecificArchiveGenerateConfigMapper.xml
@@ -9,6 +9,7 @@
         <result property="deptType" column="dept_type"/>
         <result property="deptCategory" column="dept_category"/>
         <result property="archiveType" column="archive_type"/>
+        <result property="followupPeriod" column="followup_period"/>
         <result property="deptCodes" column="dept_codes"/>
         <result property="icd10Codes" column="icd10_codes"/>
         <result property="remark" column="remark"/>
@@ -26,6 +27,7 @@
                dept_type,
                dept_category,
                archive_type,
+               followup_period,
                dept_codes,
                icd10_codes,
                remark,
@@ -47,6 +49,7 @@
             <if test="deptType != null and deptType != ''">and dept_type = #{deptType}</if>
             <if test="deptCategory != null and deptCategory != ''">and dept_category = #{deptCategory}</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="orgid != null and orgid != ''">and orgid = #{orgid}</if>
             <if test="campusid != null and campusid != ''">and campusid = #{campusid}</if>
             <if test="params.beginTime != null and params.beginTime != ''">
@@ -55,6 +58,14 @@
             <if test="params.endTime != null and params.endTime != ''">
                 and date_format(create_time, '%y%m%d') &lt;= date_format(#{params.endTime}, '%y%m%d')
             </if>
+    </select>
+
+    <select id="selectEffectivePatSpecificArchiveGenerateConfigList" resultMap="PatSpecificArchiveGenerateConfigResult">
+        <include refid="selectPatSpecificArchiveGenerateConfigVo"/>
+        where del_flag = '0'
+          and (orgid = #{orgid} or orgid is null or orgid = '')
+          and (campusid is null or campusid = '' or campusid = #{campusid})
+        order by case when orgid = #{orgid} then 0 else 1 end, id asc
     </select>
 
     <select id="selectPatSpecificArchiveGenerateConfigById" parameterType="Long" resultMap="PatSpecificArchiveGenerateConfigResult">
@@ -69,6 +80,7 @@
             <if test="deptType != null">dept_type,</if>
             <if test="deptCategory != null">dept_category,</if>
             <if test="archiveType != null">archive_type,</if>
+            <if test="followupPeriod != null">followup_period,</if>
             <if test="deptCodes != null">dept_codes,</if>
             <if test="icd10Codes != null">icd10_codes,</if>
             <if test="remark != null">remark,</if>
@@ -84,6 +96,7 @@
             <if test="deptType != null">#{deptType},</if>
             <if test="deptCategory != null">#{deptCategory},</if>
             <if test="archiveType != null">#{archiveType},</if>
+            <if test="followupPeriod != null">#{followupPeriod},</if>
             <if test="deptCodes != null">#{deptCodes},</if>
             <if test="icd10Codes != null">#{icd10Codes},</if>
             <if test="remark != null">#{remark},</if>
@@ -103,6 +116,7 @@
             <if test="deptType != null">dept_type = #{deptType},</if>
             <if test="deptCategory != null">dept_category = #{deptCategory},</if>
             <if test="archiveType != null">archive_type = #{archiveType},</if>
+            <if test="followupPeriod != null">followup_period = #{followupPeriod},</if>
             <if test="deptCodes != null">dept_codes = #{deptCodes},</if>
             <if test="icd10Codes != null">icd10_codes = #{icd10Codes},</if>
             <if test="remark != null">remark = #{remark},</if>

--
Gitblit v1.9.3