From 1967693c5d760ade002f8a5fbea10b51aef5693f Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 10 四月 2025 13:39:32 +0800
Subject: [PATCH] 代码提交

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

diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index 63960a3..31ad4c5 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -75,6 +75,7 @@
         <result property="sendstate" column="sendstate"/>
         <result property="inhospid" column="inhospid"/>
         <result property="patfrom" column="patfrom"/>
+        <result property="patguid" column="patguid"/>
     </resultMap>
 
     <resultMap type="com.smartor.domain.ServiceSubtaskCount" id="ServiceSubtaskResult2">
@@ -90,6 +91,7 @@
                task_guid,
                patfrom,
                inhospid,
+               patguid,
                suggest,
                sendstate,
                endtime,
@@ -174,6 +176,7 @@
             </if>
             <if test="sex != null  and sex != ''">and sex = #{sex}</if>
             <if test="age != null ">and age = #{age}</if>
+            <if test="patguid != null ">and patguid = #{patguid}</if>
             <if test="subId != null ">and id = #{subId}</if>
             <if test="inhospid != null ">and inhospid = #{inhospid}</if>
             <if test="submit != null ">and submit = #{submit}</if>
@@ -303,8 +306,17 @@
             <if test="createBy != null ">and create_by = #{createBy}</if>
             <if test="sendname != null ">and sendname = #{sendname}</if>
             <if test="sfzh != null ">and sfzh = #{sfzh}</if>
+            <if test="patguid != null ">and patguid = #{patguid}</if>
         </where>
 
+    </select>
+
+    <select id="selectSendstateByCondition" parameterType="com.smartor.domain.ServiceSubtask" resultType="Integer">
+        SELECT b.sendstate
+        from service_task a
+                 JOIN service_subtask b on a.taskid = b.taskid and a.pat_cycle = 0 and b.del_flag = 0
+        where b.taskid = #{taskid}
+          and b.patid = #{patid}
     </select>
 
     <select id="selectServiceSubtaskById" parameterType="Long" resultMap="ServiceSubtaskResult">
@@ -388,6 +400,7 @@
             <if test="inhospid != null ">inhospid,</if>
             <if test="patfrom != null ">patfrom,</if>
             <if test="taskGuid != null ">task_guid,</if>
+            <if test="patguid != null ">patguid,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="sendname != null">#{sendname},</if>
@@ -462,6 +475,7 @@
             <if test="inhospid != null ">#{inhospid},</if>
             <if test="patfrom != null ">#{patfrom},</if>
             <if test="taskGuid != null ">#{taskGuid},</if>
+            <if test="patguid != null ">#{patguid},</if>
         </trim>
     </insert>
 
@@ -471,6 +485,7 @@
             <if test="sendname != null">sendname = #{sendname},</if>
             <if test="phone != null">phone = #{phone},</if>
             <if test="sex != null">sex = #{sex},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
             <if test="age != null">age = #{age},</if>
             <if test="sfzh != null">sfzh = #{sfzh},</if>
             <if test="addr != null">addr = #{addr},</if>
@@ -540,6 +555,7 @@
             <if test="inhospid != null ">inhospid=#{inhospid},</if>
             <if test="patfrom != null ">patfrom=#{patfrom},</if>
             <if test="taskGuid != null ">task_guid=#{taskGuid},</if>
+            <if test="patguid != null ">patguid=#{patguid},</if>
         </trim>
         where id = #{id}
     </update>
@@ -550,6 +566,7 @@
             <if test="sendname != null">sendname = #{sendname},</if>
             <if test="phone != null">phone = #{phone},</if>
             <if test="sex != null">sex = #{sex},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
             <if test="age != null">age = #{age},</if>
             <if test="sfzh != null">sfzh = #{sfzh},</if>
             <if test="addr != null">addr = #{addr},</if>
@@ -619,6 +636,7 @@
             <if test="inhospid != null ">inhospid=#{inhospid},</if>
             <if test="patfrom != null ">patfrom=#{patfrom},</if>
             <if test="taskGuid != null ">taskGuid=#{taskGuid},</if>
+            <if test="patguid != null ">patguid=#{patguid},</if>
         </trim>
         <where>
             <if test="patid != null ">and patid = #{patid}</if>
@@ -701,6 +719,7 @@
             <if test="inhospid != null ">inhospid=#{inhospid},</if>
             <if test="patfrom != null ">patfrom=#{patfrom},</if>
             <if test="taskGuid != null ">task_guid=#{taskGuid},</if>
+            <if test="patguid != null ">patguid=#{patguid},</if>
         </trim>
         where patid = #{patid} and taskid = #{taskid}
     </update>
@@ -780,6 +799,7 @@
             <if test="inhospid != null ">inhospid=#{inhospid},</if>
             <if test="patfrom != null ">patfrom=#{patfrom},</if>
             <if test="taskGuid != null ">task_guid=#{taskGuid},</if>
+            <if test="patguid != null ">patguid=#{patguid},</if>
         </trim>
         where task_guid = #{taskGuid} and task_name = #{taskName}
     </update>
@@ -894,6 +914,7 @@
                patfrom,
                task_guid,
                leavediagname,
+               patguid,
                leaveicd10code
         FROM service_subtask,
              JSON_TABLE(send_time_slot, '$[*]' COLUMNS (

--
Gitblit v1.9.3