From 87b79ea739ec32bd7d0e493a6ea8525212f6c763 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期六, 10 十月 2026 15:11:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into smartor_ls_261008
---
smartor/src/main/java/com/smartor/service/IPatMedOuthospService.java | 37 +++++++++++++++++++++++++++++++++++--
1 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/service/IPatMedOuthospService.java b/smartor/src/main/java/com/smartor/service/IPatMedOuthospService.java
index 1a2ab3b..889501e 100644
--- a/smartor/src/main/java/com/smartor/service/IPatMedOuthospService.java
+++ b/smartor/src/main/java/com/smartor/service/IPatMedOuthospService.java
@@ -1,7 +1,9 @@
package com.smartor.service;
+import java.util.Collection;
import java.util.Date;
import java.util.List;
+import java.util.Set;
import com.ruoyi.common.core.page.TableDataInfo;
import com.smartor.domain.*;
@@ -39,6 +41,18 @@
public int insertPatMedOuthosp(PatMedOuthosp patMedOuthosp);
/**
+ * 鎵归噺鏌ヨ宸插叆搴撶殑 serialnum锛堝唴閮ㄦ寜灏辫瘖鏃ユ湡瀹氫綅鍒嗚〃锛屼竴娆� SQL 瀹屾垚锛�
+ * <p>
+ * 闂ㄦ�ヨ瘖鎸夊ぉ鍏ㄩ噺閲囬泦鏃讹紝姣忓崐灏忔椂浼氭妸褰撳ぉ涓婁竾涓瘖鐤楄褰曢噸鏂版媺涓�閬嶏紝
+ * 鐢ㄨ繖涓柟娉曚竴娆℃煡鍑哄凡缁忓叆搴撶殑锛岀洿鎺ヨ烦杩囷紝閬垮厤瀵归噸澶嶆暟鎹啀鍋氫竴閬嶆。妗堝鐞嗗拰鍏ュ簱
+ *
+ * @param admitDateStr 灏辫瘖鏃ユ湡 yyyy-MM-dd锛屼负绌烘垨瑙ｆ瀽澶辫触鏃舵寜涓昏〃鏌ヨ
+ * @param serialnums 寰呮煡璇㈢殑璇婄枟璁板綍鍙烽泦鍚�
+ * @return 宸插瓨鍦ㄧ殑 serialnum 闆嗗悎
+ */
+ public Set<String> selectExistingSerialnums(String admitDateStr, Collection<String> serialnums);
+
+ /**
* 淇敼鎮ｈ�呴棬璇婅褰�
*
* @param patMedOuthosp 鎮ｈ�呴棬璇婅褰�
@@ -71,6 +85,25 @@
public ServiceSubtask boxedServiceSubtask(ServiceTask serviceTask, PatMedOuthosp patMedOuthosp, PatArchive patArchive);
- //闂ㄨ瘖璁板綍鍐嶆闅忚
- public Integer followUpAgainByPatMedOuthosp(PatMedOuthosp patMedOuthosp, Date adminDate, Integer visitTimeNum);
+ /**
+ * 闂ㄨ瘖璁板綍棣栨闅忚
+ * @param patMedOuthosp
+ * @return
+ */
+ public Integer followUpByPatMedOuthosp(PatMedOuthosp patMedOuthosp, Integer visitTimeNum);
+
+ /**
+ * 闂ㄨ瘖璁板綍鍐嶆闅忚
+ * @param patMedOuthosp
+ * @return
+ */
+ public Integer followUpAgainByPatMedOuthosp(PatMedOuthosp patMedOuthosp, Integer visitTimeNum, List<Long> inhospids);
+
+ /**
+ * 闂ㄨ瘖璁板綍澶勭悊
+ * @param patMedOuthosp
+ * @return
+ */
+ public Integer dealPatMedOuthosp(PatMedOuthosp patMedOuthosp, Integer visitTimeNum);
+
}
--
Gitblit v1.9.3