From ec6b75cfebe87ad118aba001708e686bf28e2fde Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 03 八月 2026 20:57:04 +0800
Subject: [PATCH] 1.新增同德药品采集、宣教功能 2.处理新华采集BUG 3.新增service_subtask的院区ID 4.采集同德的入院申请单信息 5.给出院表新增药品字段、入院申请单字段

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

diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index f2a3b85..073c0ef 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -98,6 +98,7 @@
         <result property="scheduleDetailId" column="schedule_detail_id"/>
         <result property="scheduleSeq" column="schedule_seq"/>
         <result property="loopCount" column="loop_count"/>
+        <result property="campusid" column="campusid"/>
     </resultMap>
 
     <resultMap type="com.smartor.domain.ServiceSubtaskCount" id="ServiceSubtaskResult2">
@@ -151,6 +152,7 @@
     <sql id="selectServiceSubtaskVo">
         select id,
                hosp_type,
+               campusid,
                task_guid,
                diagname,
                patfrom,
@@ -969,6 +971,7 @@
             <if test="continueTimeNext != null ">continue_time_next,</if>
             <if test="continueContent != null ">continue_content,</if>
             <if test="operationItemId != null ">operation_item_id,</if>
+            <if test="campusid != null">campusid,</if>
             <if test="scheduleId != null ">schedule_id,</if>
             <if test="scheduleDetailId != null ">schedule_detail_id,</if>
             <if test="scheduleSeq != null ">schedule_seq,</if>
@@ -1065,6 +1068,7 @@
             <if test="continueTimeNext != null ">#{continueTimeNext,jdbcType=TIMESTAMP},</if>
             <if test="continueContent != null ">#{continueContent},</if>
             <if test="operationItemId != null ">#{operationItemId},</if>
+            <if test="campusid != null">#{campusid},</if>
             <if test="scheduleId != null ">#{scheduleId},</if>
             <if test="scheduleDetailId != null ">#{scheduleDetailId},</if>
             <if test="scheduleSeq != null ">#{scheduleSeq},</if>
@@ -1166,6 +1170,7 @@
             <if test="continueTimeNext != null ">continue_time_next = #{continueTimeNext,jdbcType=TIMESTAMP},</if>
             <if test="continueContent != null ">continue_content = #{continueContent},</if>
             <if test="operationItemId != null ">operation_item_id = #{operationItemId},</if>
+            <if test="campusid != null">campusid=#{campusid},</if>
             <if test="scheduleId != null ">schedule_id = #{scheduleId},</if>
             <if test="scheduleDetailId != null ">schedule_detail_id = #{scheduleDetailId},</if>
             <if test="scheduleSeq != null ">schedule_seq = #{scheduleSeq},</if>
@@ -1504,6 +1509,8 @@
         orgid,
         drcode,
         drname,
+        management_doctor_code,
+        management_doctor,
         leavehospitaldistrictcode,
         leavehospitaldistrictname,
         deptcode,
@@ -2906,8 +2913,8 @@
         <if test="sendstate != null">
             AND sendstate = #{sendstate}
         </if>
-        <if test="isFinished != null and isFinished == '1'">
-            AND finishtime is not null
+        <if test="isFinished != null and isFinished != ''">
+            and finishtime is not null
         </if>
         <if test="starttime != null">AND starttime &gt;= #{starttime}</if>
         <if test="endtime != null">AND endtime &lt;= #{endtime}</if>
@@ -2955,7 +2962,7 @@
         order by schedule_seq asc, id asc
     </select>
 
-    <select id="gethelibraryCountHyperlink" parameterType="com.smartor.domain.ServiceSubtaskCountReq"
+    <select id="gethelibraryCountHyperlink" parameterType="com.smartor.domain.VO.HeLibraryCountVO"
             resultMap="ServiceSubtaskResult">
         select id,
         visit_count,
@@ -3005,8 +3012,8 @@
         <if test="sendstate != null">
             AND sendstate = #{sendstate}
         </if>
-        <if test="isFinished != null and isFinished == '1'">
-            AND finishtime is not null
+        <if test="isFinished != null and isFinished != ''">
+            and finishtime is not null
         </if>
         <if test="hospitaldistrictcodes != null and hospitaldistrictcodes.size() > 0">
             AND leavehospitaldistrictcode IN

--
Gitblit v1.9.3