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 |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/service/IPatSpecificArchiveGenerateService.java b/smartor/src/main/java/com/smartor/service/IPatSpecificArchiveGenerateService.java
index 4ad425f..f25a083 100644
--- a/smartor/src/main/java/com/smartor/service/IPatSpecificArchiveGenerateService.java
+++ b/smartor/src/main/java/com/smartor/service/IPatSpecificArchiveGenerateService.java
@@ -19,4 +19,22 @@
      * @return 鏈鐢熸垚/鏇存柊鐨勬。妗堟暟閲�
      */
     int generateByOuthosp(PatMedOuthosp patMedOuthosp, PatArchive patArchive);
+
+    /**
+     * 鏍规嵁浣忛櫌闅忚瀛愪换鍔$敓鎴愪笓绉戞。妗堛��
+     *
+     * <p>浠呭鐞嗗凡瀹屾垚鐨勪綇闄㈤殢璁匡紙hosp_type 2/6 + service_type 鐧藉悕鍗曪級锛�
+     * 涓斾粎瀵逛附姘村競濡囧辜淇濆仴闄㈢敓鏁堛�傜敓鎴愬墠鎸夆�滄偅鑰� + 涓撶 + 妗f绫诲瀷鈥濆垽鏂槸鍚﹀凡鏈夋。妗堛��</p>
+     *
+     * @param subId 闅忚瀛愪换鍔D
+     * @return 鏈鐢熸垚鏁伴噺
+     */
+    int generateByInhospFollowup(Long subId);
+
+    /**
+     * 琛ュ伩鎵弿锛氭煡璇㈣繎 7 澶╁凡瀹屾垚浣嗗皻鏈鐞嗙殑浣忛櫌闅忚骞跺皾璇曠敓鎴愭。妗堛��
+     *
+     * @return 鏈鐢熸垚鏁伴噺
+     */
+    int compensateInhospFollowups();
 }

--
Gitblit v1.9.3