From a7de5f44bf83ffa0a5d11b04d16fb4f501ad5ff4 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期二, 20 十月 2026 17:49:48 +0800
Subject: [PATCH] 【丽水】患者档案查询增加时间限制

---
 smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml |   23 ++++++++++++++++++++++-
 1 files changed, 22 insertions(+), 1 deletions(-)

diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index 1fbe2f7..1948988 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -73,6 +73,7 @@
         <result property="leavehospitaldistrictname" column="leavehospitaldistrictname"/>
         <result property="excep" column="excep"/>
         <result property="remark" column="remark"/>
+        <result property="doctorOpinion" column="doctor_opinion"/>
         <result property="suggest" column="suggest"/>
         <result property="sendstate" column="sendstate"/>
         <result property="inhospid" column="inhospid"/>
@@ -183,6 +184,7 @@
                long_send_time,
                openid,
                remark,
+               doctor_opinion,
                service_type,
                libtemplateid,
                libtemplatename,
@@ -594,6 +596,7 @@
             AND visit_count > 1
         </if>
         <if test="remark != null">and remark = #{remark}</if>
+        <if test="doctorOpinion != null and doctorOpinion != ''">and doctor_opinion like concat('%', #{doctorOpinion}, '%')</if>
         <if test="suggest != null">and suggest = #{suggest}</if>
         <if test="createBy != null">and create_by = #{createBy}</if>
         <if test="taskGuid != null">and task_guid = #{taskGuid}</if>
@@ -1053,6 +1056,7 @@
             <if test="nurseName != null ">nurse_name,</if>
             <if test="nurseId != null ">nurse_id,</if>
             <if test="remark != null ">remark,</if>
+            <if test="doctorOpinion != null ">doctor_opinion,</if>
             <if test="suggest != null ">suggest,</if>
             <if test="sendstate != null ">sendstate,</if>
             <if test="inhospid != null ">inhospid,</if>
@@ -1152,6 +1156,7 @@
             <if test="nurseName != null ">#{nurseName},</if>
             <if test="nurseId != null ">#{nurseId},</if>
             <if test="remark != null ">#{remark},</if>
+            <if test="doctorOpinion != null ">#{doctorOpinion},</if>
             <if test="suggest != null ">#{suggest},</if>
             <if test="sendstate != null ">#{sendstate},</if>
             <if test="inhospid != null ">#{inhospid},</if>
@@ -1182,6 +1187,15 @@
             <if test="isManuallyCalled != null ">#{isManuallyCalled},</if>
         </trim>
     </insert>
+
+    <!-- 浜屾闅忚骞傜瓑锛氫粎褰� is_visit_again 涓嶆槸鐩爣鍊兼椂鏇存柊锛岃繑鍥炲彈褰卞搷琛屾暟 -->
+    <update id="updateIsVisitAgainById">
+        update service_subtask
+        set is_visit_again = #{isVisitAgain},
+            update_time = now()
+        where id = #{id}
+          and (is_visit_again is null or is_visit_again &lt;&gt; #{isVisitAgain})
+    </update>
 
     <update id="updateServiceSubtask" parameterType="com.smartor.domain.ServiceSubtask">
         update service_subtask
@@ -1257,6 +1271,7 @@
             <if test="nurseName != null ">nurse_name=#{nurseName},</if>
             <if test="nurseId != null ">nurse_id=#{nurseId},</if>
             <if test="remark != null ">remark=#{remark},</if>
+            <if test="doctorOpinion != null ">doctor_opinion=#{doctorOpinion},</if>
             <if test="suggest != null ">suggest=#{suggest},</if>
             <if test="inhospid != null ">inhospid=#{inhospid},</if>
             <if test="patfrom != null ">patfrom=#{patfrom},</if>
@@ -1363,6 +1378,7 @@
             <if test="nurseName != null ">nurse_name=#{nurseName},</if>
             <if test="nurseId != null ">nurse_id=#{nurseId},</if>
             <if test="remark != null ">remark=#{remark},</if>
+            <if test="doctorOpinion != null ">doctor_opinion=#{doctorOpinion},</if>
             <if test="suggest != null ">suggest=#{suggest},</if>
             <if test="inhospid != null ">inhospid=#{inhospid},</if>
             <if test="patfrom != null ">patfrom=#{patfrom},</if>
@@ -1468,6 +1484,7 @@
             <if test="nurseName != null ">nurse_name=#{nurseName},</if>
             <if test="nurseId != null ">nurse_id=#{nurseId},</if>
             <if test="remark != null ">remark=#{remark},</if>
+            <if test="doctorOpinion != null ">doctor_opinion=#{doctorOpinion},</if>
             <if test="suggest != null ">suggest=#{suggest},</if>
             <if test="inhospid != null ">inhospid=#{inhospid},</if>
             <if test="patfrom != null ">patfrom=#{patfrom},</if>
@@ -1580,6 +1597,7 @@
             <if test="nurseName != null ">nurse_name=#{nurseName},</if>
             <if test="nurseId != null ">nurse_id=#{nurseId},</if>
             <if test="remark != null ">remark=#{remark},</if>
+            <if test="doctorOpinion != null ">doctor_opinion=#{doctorOpinion},</if>
             <if test="suggest != null ">suggest=#{suggest},</if>
             <if test="inhospid != null ">inhospid=#{inhospid},</if>
             <if test="patfrom != null ">patfrom=#{patfrom},</if>
@@ -1951,6 +1969,7 @@
         continue_time_next,
         task_situation,
         remark,
+        doctor_opinion,
         is_manually_called
         from service_subtask
         where 1=1
@@ -2455,6 +2474,7 @@
                nurse_id,
                nurse_name,
                remark,
+               doctor_opinion,
                inhospid,
                patfrom,
                task_guid,
@@ -3348,7 +3368,8 @@
         continue_count,
         continue_time_next,
         task_situation,
-        remark
+        remark,
+        doctor_opinion
         from service_subtask
         where 1=1
         and del_flag = 0

--
Gitblit v1.9.3