From 25a0ba7b2706db3c5ee546da3e0e7c909777b890 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 29 七月 2026 15:37:32 +0800
Subject: [PATCH] 1，患者过滤状态修改（之前只支持发送之前的过滤，现在支持发送之后的过滤，如果任务发送后，外链不能再打开） 2.在出入院表新增入院申请单字段 3.采集入院数据时，同时要采集importanceFlagCode    emergencyLevelCode 4.外链的发送，也要查询子任务状态，如果是不执行，也不能再发送

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

diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index a2c1e63..407dc13 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -478,6 +478,7 @@
         <if test="isupload != null ">and isupload = #{isupload}</if>
         <if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
         <if test="orgid != null  and orgid != ''">and orgid = #{orgid}</if>
+        <if test="campusid != null  and campusid != ''">and campusid = #{campusid}</if>
         <if test="pid != null ">and pid = #{pid}</if>
         <if test="preachform != null ">and preachform = #{preachform}</if>
         <if test="currentPreachform != null ">and current_preachform = #{currentPreachform}</if>
@@ -1483,6 +1484,8 @@
         orgid,
         drcode,
         drname,
+        management_doctor_code,
+        management_doctor,
         leavehospitaldistrictcode,
         leavehospitaldistrictname,
         deptcode,
@@ -2505,7 +2508,8 @@
         SUM(CASE WHEN sendstate = 1 THEN 1 ELSE 0 END) AS blq,
         SUM(CASE WHEN sendstate = 4 THEN 1 ELSE 0 END) AS wxsf,
         SUM(CASE WHEN sendstate != 4 THEN 1 ELSE 0 END) AS xsf,
-        SUM(CASE WHEN (sendstate = 1 OR sendstate = 2 OR sendstate = 3 OR sendstate = 5 OR sendstate = 7 ) THEN 1 ELSE 0 END) AS dsf,
+        SUM(CASE WHEN (sendstate = 1 OR sendstate = 2 OR sendstate = 3 OR sendstate = 5 OR sendstate = 7 ) THEN 1 ELSE 0
+        END) AS dsf,
         SUM(CASE WHEN sendstate = 6 THEN 1 ELSE 0 END) AS ywc,
         SUM(CASE WHEN excep IS NOT NULL AND excep = '1' THEN 1 ELSE 0 END) AS yc,
         SUM(CASE WHEN excep IS NOT NULL AND excep = '2' THEN 1 ELSE 0 END) AS jg,
@@ -2668,6 +2672,9 @@
         </if>
         <if test="orgid != null and orgid != ''">
             AND orgid = #{orgid}
+        </if>
+        <if test="campusid != null and campusid != ''">
+            AND campusid = #{campusid}
         </if>
         <if test="guid != null and guid != ''">
             AND guid = #{guid}
@@ -2881,8 +2888,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>
@@ -2911,7 +2918,7 @@
         </choose>
     </select>
 
-    <select id="gethelibraryCountHyperlink" parameterType="com.smartor.domain.ServiceSubtaskCountReq"
+    <select id="gethelibraryCountHyperlink" parameterType="com.smartor.domain.VO.HeLibraryCountVO"
             resultMap="ServiceSubtaskResult">
         select id,
         visit_count,
@@ -2961,8 +2968,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