From 9cc2f53b11205309754c2451be061ef5fc337f32 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 13 五月 2025 13:57:18 +0800
Subject: [PATCH] 代码提交

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

diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index e518734..c8d9fb7 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -76,6 +76,9 @@
         <result property="inhospid" column="inhospid"/>
         <result property="patfrom" column="patfrom"/>
         <result property="patguid" column="patguid"/>
+        <result property="visitCount" column="visit_count"/>
+        <result property="isVisitAgain" column="is_visit_again"/>
+        <result property="upid" column="upid"/>
     </resultMap>
 
     <resultMap type="com.smartor.domain.ServiceSubtaskCount" id="ServiceSubtaskResult2">
@@ -90,7 +93,10 @@
                hosp_type,
                task_guid,
                patfrom,
+               upid,
                inhospid,
+               visit_count,
+               is_visit_again,
                patguid,
                suggest,
                sendstate,
@@ -180,6 +186,7 @@
             <if test="subId != null ">and id = #{subId}</if>
             <if test="inhospid != null ">and inhospid = #{inhospid}</if>
             <if test="submit != null ">and submit = #{submit}</if>
+            <if test="upid != null ">and upid = #{upid}</if>
             <if test="patfrom != null ">and patfrom = #{patfrom}</if>
             <if test="serviceType != null ">and service_type = #{serviceType}</if>
             <if test="patid != null ">and patid = #{patid}</if>
@@ -280,10 +287,12 @@
             <if test="excep != null ">and excep = #{excep}</if>
             <if test="nurseName != null ">and nurse_name = #{nurseName}</if>
             <if test="score != null">and score = #{score}</if>
+            <if test="visitCount != null">and visit_count = #{visitCount}</if>
             <if test="remark != null">and remark = #{remark}</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>
+            <if test="isVisitAgain != null">and is_visit_again = #{isVisitAgain}</if>
         </where>
         <if test="sort != null  and sort==0">order by endtime asc</if>
         <if test="sort != null  and sort==1">order by endtime desc</if>
@@ -307,6 +316,9 @@
             <if test="sendname != null ">and sendname = #{sendname}</if>
             <if test="sfzh != null ">and sfzh = #{sfzh}</if>
             <if test="patguid != null ">and patguid = #{patguid}</if>
+            <if test="upid != null ">and upid = #{upid}</if>
+            <if test="visitCount != null ">and visit_count = #{visitCount}</if>
+            <if test="isVisitAgain != null ">and is_visit_again = #{isVisitAgain}</if>
         </where>
 
     </select>
@@ -401,6 +413,9 @@
             <if test="patfrom != null ">patfrom,</if>
             <if test="taskGuid != null ">task_guid,</if>
             <if test="patguid != null ">patguid,</if>
+            <if test="visitCount != null ">visit_count,</if>
+            <if test="isVisitAgain != null ">is_visit_again,</if>
+            <if test="upid != null ">upid,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="sendname != null">#{sendname},</if>
@@ -476,6 +491,9 @@
             <if test="patfrom != null ">#{patfrom},</if>
             <if test="taskGuid != null ">#{taskGuid},</if>
             <if test="patguid != null ">#{patguid},</if>
+            <if test="visitCount != null ">#{visitCount},</if>
+            <if test="isVisitAgain != null ">#{isVisitAgain},</if>
+            <if test="upid != null ">#{upid},</if>
         </trim>
     </insert>
 
@@ -556,6 +574,9 @@
             <if test="patfrom != null ">patfrom=#{patfrom},</if>
             <if test="taskGuid != null ">task_guid=#{taskGuid},</if>
             <if test="patguid != null ">patguid=#{patguid},</if>
+            <if test="visitCount != null ">visit_count=#{visitCount},</if>
+            <if test="isVisitAgain != null ">is_visit_again=#{isVisitAgain},</if>
+            <if test="upid != null ">upid=#{upid},</if>
         </trim>
         where id = #{id}
     </update>
