From f0a09ee996ab2605869844d6a3d812709e2bf0fa Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 16 十月 2026 16:07:25 +0800
Subject: [PATCH] 任务模块、电话模块

---
 smartor/src/main/java/com/smartor/service/impl/HNGatherPatArchiveServiceImpl.java |   20 +++++++++++++-------
 1 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/service/impl/HNGatherPatArchiveServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/HNGatherPatArchiveServiceImpl.java
index d1496e0..3ec5262 100644
--- a/smartor/src/main/java/com/smartor/service/impl/HNGatherPatArchiveServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/HNGatherPatArchiveServiceImpl.java
@@ -6,8 +6,13 @@
 import com.ruoyi.common.core.domain.entity.SysUserRole;
 import com.ruoyi.common.utils.StringUtils;
 import com.smartor.domain.*;
+import com.ruoyi.outpatientvisit.domain.PatMedOuthosp;
+import com.ruoyi.inhospvisit.api.InhospVisitFacade;
+import com.ruoyi.inhospvisit.domain.PatMedInhosp;
 import com.smartor.mapper.*;
+import com.ruoyi.outpatientvisit.mapper.PatMedOuthospMapper;
 import com.smartor.service.IHNGatherPatArchiveService;
+import com.smartor.service.IPatMedOuthospService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,6 +23,7 @@
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.*;
+import com.ruoyi.common.core.domain.entity.PatArchive;
 
 /**
  * 鎮h�呮。妗圫ervice涓氬姟灞傚鐞�
@@ -50,13 +56,13 @@
     private PatMedOuthospMapper patMedOuthospMapper;
 
     @Autowired
-    private PatMedInhospMapper patMedInhospMapper;
+    private InhospVisitFacade inhospVisitFacade;
 
     @Autowired
     private PatArchiveMapper patArchiveMapper;
 
     @Autowired
-    private ThreadPoolTaskExecutor taskExecutor;
+    private IPatMedOuthospService patMedOuthospService;
 
     @Autowired
     private ShardingMapper shardingMapper;
@@ -108,20 +114,20 @@
                 //鍏ラ櫌
                 pm.setInhospstate("0");
                 pm.setCreateTime(new Date());
-                patMedInhospMapper.insertPatMedInhosp(pm);
+                inhospVisitFacade.insertPatMedInhosp(pm);
             } else if (!Objects.isNull(patMedInhosp.getStartOutHospTime()) && !Objects.isNull(patMedInhosp.getEndOutHospTime())) {
                 //鍑洪櫌
                 pm.setInhospstate("1");
                 pm.setUpdateTime(new Date());
                 PatMedInhosp pmi = new PatMedInhosp();
                 pmi.setSerialnum(pm.getSerialnum());
-                List<PatMedInhosp> patMedInhospList1 = patMedInhospMapper.selectPatMedInhospList(pmi);
+                List<PatMedInhosp> patMedInhospList1 = inhospVisitFacade.selectPatMedInhospList(pmi);
                 if (CollectionUtils.isEmpty(patMedInhospList1)) {
                     pm.setCreateTime(new Date());
-                    patMedInhospMapper.insertPatMedInhosp(pm);
+                    inhospVisitFacade.insertPatMedInhosp(pm);
                 } else {
                     pm.setInhospid(patMedInhospList1.get(0).getInhospid());
-                    patMedInhospMapper.updatePatMedInhosp(pm);
+                    inhospVisitFacade.updatePatMedInhosp(pm);
                 }
 
             }
@@ -187,7 +193,7 @@
                 patArchiveMapper.insertPatArchiveSingle(patArchives.get(0));
                 patMedOuthosp1.setPatid(patArchives.get(0).getId());
             }
-            i = patMedOuthospMapper.insertPatMedOuthosp(patMedOuthosp1);
+            i = patMedOuthospService.insertPatMedOuthosp(patMedOuthosp1);
         }
 
         return i;

--
Gitblit v1.9.3