From 6994c4ae328dc6e41ab98f183774c7ffdc9b5dbf Mon Sep 17 00:00:00 2001
From: zhs <zhs18203887318@163.com>
Date: 星期三, 16 四月 2025 17:48:41 +0800
Subject: [PATCH] 04-16改数据采集-入科
---
smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java | 43 +++++++++++++++++++++++++++++++++++++------
1 files changed, 37 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 04de82d..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;
@@ -184,6 +181,22 @@
patArchivetag.setGuid(patArchiveVO.getGuid());
patArchivetag.setOrgid(patArchiveVO.getOrgid());
if (patArchivetag.getIsoperation() != null && patArchivetag.getIsoperation() == 1 || patArchivetag.getIsoperation() == null && patArchiveVO.getIsoperation() == 1) {
+ //鍒ゆ柇涓�涓媌ase_tag閲屾槸涓嶆槸瀛樺湪锛屽鏋滀笉瀛樺湪锛屽厛鏂板
+ BaseTag baseTag = new BaseTag();
+ baseTag.setTagname(patArchivetag.getTagname().trim());
+ List<BaseTag> baseTags = baseTagMapper.selectBaseTagListByTagname(baseTag);
+ if (CollectionUtils.isEmpty(baseTags)) {
+ //鍏堢粰鏀惧埌鏈垎绫讳腑
+ baseTag.setTagcategoryid(6L);
+ baseTag.setOrgid(patArchiveVO.getOrgid());
+ baseTag.setDelFlag("0");
+ baseTag.setUpdateTime(new Date());
+ baseTag.setCreateTime(new Date());
+ baseTagMapper.insertBaseTag(baseTag);
+ patArchivetag.setTagid(baseTag.getTagid());
+ } else {
+ patArchivetag.setTagid(baseTags.get(0).getTagid());
+ }
//鏂板
patArchivetag.setUpdateBy(null);
patArchivetag.setCreateTime(new Date());
@@ -589,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