From 5fe107b01e611e03034efbb76b97c3faae539f6b Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 25 四月 2025 11:03:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java
index b5d3963..90cb542 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java
@@ -7,10 +7,7 @@
import com.ruoyi.common.utils.DtoConversionUtils;
import com.ruoyi.common.utils.StringUtils;
import com.smartor.domain.*;
-import com.smartor.mapper.BaseTagMapper;
-import com.smartor.mapper.PatArchiveMapper;
-import com.smartor.mapper.PatArchivetagMapper;
-import com.smartor.mapper.ServiceSubtaskMapper;
+import com.smartor.mapper.*;
import com.smartor.service.IPatArchiveService;
import com.smartor.service.IPatMedInhospService;
import com.smartor.service.IPatMedOuthospService;
@@ -62,7 +59,7 @@
private IPatMedInhospService patMedInhospService;
@Autowired
- private IPatMedOuthospService patMedOuthospService;
+ private PatArchivecontactMapper patArchivecontactMapper;
@Autowired
private IPatMedPhysicalService patMedPhysicalService;
@@ -605,8 +602,26 @@
patArchive1.setTagList(stringList.stream().collect(Collectors.toList()));
patArchives.add(patArchive1);
}
+ //灏唒atArchives閲岀殑tagList鏀惧埌patArchiveList鐨勫璞￠噷
+ for (PatArchiveOthreInfo poi : patArchiveList) {
+ for (PatArchive pa : patArchives) {
+ if (poi.getId() == pa.getId()) {
+ poi.setTagList(pa.getTagList());
- return patArchives;
+ }
+ }
+ }
+
+ List<PatArchive> patArchiveList1 = DtoConversionUtils.sourceToTarget(patArchiveList, PatArchive.class);
+ //缁欐偅鑰呰仈绯讳汉璧嬪��
+// for (PatArchive pa : patArchives) {
+ for (PatArchive pa : patArchiveList1) {
+ PatArchivecontact patArchivecontact = new PatArchivecontact();
+ patArchivecontact.setPatid(pa.getId());
+ pa.setPatArchivecontactList(patArchivecontactMapper.selectPatArchivecontactList(patArchivecontact));
+ }
+
+ return patArchiveList1;
}
@Override
--
Gitblit v1.9.3