From 64f3a44f835a917c7d4157856ea4a1ede84b26a9 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期一, 14 九月 2026 14:04:23 +0800
Subject: [PATCH] 【景宁】景宁 只要存在相同诊断、患者的门诊记录则当再次随访处理
---
smartor/src/main/resources/mapper/smartor/SvyTaskTemplateScriptMapper.xml | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 50 insertions(+), 6 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/SvyTaskTemplateScriptMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyTaskTemplateScriptMapper.xml
index 3941b15..6cfd428 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyTaskTemplateScriptMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyTaskTemplateScriptMapper.xml
@@ -15,7 +15,7 @@
<result property="language" column="language"/>
<result property="categoryName" column="categoryName"/>
<result property="scriptContent" column="script_content"/>
- <result property="isMust" column="is_must"/>
+ <result property="ismandatory" column="ismandatory"/>
<result property="delFlag" column="del_flag"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
@@ -49,8 +49,14 @@
<result property="dutyDeptCode" column="duty_dept_code"/>
<result property="reportDeptCode" column="report_dept_name"/>
<result property="reportDeptName" column="report_dept_code"/>
+ <result property="dutyDeptPersonName" column="duty_dept_person_name"/>
+ <result property="dutyDeptPersonCode" column="duty_dept_person_code"/>
+ <result property="reportDeptPersonCode" column="report_dept_person_name"/>
+ <result property="reportDeptPersonName" column="report_dept_person_code"/>
<result property="isMydException" column="is_myd_exception"/>
<result property="dimension" column="dimension"/>
+ <result property="circulationDeptPersonCode" column="circulation_dept_person_code"/>
+ <result property="circulationDeptPersonName" column="circulation_dept_person_name"/>
</resultMap>
<sql id="selectSvyTaskTemplateScriptVo">
@@ -76,7 +82,9 @@
scriptno,
templateID,
scriptid,
- script_topic, language, categoryName, script_content, is_must, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid, pid, guid, value_type, targetoptions, script_type, targetid, targetvalue, next_scriptno, script_result, otherdata, picture_path
+ script_topic, language, categoryName, script_content, ismandatory, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid, pid, guid, value_type, targetoptions, script_type, targetid, targetvalue, next_scriptno, script_result, otherdata, picture_path
+ , duty_dept_person_name, duty_dept_person_code, report_dept_person_name, report_dept_person_code
+ , circulation_dept_person_code, circulation_dept_person_name
from svy_task_template_script
</sql>
@@ -110,7 +118,7 @@
'%')
</if>
<if test="scriptContent != null and scriptContent != ''">and script_content = #{scriptContent}</if>
- <if test="isMust != null and isMust != ''">and is_must = #{isMust}</if>
+ <if test="ismandatory != null and ismandatory != ''">and ismandatory = #{ismandatory}</if>
<if test="isupload != null ">and isupload = #{isupload}</if>
<if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
<if test="orgid != null and orgid != ''">and orgid = #{orgid}</if>
@@ -135,6 +143,24 @@
<if test="branchNextscriptno != null and branchNextscriptno != ''">and branch_nextscriptno =
#{branchNextscriptno}
</if>
+ <if test="dutyDeptPersonName != null and dutyDeptPersonName != ''">and duty_dept_person_name like concat('%', #{dutyDeptPersonName},
+ '%')
+ </if>
+ <if test="dutyDeptPersonCode != null and dutyDeptPersonCode != ''">and duty_dept_person_code like concat('%', #{dutyDeptPersonCode},
+ '%')
+ </if>
+ <if test="reportDeptPersonName != null and reportDeptPersonName != ''">and report_dept_person_name like concat('%', #{reportDeptPersonName},
+ '%')
+ </if>
+ <if test="reportDeptPersonCode != null and reportDeptPersonCode != ''">and report_dept_person_code like concat('%', #{reportDeptPersonCode},
+ '%')
+ </if>
+ <if test="circulationDeptPersonCode != null and circulationDeptPersonCode != ''">and circulation_dept_person_code like concat('%', #{circulationDeptPersonCode},
+ '%')
+ </if>
+ <if test="circulationDeptPersonName != null and circulationDeptPersonName != ''">and circulation_dept_person_name like concat('%', #{circulationDeptPersonName},
+ '%')
+ </if>
</select>
<select id="selectSvyTaskTemplateScriptByID" parameterType="Long" resultMap="SvyTaskTemplateScriptResult">
@@ -154,7 +180,7 @@
<if test="language != null">language,</if>
<if test="categoryName != null">categoryName,</if>
<if test="scriptContent != null">script_content,</if>
- <if test="isMust != null">is_must,</if>
+ <if test="ismandatory != null">ismandatory,</if>
<if test="delFlag != null">del_flag,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
@@ -191,6 +217,12 @@
<if test="reportDeptCode != null and reportDeptCode != ''"> report_dept_code,</if>
<if test="isMydException != null ">is_myd_exception,</if>
<if test="dimension != null ">dimension,</if>
+ <if test="dutyDeptPersonName != null and dutyDeptPersonName != ''">duty_dept_person_name,</if>
+ <if test="dutyDeptPersonCode != null and dutyDeptPersonCode != ''">duty_dept_person_code,</if>
+ <if test="reportDeptPersonName != null and reportDeptPersonName != ''">report_dept_person_name,</if>
+ <if test="reportDeptPersonCode != null and reportDeptPersonCode != ''">report_dept_person_code,</if>
+ <if test="circulationDeptPersonCode != null and circulationDeptPersonCode != ''">circulation_dept_person_code,</if>
+ <if test="circulationDeptPersonName != null and circulationDeptPersonName != ''">circulation_dept_person_name,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="taskid != null">#{taskid},</if>
@@ -201,7 +233,7 @@
<if test="language != null">#{language},</if>
<if test="categoryName != null">#{categoryName},</if>
<if test="scriptContent != null">#{scriptContent},</if>
- <if test="isMust != null">#{isMust},</if>
+ <if test="ismandatory != null">#{ismandatory},</if>
<if test="delFlag != null">#{delFlag},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
@@ -238,6 +270,12 @@
<if test="reportDeptCode != null and reportDeptCode != ''">#{reportDeptCode},</if>
<if test="isMydException != null ">#{isMydException},</if>
<if test="dimension != null ">#{dimension},</if>
+ <if test="dutyDeptPersonName != null and dutyDeptPersonName != ''">#{dutyDeptPersonName},</if>
+ <if test="dutyDeptPersonCode != null and dutyDeptPersonCode != ''">#{dutyDeptPersonCode},</if>
+ <if test="reportDeptPersonName != null and reportDeptPersonName != ''">#{reportDeptPersonName},</if>
+ <if test="reportDeptPersonCode != null and reportDeptPersonCode != ''">#{reportDeptPersonCode},</if>
+ <if test="circulationDeptPersonCode != null and circulationDeptPersonCode != ''">#{circulationDeptPersonCode},</if>
+ <if test="circulationDeptPersonName != null and circulationDeptPersonName != ''">#{circulationDeptPersonName},</if>
</trim>
</insert>
@@ -252,7 +290,7 @@
<if test="language != null">language = #{language},</if>
<if test="categoryName != null">categoryName = #{categoryName},</if>
<if test="scriptContent != null">script_content = #{scriptContent},</if>
- <if test="isMust != null">is_must = #{isMust},</if>
+ <if test="ismandatory != null">ismandatory = #{ismandatory},</if>
<if test="delFlag != null">del_flag = #{delFlag},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
@@ -291,6 +329,12 @@
<if test="reportDeptCode != null and reportDeptCode != ''">report_dept_code = #{reportDeptCode},</if>
<if test="isMydException != null ">is_myd_exception = #{isMydException},</if>
<if test="dimension != null ">dimension = #{dimension},</if>
+ <if test="dutyDeptPersonName != null and dutyDeptPersonName != ''">duty_dept_person_name = #{dutyDeptPersonName},</if>
+ <if test="dutyDeptPersonCode != null and dutyDeptPersonCode != ''">duty_dept_person_code = #{dutyDeptPersonCode},</if>
+ <if test="reportDeptPersonName != null and reportDeptPersonName != ''">report_dept_person_name = #{reportDeptPersonName},</if>
+ <if test="reportDeptPersonCode != null and reportDeptPersonCode != ''">report_dept_person_code = #{reportDeptPersonCode},</if>
+ <if test="circulationDeptPersonName != null and circulationDeptPersonName != ''">circulation_dept_person_name = #{circulationDeptPersonName},</if>
+ <if test="circulationDeptPersonCode != null and circulationDeptPersonCode != ''">circulation_dept_person_code = #{circulationDeptPersonCode},</if>
</trim>
where id = #{d}
</update>
--
Gitblit v1.9.3