From ecbb6791ae00a8a4076715b87a941c0a8557fa03 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期二, 13 一月 2026 11:31:34 +0800
Subject: [PATCH] 【市一】采集出入院增加院区id
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java | 39 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 38 insertions(+), 1 deletions(-)
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java
index 23167f6..c0c38f9 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java
@@ -12,6 +12,7 @@
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.stereotype.Service;
@@ -41,6 +42,9 @@
private SysUserDeptMapper sysUserDeptMapper;
@Autowired
+ private SysUserOrgMapper sysUserOrgMapper;
+
+ @Autowired
private Icd10Mapper icd10Mapper;
@Autowired
@@ -64,6 +68,9 @@
private static final long SHARDING_THRESHOLD = 5_000_000L;
private static final String PAT_ARCHIVE_TABLE = "pat_archive";
private static final String PAT_MED_INHOSP_TABLE = "pat_med_inhosp";
+
+ @Value("${spring.profiles.active}")
+ private String active;
@Override
@@ -210,10 +217,20 @@
List<PatMedInhosp> patMedInhospList1 = patMedInhospMapper.selectPatMedInhospListBySerialnum(pmi);
if (patMedInhospList1.size() == 0) {
pm.setCreateTime(new Date());
+ //甯備竴 闄㈠尯id瀵瑰簲orgid锛屾満鏋刬d涓洪粯璁ょ殑1
+ if(active.equals("hzszlyy")) {
+ pm.setCampusid(pm.getOrgid());
+ pm.setOrgid("1");
+ }
count += patMedInhospMapper.insertPatMedInhosp(pm);
} else {
pm.setInhospid(patMedInhospList1.get(0).getInhospid());
pm.setUpdateTime(new Date());
+ //甯備竴 闄㈠尯id瀵瑰簲orgid锛屾満鏋刬d涓洪粯璁ょ殑1
+ if(active.equals("hzszlyy")) {
+ pm.setCampusid(pm.getOrgid());
+ pm.setOrgid("1");
+ }
count += patMedInhospMapper.updatePatMedInhosp(pm);
}
} catch (Exception ex) {
@@ -267,9 +284,19 @@
if (patMedOuthospsTemp.size() > 0) {
patMedOuthosp1.setUpdateTime(new Date());
patMedOuthosp1.setId(patMedOuthospsTemp.get(0).getId());
+ //甯備竴 闄㈠尯id瀵瑰簲orgid锛屾満鏋刬d涓洪粯璁ょ殑1
+ if(active.equals("hzszlyy")) {
+ patMedOuthosp1.setCampusid(patMedOuthosp1.getOrgid());
+ patMedOuthosp1.setOrgid("1");
+ }
count += patMedOuthospMapper.updatePatMedOuthosp(patMedOuthosp1);
} else {
patMedOuthosp1.setCreateTime(new Date());
+ //甯備竴 闄㈠尯id瀵瑰簲orgid锛屾満鏋刬d涓洪粯璁ょ殑1
+ if(active.equals("hzszlyy")) {
+ patMedOuthosp1.setCampusid(patMedOuthosp1.getOrgid());
+ patMedOuthosp1.setOrgid("1");
+ }
count += patMedOuthospMapper.insertPatMedOuthosp(patMedOuthosp1);
}
} catch (Exception ex) {
@@ -419,6 +446,9 @@
List<SysUser> sysUserList = chMapper.selectUserList(sysUser);
SysUser suerTemp = new SysUser();
List<SysUserDept> sysUserDeptAll = chMapper.yhyksxx(suerTemp);
+ //鐢ㄦ埛-闄㈠尯鍏崇郴
+ List<SysUserOrg> sysUserOrgAll = chMapper.yhyyqxx(suerTemp);
+
log.info("sysUserList鐨勯噰闆嗗埌鐨勬暟閲忎负锛歿}", sysUserList.size());
int i = 0;// sysUser2Mapper.batchUser(sysUserList);
for (SysUser sysUser1 : sysUserList) {
@@ -448,6 +478,14 @@
sysUserDeptMapper.insertSysUserDept(sud);
}
}
+ //鏂板鐢ㄦ埛涓庨櫌鍖�
+ List<SysUserOrg> sysUserOrg = sysUserOrgAll.stream().filter((SysUserOrg o) -> o.getUserId().equals(sysUser1.getHisUserId())).collect(Collectors.toList());
+ for (SysUserOrg suo : sysUserOrg) {
+ if (usersTemp.size() > 0) {
+ suo.setUserId(usersTemp.get(0).getUserId());
+ sysUserOrgMapper.insertSysUserOrg(suo);
+ }
+ }
}
return i;
@@ -464,7 +502,6 @@
if (sysDeptTemp != null && sysDeptTemp.getDeptName() != null) {
row.setDeptId(sysDeptTemp.getDeptId());
count += sysDept2Mapper.updateDept(row);
-
} else {
count += sysDept2Mapper.insertDept(row);
}
--
Gitblit v1.9.3