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

---
 smartor/src/main/java/com/smartor/service/impl/PatSpecificArchiveGenerateServiceImpl.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/service/impl/PatSpecificArchiveGenerateServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/PatSpecificArchiveGenerateServiceImpl.java
index 193bf59..91effdb 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatSpecificArchiveGenerateServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatSpecificArchiveGenerateServiceImpl.java
@@ -2,17 +2,17 @@
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
+import com.ruoyi.common.core.domain.entity.PatArchive;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.outpatientvisit.domain.PatMedOuthosp;
+import com.ruoyi.patarchive.domain.PatSpecificArchiveGenerateConfig;
+import com.ruoyi.patarchive.mapper.PatArchiveMapper;
+import com.ruoyi.patarchive.service.IPatSpecificArchiveGenerateConfigService;
 import com.smartor.common.SpecificArchiveConstants;
-import com.smartor.domain.PatArchive;
 import com.smartor.domain.PatChildArchiveDetail;
 import com.smartor.domain.PatMaternityArchiveDetail;
-import com.smartor.domain.PatMedOuthosp;
-import com.smartor.domain.PatSpecificArchiveGenerateConfig;
-import com.smartor.mapper.PatArchiveMapper;
 import com.smartor.service.IPatChildArchiveService;
 import com.smartor.service.IPatMaternityArchiveService;
-import com.smartor.service.IPatSpecificArchiveGenerateConfigService;
 import com.smartor.service.IPatSpecificArchiveGenerateService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;

--
Gitblit v1.9.3