From 2867cf7076a584a34e63174cec0a8b89cdd03e4c Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 06 十一月 2026 13:42:55 +0800
Subject: [PATCH] Merge branch 'master' into smartor_ls_261103

---
 ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ICollectHISService.java |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ICollectHISService.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ICollectHISService.java
index e2892fe..23de4c5 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ICollectHISService.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ICollectHISService.java
@@ -6,6 +6,7 @@
 import com.ruoyi.outpatientvisit.domain.PatMedOuthosp;
 import com.ruoyi.inhospvisit.domain.PatMedInhosp;
 
+import java.util.Date;
 import java.util.List;
 import com.ruoyi.common.core.domain.entity.PatArchive;
 import com.ruoyi.common.core.domain.entity.Icd10;
@@ -96,4 +97,15 @@
      * 甯備竴鍚屾
      */
     public Integer syncOper(String startTime, String endTime);
+
+    /**
+     * 閲囬泦鎸囧畾鏈烘瀯鐨勯棬璇婃帴璇婂畬鎴愯褰曪紝骞舵寜閰嶇疆鐢熸垚濡囩/鍎跨妗f銆�
+     * 褰撳墠浠呮敮鎸佷附姘村競濡囧辜淇濆仴闄紙orgid = 47226079133110211G1001锛夈��
+     *
+     * @param orgid     鏈烘瀯ID
+     * @param startTime 灏辫瘖寮�濮嬫椂闂达紝涓虹┖鏃堕粯璁ゆ槰澶� 00:00:00
+     * @param endTime   灏辫瘖缁撴潫鏃堕棿锛屼负绌烘椂榛樿浠婂ぉ 00:00:00
+     * @return 閲囬泦骞跺鐞嗙殑璁板綍鏁�
+     */
+    public Integer collectMchOuthospAndGenerateArchive(String orgid, Date startTime, Date endTime);
 }

--
Gitblit v1.9.3