From 3d047130b059efd46f56be37465a751ab16ee8cb Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期三, 11 十一月 2026 14:06:56 +0800
Subject: [PATCH] Merge branch 'smartor_ls_merge' into 20261111-妇幼档案随访
---
smartor/src/main/java/com/smartor/service/IPatSpecificArchiveGenerateService.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/service/IPatSpecificArchiveGenerateService.java b/smartor/src/main/java/com/smartor/service/IPatSpecificArchiveGenerateService.java
index cb6065d..f25a083 100644
--- a/smartor/src/main/java/com/smartor/service/IPatSpecificArchiveGenerateService.java
+++ b/smartor/src/main/java/com/smartor/service/IPatSpecificArchiveGenerateService.java
@@ -1,7 +1,7 @@
package com.smartor.service;
-import com.smartor.domain.PatArchive;
-import com.smartor.domain.PatMedOuthosp;
+import com.ruoyi.common.core.domain.entity.PatArchive;
+import com.ruoyi.outpatientvisit.domain.PatMedOuthosp;
/**
* 涓撶妗ｆ鐢熸垚Service鎺ュ彛銆�
@@ -19,4 +19,22 @@
* @return 鏈鐢熸垚/鏇存柊鐨勬。妗堟暟閲�
*/
int generateByOuthosp(PatMedOuthosp patMedOuthosp, PatArchive patArchive);
+
+ /**
+ * 鏍规嵁浣忛櫌闅忚瀛愪换鍔＄敓鎴愪笓绉戞。妗堛��
+ *
+ * <p>浠呭鐞嗗凡瀹屾垚鐨勪綇闄㈤殢璁匡紙hosp_type 2/6 + service_type 鐧藉悕鍗曪級锛�
+ * 涓斾粎瀵逛附姘村競濡囧辜淇濆仴闄㈢敓鏁堛�傜敓鎴愬墠鎸夆�滄偅鑰� + 涓撶 + 妗ｆ绫诲瀷鈥濆垽鏂槸鍚﹀凡鏈夋。妗堛��</p>
+ *
+ * @param subId 闅忚瀛愪换鍔D
+ * @return 鏈鐢熸垚鏁伴噺
+ */
+ int generateByInhospFollowup(Long subId);
+
+ /**
+ * 琛ュ伩鎵弿锛氭煡璇㈣繎 7 澶╁凡瀹屾垚浣嗗皻鏈鐞嗙殑浣忛櫌闅忚骞跺皾璇曠敓鎴愭。妗堛��
+ *
+ * @return 鏈鐢熸垚鏁伴噺
+ */
+ int compensateInhospFollowups();
}
--
Gitblit v1.9.3