From 10aaa035f5be0312304d20f022bdb714a8f4900a Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 11 十二月 2024 22:16:23 +0800
Subject: [PATCH] 代码提交

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

diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index ba421b1..f2f6aa2 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -39,7 +39,7 @@
         <result property="pid" column="pid"/>
         <result property="guid" column="guid"/>
         <result property="textParam" column="text_param"/>
-        <result property="serviceform" column="serviceform"/>
+        <result property="preachform" column="preachform"/>
         <result property="bedNo" column="bed_no"/>
         <result property="sendType" column="send_type"/>
         <result property="taskName" column="task_name"/>
@@ -132,7 +132,7 @@
                pid,
                guid,
                text_param,
-               serviceform,
+               preachform,
                bed_no,
                send_type,
                task_name,
@@ -213,7 +213,7 @@
             <if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
             <if test="orgid != null  and orgid != ''">and orgid = #{orgid}</if>
             <if test="pid != null ">and pid = #{pid}</if>
-            <if test="serviceform != null ">and serviceform = #{serviceform}</if>
+            <if test="preachform != null ">and preachform = #{preachform}</if>
             <if test="guid != null  and guid != ''">and guid = #{guid}</if>
             <if test="textParam != null  and textParam != ''">and text_param = #{textParam}</if>
             <if test="bedNo != null">and bed_no = #{bedNo}</if>
@@ -285,7 +285,7 @@
             <if test="pid != null">pid,</if>
             <if test="guid != null">guid,</if>
             <if test="textParam != null">text_param,</if>
-            <if test="serviceform != null">serviceform,</if>
+            <if test="preachform != null">preachform,</if>
             <if test="bedNo != null">bed_no,</if>
             <if test="sendType != null  and sendType != ''">send_type,</if>
             <if test="taskName != null  and taskName != ''">task_name,</if>
@@ -355,7 +355,7 @@
             <if test="pid != null">#{pid},</if>
             <if test="guid != null">#{guid},</if>
             <if test="textParam != null">#{textParam},</if>
-            <if test="serviceform != null">#{serviceform},</if>
+            <if test="preachform != null">#{preachform},</if>
             <if test="bedNo != null">#{bedNo},</if>
             <if test="sendType != null  and sendType != ''">#{sendType},</if>
             <if test="taskName != null  and taskName != ''">#{taskName},</if>
@@ -429,7 +429,7 @@
             <if test="pid != null">pid = #{pid},</if>
             <if test="guid != null">guid = #{guid},</if>
             <if test="textParam != null">text_param = #{textParam},</if>
-            <if test="serviceform != null">serviceform = #{serviceform},</if>
+            <if test="preachform != null">preachform = #{preachform},</if>
             <if test="bedNo != null">bed_no = #{bedNo},</if>
             <if test="sendType != null  and sendType != ''">send_type = #{sendType},</if>
             <if test="taskName != null  and taskName != ''">task_name = #{taskName},</if>
@@ -504,7 +504,7 @@
             <if test="pid != null">pid = #{pid},</if>
             <if test="guid != null">guid = #{guid},</if>
             <if test="textParam != null">text_param = #{textParam},</if>
-            <if test="serviceform != null">serviceform = #{serviceform},</if>
+            <if test="preachform != null">preachform = #{preachform},</if>
             <if test="bedNo != null">bed_no = #{bedNo},</if>
             <if test="sendType != null  and sendType != ''">send_type = #{sendType},</if>
             <if test="taskName != null  and taskName != ''">task_name = #{taskName},</if>
@@ -580,7 +580,7 @@
             <if test="pid != null">pid = #{pid},</if>
             <if test="guid != null">guid = #{guid},</if>
             <if test="textParam != null">text_param = #{textParam},</if>
-            <if test="serviceform != null">serviceform = #{serviceform},</if>
+            <if test="preachform != null">preachform = #{preachform},</if>
             <if test="bedNo != null">bed_no = #{bedNo},</if>
             <if test="sendType != null  and sendType != ''">send_type = #{sendType},</if>
             <if test="taskName != null  and taskName != ''">task_name = #{taskName},</if>
@@ -637,6 +637,32 @@
         where patid = #{patid} and taskid = #{taskid}
     </update>
 
+    <select id="getSfStatistics" parameterType="com.smartor.domain.ServiceSubtaskCountReq"
+            resultMap="ServiceSubtaskResult">
+        <include refid="selectServiceSubtaskVo"/>
+        <where>
+            del_flag=0
+            <if test="leavehospitaldistrictcodes != null and leavehospitaldistrictcodes.size() > 0">
+                AND leavehospitaldistrictcode IN
+                <foreach collection="leavehospitaldistrictcodes" item="leavehospitaldistrictcode" open="(" separator=","
+                         close=")">
+                    #{leavehospitaldistrictcode}
+                </foreach>
+            </if>
+            <if test="serviceType != null and serviceType.size() > 0">
+                AND service_type IN
+                <foreach collection="serviceType" item="serviceType" open="(" separator=","
+                         close=")">
+                    #{serviceType}
+                </foreach>
+            </if>
+            <if test="startTime != null and endTime!=null">
+                AND endtime > #{startTime}
+                AND endtime &lt;= #{endTime}
+            </if>
+        </where>
+    </select>
+
     <select id="getDataByTime" resultMap="ServiceSubtaskResult">
 
         select id,
@@ -674,7 +700,7 @@
                pid,
                guid,
                text_param,
-               serviceform,
+               preachform,
                bed_no,
                send_type,
                task_name,

--
Gitblit v1.9.3