From eb845e8be695ed1280a7cbf854a4d1dedf9db30d Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 30 十月 2026 15:02:55 +0800
Subject: [PATCH] 【丽水】/smartor/serviceSubtask/getSfStatisticsHyperlink 和 /smartor/serviceSubtask/getSfStatistics 统计的时候,对于 service_subtask.current_preachForm 为空的数据 当成 service_subtask.preachform 字符串的第一个执行方式、首次待随访全部(visitCount = 1 && sendstate in (1、2、3、7)) 区别于原先的待随访,这个是给市一使用的                                                                                                                                                                                            再次待随访全部(visitCount > 1 && sendstate in (1、2、3、7)) 区别于原先的待随访,这个是给市一使用的                                                                                                                                                                                            首次待随访待发送(visitCount = 1 && sendstate in (1、2))                                                                                                                                                                                            再次待随访待发送(visitCount > 1 && sendstate in (1、2))                                                                                                                                                                                            首次待随访已发送(visitCount = 1 && sendstate = in (3、7))                                                                                                                                                                                            再次待随访已发送(visitCount > 1 && sendstate = in (3、7))                                                                                                                                                                                            首次已发送(visitCount = 1 && sendstate = 3)                                                                                                                                                                                            再次已发送(visitCount > 1 && sendstate = 3)

---
 smartor/src/main/java/com/smartor/service/IServiceExternalService.java |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/service/IServiceExternalService.java b/smartor/src/main/java/com/smartor/service/IServiceExternalService.java
index fbbd6e2..06fde72 100644
--- a/smartor/src/main/java/com/smartor/service/IServiceExternalService.java
+++ b/smartor/src/main/java/com/smartor/service/IServiceExternalService.java
@@ -1,7 +1,9 @@
 package com.smartor.service;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.smartor.domain.ExternalDept;
+import com.smartor.domain.PatArchive;
 import com.smartor.domain.ServiceSubtaskDetail;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -91,6 +93,11 @@
     public Boolean addPreOutHospInfo(@RequestBody Map dataMap);
 
     /**
+     * 绂绘姠鏁版嵁鍥炲啓鍑洪櫌璁板綍
+     */
+    public Boolean editRescueFinishedOutHospInfo(@RequestBody Map dataMap);
+
+    /**
      * 鏂板瀹屾垚鎺ヨ瘖淇℃伅
      */
     public Boolean addFinshJZInfo(@RequestBody Map dataMap);
@@ -112,6 +119,12 @@
     public Boolean addOperationInfo(@RequestBody Map dataMap);
 
     /**
+     * 鎾ら攢鎵嬫湳淇℃伅
+     */
+    public Boolean cancelOperationInfo(@RequestBody Map dataMap);
+
+
+    /**
      * 鏂板鍖荤枟缁勫尰鐢�
      */
     public Boolean addMedicalTeam(Map dataMap);
@@ -125,4 +138,6 @@
      * 妫�鏌ユ姤鍛婃湇鍔�
      */
     public Boolean addInspectBGService(Map dataMap);
+
+    public Map<String, Object> query360PatInfolwl(Long patid, SysUser sysUser);
 }

--
Gitblit v1.9.3