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/IPatMedInhospService.java | 47 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 47 insertions(+), 0 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/service/IPatMedInhospService.java b/smartor/src/main/java/com/smartor/service/IPatMedInhospService.java
index 3d5c568..17b2c6f 100644
--- a/smartor/src/main/java/com/smartor/service/IPatMedInhospService.java
+++ b/smartor/src/main/java/com/smartor/service/IPatMedInhospService.java
@@ -3,6 +3,8 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.smartor.domain.*;
+import com.smartor.domain.DTO.ManualVisitDTO;
+import com.smartor.domain.DTO.PatMedInhospDTO;
import org.springframework.web.bind.annotation.RequestBody;
import java.util.List;
@@ -32,6 +34,8 @@
* @return 鎮ｈ�呬綇闄㈣褰曢泦鍚�
*/
public List<PatMedInhosp> selectPatMedInhospList(PatMedInhosp patMedInhosp);
+
+ public List<PatMedInhospDTO> selectPatMedInhospByApplication(PatMedInhosp patMedInhosp);
/**
* 鍑洪櫌銆侀棬璇婁汉鏁板拰闅忚閲忕粺璁★紙鍛紝鏈堬紝骞达級
@@ -93,6 +97,14 @@
public int dealOutHospInfo(String config);
/**
+ * 澶勭悊浠巋is鍙栨潵鐨勫嚭闄㈡暟鎹� 浠诲姟缁勭敓鎴�
+ *
+ * @param
+ * @return 缁撴灉
+ */
+ public int dealOutHospInfoBySchedule(String config);
+
+ /**
* 鑾峰彇鍑洪櫌锛屼綇闄紝闂ㄨ瘖鏈嶅姟浜烘
*
* @param patMedReq
@@ -107,4 +119,39 @@
* @return
*/
public List<PatMedInhosp> getDocAndPat(PatMedInhosp patMedInhosp);
+
+ /**
+ * 澶勭悊浠巋is鍙栨潵鐨勬墜鏈俊鎭�
+ *
+ * @param
+ * @return 缁撴灉
+ */
+ public void addOperationSubTask(String config);
+
+ /**
+ * 涓存椂鏂规硶锛屽鐞哾iagcheckFlag = 0鐨勬暟鎹紝閲嶆柊鐢熸垚闅忚浠诲姟
+ *
+ * @param
+ * @return 缁撴灉
+ */
+ public void dealIcd10Subtask(PatMedInhosp patMedInhospVo, String config);
+
+ /**
+ * 浜哄伐闅忚锛氬垹闄ゆ偅鑰呭嚭闄㈣褰曞搴旂殑鏈畬鎴愰殢璁夸换鍔★紝骞舵寜鎸囧畾浠诲姟閲嶆柊鐢熸垚
+ *
+ * @param manualVisitDTO 鎮ｈ�卲atid闆嗗悎鍙婁汉宸ラ殢璁夸换鍔askid
+ * @return 澶勭悊缁撴灉
+ */
+ public Map<String, Object> addManualVisit(ManualVisitDTO manualVisitDTO);
+
+ public ServiceSubtask boxedServiceSubtask(ServiceTask serviceTask, PatMedInhosp patMedInhosp1, PatArchive patArchive, String config, Integer type);
+
+ /**
+ * 鎸変换鍔￠厤缃殑鍙戦�佹柟寮忥紙preachform_desc锛夊垵濮嬪寲瀛愪换鍔″彂閫佹柟寮忔槑缁嗐��
+ *
+ * @param serviceSubtask 瀛愪换鍔�
+ * @param sendstate 鍙戦�佹柟寮忔槑缁嗗垵濮嬬姸鎬侊紝涓虹┖鏃堕粯璁� 1
+ * @return 澶勭悊鏉℃暟
+ */
+ public Integer addServiceSubtaskPreachform(ServiceSubtask serviceSubtask, String sendstate);
}
--
Gitblit v1.9.3