From 7191c6d38f03f2e1baf39f959227ce9c038e4e96 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 03 十一月 2026 14:39:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into smartor_ls_261012

---
 ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ICollectHISService.java |   24 ++++++++++++++++++++++++
 1 files changed, 24 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 205ec30..e2892fe 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
@@ -3,8 +3,13 @@
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.smartor.domain.*;
+import com.ruoyi.outpatientvisit.domain.PatMedOuthosp;
+import com.ruoyi.inhospvisit.domain.PatMedInhosp;
 
 import java.util.List;
+import com.ruoyi.common.core.domain.entity.PatArchive;
+import com.ruoyi.common.core.domain.entity.Icd10;
+import com.ruoyi.datacollection.domain.HnDataGatherVO;
 
 public interface ICollectHISService {
 
@@ -66,10 +71,29 @@
     public Integer selectUserList(SysUser sysUser);
 
     /**
+     * 寮傛鍚屾鐢ㄦ埛淇℃伅锛堟彁浜ゅ悗绔嬪嵆杩斿洖锛岀敱鍚庡彴绾跨▼鎵ц锛�
+     *
+     * @param sysUser 鐢ㄦ埛淇℃伅
+     * @return true=宸叉彁浜わ紱false=宸叉湁鍚屾浠诲姟鍦ㄦ墽琛�
+     */
+    public boolean selectUserListAsync(SysUser sysUser);
+
+    /**
      * 鏌ヨ閮ㄩ棬绠$悊鏁版嵁
      *
      * @param dept 閮ㄩ棬淇℃伅
      * @return 閮ㄩ棬淇℃伅闆嗗悎
      */
     public Integer selectDeptList(SysDept dept);
+
+
+    /**
+     * 甯備竴鍚屾
+     */
+    public Integer syncMedInhosp(String startTime, String endTime);
+
+    /**
+     * 甯備竴鍚屾
+     */
+    public Integer syncOper(String startTime, String endTime);
 }

--
Gitblit v1.9.3