From 126d76bf7498be4f508bc66496e06ae217faee36 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 06 十一月 2026 16:03:39 +0800
Subject: [PATCH] fix: suggest6改为suggest7，修正复查复诊统计口径
---
smartor/src/main/java/com/smartor/service/impl/PatSpecificArchiveGenerateConfigServiceImpl.java | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/service/impl/PatSpecificArchiveGenerateConfigServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/PatSpecificArchiveGenerateConfigServiceImpl.java
index 80f7810..2a421da 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatSpecificArchiveGenerateConfigServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatSpecificArchiveGenerateConfigServiceImpl.java
@@ -5,10 +5,13 @@
import com.smartor.domain.PatSpecificArchiveGenerateConfig;
import com.smartor.mapper.PatSpecificArchiveGenerateConfigMapper;
import com.smartor.service.IPatSpecificArchiveGenerateConfigService;
+import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.Collections;
import java.util.List;
+import java.util.stream.Collectors;
/**
* 涓撶妗ｆ鐢熸垚閰嶇疆Service涓氬姟灞傚鐞�
@@ -35,6 +38,33 @@
}
@Override
+ public List<PatSpecificArchiveGenerateConfig> selectEffectiveConfigList(String orgid, String campusid)
+ {
+ List<PatSpecificArchiveGenerateConfig> configs =
+ patSpecificArchiveGenerateConfigMapper.selectEffectivePatSpecificArchiveGenerateConfigList(orgid, campusid);
+ if (CollectionUtils.isEmpty(configs))
+ {
+ return Collections.emptyList();
+ }
+
+ // 鏈烘瀯閰嶇疆浼樺厛锛氬瓨鍦ㄦ満鏋勯厤缃椂锛屼笉鍐嶄娇鐢ㄥ叏灞�閰嶇疆锛岄伩鍏嶈鍒欓噸澶嶅懡涓�
+ if (StringUtils.isNotEmpty(orgid))
+ {
+ List<PatSpecificArchiveGenerateConfig> orgConfigs = configs.stream()
+ .filter(config -> orgid.equals(config.getOrgid()))
+ .collect(Collectors.toList());
+ if (CollectionUtils.isNotEmpty(orgConfigs))
+ {
+ return orgConfigs;
+ }
+ }
+
+ return configs.stream()
+ .filter(config -> StringUtils.isEmpty(config.getOrgid()))
+ .collect(Collectors.toList());
+ }
+
+ @Override
public int insertPatSpecificArchiveGenerateConfig(PatSpecificArchiveGenerateConfig patSpecificArchiveGenerateConfig)
{
patSpecificArchiveGenerateConfig.setCreateTime(DateUtils.getNowDate());
--
Gitblit v1.9.3