From 48cd106bef20f5a39ff6318f2e3d930437741f5b Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 01 九月 2025 14:47:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
smartor/src/main/resources/mapper/smartor/SvyLibScriptOptionMapper.xml | 10 +++++-----
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml | 4 +++-
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index e1d9330..16ef881 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -175,7 +175,9 @@
leavediagname,
leaveicd10code,
orgid,
- visit_type
+ visit_type,
+ management_doctor,
+ management_doctor_code
from service_subtask
</sql>
diff --git a/smartor/src/main/resources/mapper/smartor/SvyLibScriptOptionMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyLibScriptOptionMapper.xml
index e228f54..d76942c 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyLibScriptOptionMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyLibScriptOptionMapper.xml
@@ -78,7 +78,7 @@
update_time,
isupload,
upload_time
- from svy_lib_ScriptOption
+ from svy_lib_scriptoption
</sql>
<select id="selectSvyLibScriptOptionList" parameterType="com.smartor.domain.SvyLibScriptOption"
@@ -124,7 +124,7 @@
<insert id="insertSvyLibScriptOption" parameterType="com.smartor.domain.SvyLibScriptOption" useGeneratedKeys="true"
keyProperty="id">
- insert into svy_lib_ScriptOption
+ insert into svy_lib_scriptoption
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="topicid != null">topicid,</if>
<if test="svyid != null">svyid,</if>
@@ -200,7 +200,7 @@
</insert>
<update id="updateSvyLibScriptOption" parameterType="com.smartor.domain.SvyLibScriptOption">
- update svy_lib_ScriptOption
+ update svy_lib_scriptoption
<trim prefix="SET" suffixOverrides=",">
<if test="topicid != null">topicid = #{topicid},</if>
<if test="svyid != null">svyid = #{svyid},</if>
@@ -240,7 +240,7 @@
</update>
<update id="deleteSvyLibScriptOptionByOptionid" parameterType="Long">
- update svy_lib_ScriptOption
+ update svy_lib_scriptoption
<trim prefix="SET" suffixOverrides=",">
del_flag = 1
</trim>
@@ -248,7 +248,7 @@
</update>
<delete id="deleteSvyLibScriptOptionByOptionids" parameterType="String">
- delete from svy_lib_ScriptOption where id in
+ delete from svy_lib_scriptoption where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
--
Gitblit v1.9.3