@@ -617,6 +638,7 @@
             <if test="sendstate != null ">sendstate = #{sendstate},</if>
             <if test="serviceType != null ">service_type = #{serviceType},</if>
             <if test="score != null ">score = #{score},</if>
+            <if test="visitCount != null ">visit_count = #{visitCount},</if>
             <if test="submit != null ">submit = #{submit},</if>
             <if test="leavehospitaldistrictcode != null  and leavehospitaldistrictcode != ''">leavehospitaldistrictcode
                 = #{leavehospitaldistrictcode},
@@ -637,6 +659,8 @@
             <if test="patfrom != null ">patfrom=#{patfrom},</if>
             <if test="taskGuid != null ">taskGuid=#{taskGuid},</if>
             <if test="patguid != null ">patguid=#{patguid},</if>
+            <if test="isVisitAgain != null ">is_visit_again=#{isVisitAgain},</if>
+            <if test="upid != null ">upid=#{upid},</if>
         </trim>
         <where>
             <if test="patid != null ">and patid = #{patid}</if>
@@ -677,6 +701,8 @@
             <if test="orgid != null">orgid = #{orgid},</if>
             <if test="pid != null">pid = #{pid},</if>
             <if test="guid != null">guid = #{guid},</if>
+            <if test="visitCount != null">visit_count = #{visitCount},</if>
+            <if test="isVisitAgain != null">is_visit_again = #{isVisitAgain},</if>
             <if test="textParam != null">text_param = #{textParam},</if>
             <if test="preachform != null">preachform = #{preachform},</if>
             <if test="bedNo != null">bed_no = #{bedNo},</if>
@@ -720,6 +746,7 @@
             <if test="patfrom != null ">patfrom=#{patfrom},</if>
             <if test="taskGuid != null ">task_guid=#{taskGuid},</if>
             <if test="patguid != null ">patguid=#{patguid},</if>
+            <if test="upid != null ">upid=#{upid},</if>
         </trim>
         where patid = #{patid} and taskid = #{taskid}
     </update>
@@ -770,6 +797,8 @@
             <if test="wechat != null  and wechat != ''">wechat = #{wechat},</if>
             <if test="roomno != null  and roomno != ''">roomno = #{roomno},</if>
             <if test="admindate != null ">admindate = #{admindate},</if>
+            <if test="visitCount != null ">visit_count = #{visitCount},</if>
+            <if test="isVisitAgain != null ">is_visit_again = #{isVisitAgain},</if>
             <if test="deptname != null  and deptname != ''">deptname = #{deptname},</if>
             <if test="leaveicd10code != null  and leaveicd10code != ''">leaveicd10code = #{leaveicd10code},</if>
             <if test="leavediagname != null  and leavediagname != ''">leavediagname = #{leavediagname},</if>
@@ -800,6 +829,7 @@
             <if test="patfrom != null ">patfrom=#{patfrom},</if>
             <if test="taskGuid != null ">task_guid=#{taskGuid},</if>
             <if test="patguid != null ">patguid=#{patguid},</if>
+            <if test="upid != null ">upid=#{upid},</if>
         </trim>
         where task_guid = #{taskGuid} and task_name = #{taskName}
     </update>
@@ -874,6 +904,7 @@
                deptcode,
                labelstatus,
                del_flag,
+               upid,
                update_by,
                update_time,
                create_by,
@@ -882,6 +913,8 @@
                upload_time,
                orgid,
                pid,
+               visit_count,
+               is_visit_again,
                guid,
                text_param,
                preachform,
@@ -951,4 +984,13 @@
             month, st.service_type, st.id;
     </select>
 
+    <select id="getDeptRanking" parameterType="com.smartor.domain.PatMedReq" resultType="com.smartor.domain.PatMedRes">
+        SELECT deptname,
+               count(1) AS rc
+        FROM service_subtask
+        WHERE DATE_FORMAT(finishtime, '%Y-%m-%d') >= #{startDate}
+          AND DATE_FORMAT(finishtime, '%Y-%m-%d') &lt;= #{endDate}
+        GROUP BY deptname
+    </select>
+
 </mapper>

--
Gitblit v1.9.3