From 55f5271f893a25a7be671b24938e49976936a67b Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 29 九月 2025 18:30:00 +0800
Subject: [PATCH] 新增Orgid
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java | 122 +++++++++++++++++++++++-----------------
1 files changed, 69 insertions(+), 53 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 d5101e7..0ef55b5 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
@@ -3,10 +3,8 @@
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.entity.SysUserDept;
-import com.ruoyi.common.core.domain.entity.SysUserRole;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.quartz.mapper.CollectHISMapper;
-import com.ruoyi.quartz.mapper.UtilsMapper;
import com.ruoyi.quartz.service.ICollectHISService;
import com.smartor.domain.*;
import com.smartor.mapper.*;
@@ -22,6 +20,7 @@
import java.time.ZoneId;
import java.util.*;
import java.util.stream.Collectors;
+import java.util.stream.Stream;
@Slf4j
@Service
@@ -86,6 +85,7 @@
/**
* 鍚屾浠诲姟
+ *
* @param
* @return
*/
@@ -105,15 +105,15 @@
//鍚屾浣忛櫌鐥呬汉淇℃伅
List<Map<String, Object>> syncTemp = syncList.stream().filter(row -> row.get("syncName").equals("pat_med_inhosp")).collect(Collectors.toList());
if (syncTemp.size() > 0) {
- count+=syncMedInhosp(syncTemp.get(0).get("startTime") + "", endTime);
- utilsMapper.updateSql("update sys_sync_time set startTime='"+endTime+"' where syncName='pat_med_inhosp' ");
+ count += syncMedInhosp(syncTemp.get(0).get("startTime") + "", endTime);
+ utilsMapper.updateSql("update sys_sync_time set startTime='" + endTime + "' where syncName='pat_med_inhosp' ");
}
//鍚屾闂ㄨ瘖淇℃伅
syncTemp = syncList.stream().filter(row -> row.get("syncName").equals("pat_med_outhosp")).collect(Collectors.toList());
if (syncTemp.size() > 0) {
- count+=syncOuthosp(syncTemp.get(0).get("startTime") + "", endTime);
- utilsMapper.updateSql("update sys_sync_time set startTime='"+endTime+"' where syncName='pat_med_outhosp' ");
+ count += syncOuthosp(syncTemp.get(0).get("startTime") + "", endTime);
+ utilsMapper.updateSql("update sys_sync_time set startTime='" + endTime + "' where syncName='pat_med_outhosp' ");
}
@@ -125,10 +125,11 @@
/**
* 鍚屾鎮ｈ�呭熀鏈俊鎭�
+ *
* @param
* @return
*/
- private Integer syncArchive(String startTime,String endTime) {
+ private Integer syncArchive(String startTime, String endTime) {
Integer count = 0;
PatArchive pa = new PatArchive();
pa.setLastStartTime(startTime);
@@ -149,8 +150,8 @@
count += patArchiveMapper.insertPatArchiveSingle(pm);
}
- }catch (Exception ex){
- log.info("鍙悓鎮ｈ�呭熀鏈俊鎭�:"+ex.getMessage());
+ } catch (Exception ex) {
+ log.info("鍙悓鎮ｈ�呭熀鏈俊鎭�:" + ex.getMessage());
}
}
@@ -159,10 +160,11 @@
/**
* 鍚屾鍑哄叆闄俊鎭�
+ *
* @param
* @return
*/
- private Integer syncMedInhosp(String startTime,String endTime) {
+ private Integer syncMedInhosp(String startTime, String endTime) {
Integer count = 0;
PatMedInhosp patMedInhosp = new PatMedInhosp();
patMedInhosp.setLastStartTime(startTime);
@@ -170,30 +172,38 @@
List<PatMedInhosp> patMedInhospList = chMapper.selectPatMedInhospList(patMedInhosp);
log.info("鍙悓姝ュ嚭鍏ラ櫌鏁伴噺" + patMedInhospList.size());
for (PatMedInhosp pm : patMedInhospList) {
+ List<PatArchive> patArchives1 = new ArrayList<>();
+
try {
//鎮ｈ�呭熀鏈俊鎭�
- PatArchive patArchive = new PatArchive();
- patArchive.setPatientno(pm.getPatno());
- List<PatArchive> patArchives = chMapper.selectPatArchiveList(patArchive);
- if (patArchives.size() > 0) {
- PatArchive pa1 = new PatArchive();
- pa1.setPatientno(pm.getPatno());
- List<PatArchive> patArchives1 = patArchiveMapper.selectPatArchiveList(pa1);
- if (CollectionUtils.isNotEmpty(patArchives1)) {
- patArchives.get(0).setId(patArchives1.get(0).getId());
- patArchives.get(0).setUpdateTime(new Date());
- count += patArchiveMapper.updatePatArchive(patArchives.get(0));
- } else {
- patArchives.get(0).setCreateTime(new Date());
- count += patArchiveMapper.insertPatArchiveSingle(patArchives.get(0));
-
+ if (ObjectUtils.isNotEmpty(pm.getPatno())) {
+ PatArchive patArchive = new PatArchive();
+ patArchive.setPatientno(pm.getPatno());
+ patArchive.setPageSize(5);
+ List<PatArchive> patArchives = chMapper.selectPatArchiveList(patArchive);
+ if (patArchives.size() > 0) {
+ PatArchive pa1 = new PatArchive();
+ pa1.setPatientno(pm.getPatno());
+ patArchives1 = patArchiveMapper.selectPatArchiveList(pa1);
+ if (CollectionUtils.isNotEmpty(patArchives1)) {
+ patArchives.get(0).setId(patArchives1.get(0).getId());
+ patArchives.get(0).setUpdateTime(new Date());
+ count += patArchiveMapper.updatePatArchive(patArchives.get(0));
+ } else {
+ patArchives.get(0).setCreateTime(new Date());
+ count += patArchiveMapper.insertPatArchiveSingle(patArchives.get(0));
+ patArchives1 = patArchiveMapper.selectPatArchiveList(pa1);
+ }
}
}
- }catch (Exception ex) {
+ } catch (Exception ex) {
log.info("鍚屾偅鑰呭熀鏈俊鎭�:" + ex.getMessage());
}
try {
+ if (patArchives1.size() > 0) {
+ pm.setPatid(patArchives1.get(0).getId());
+ }
//鍚屾鍑哄叆闄�
PatMedInhosp pmi = new PatMedInhosp();
pmi.setSerialnum(pm.getSerialnum());
@@ -215,10 +225,11 @@
/**
* 鍚屾闂ㄨ瘖淇℃伅
+ *
* @param
* @return
*/
- private Integer syncOuthosp(String startTime,String endTime) {
+ private Integer syncOuthosp(String startTime, String endTime) {
Integer count = 0;
PatMedOuthosp patMedOuthosp = new PatMedOuthosp();
patMedOuthosp.setLastStartTime(startTime);
@@ -245,7 +256,7 @@
}
}
- }catch (Exception ex) {
+ } catch (Exception ex) {
log.info("鍚屾偅鑰呭熀鏈俊鎭�:" + ex.getMessage());
}
@@ -271,7 +282,7 @@
@Override
public Integer selectPatMedInhospList(PatMedInhosp patMedInhosp) {
List<PatMedInhosp> patMedInhospList = chMapper.selectPatMedInhospList(patMedInhosp);
- log.info("鍙悓姝ョ梾浜烘暟閲�"+patMedInhospList.size());
+ log.info("鍙悓姝ョ梾浜烘暟閲�" + patMedInhospList.size());
for (PatMedInhosp pm : patMedInhospList) {
PatArchive patArchive = new PatArchive();
patArchive.setPatientno(pm.getPatno());
@@ -316,10 +327,8 @@
@Override
public Boolean hnDataGather(HnDataGatherVO hnDataGatherVO) {
- if(ObjectUtils.isEmpty(hnDataGatherVO.getStartTime()) )
- hnDataGatherVO.setStartTime(new Date());
- if(ObjectUtils.isEmpty(hnDataGatherVO.getEndTime()) )
- hnDataGatherVO.setEndTime(new Date());
+ if (ObjectUtils.isEmpty(hnDataGatherVO.getStartTime())) hnDataGatherVO.setStartTime(new Date());
+ if (ObjectUtils.isEmpty(hnDataGatherVO.getEndTime())) hnDataGatherVO.setEndTime(new Date());
LocalDate startDate = hnDataGatherVO.getStartTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
LocalDate endDate = hnDataGatherVO.getEndTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
@@ -408,39 +417,36 @@
@Override
public Integer selectUserList(SysUser sysUser) {
List<SysUser> sysUserList = chMapper.selectUserList(sysUser);
+ SysUser suerTemp = new SysUser();
+ List<SysUserDept> sysUserDeptAll = chMapper.yhyksxx(suerTemp);
log.info("sysUserList鐨勯噰闆嗗埌鐨勬暟閲忎负锛歿}", sysUserList.size());
- int i =0;// sysUser2Mapper.batchUser(sysUserList);
+ int i = 0;// sysUser2Mapper.batchUser(sysUserList);
for (SysUser sysUser1 : sysUserList) {
// log.info("sysUser1鐨処D涓猴細{}", sysUser1.getUserId());
// log.info("sysUser1鐨凥ISUSERID涓猴細{}", sysUser1.getHisUserId());
-// //鏂板鐢ㄦ埛涓庤鑹�
-// SysUserRole yhyjsxx = chMapper.yhyjsxx(sysUser1);
-// if (yhyjsxx != null&&yhyjsxx.getUserId()!=null) {
-// yhyjsxx.setUserId(sysUser1.getUserId());
-// List<SysUserRole> userRoleList = new ArrayList<>();
-// userRoleList.add(yhyjsxx);
-// sysUserRoleMapper.batchUserRole(userRoleList);
-// }
if (StringUtils.isEmpty(sysUser1.getHisUserId())) continue;
- SysUser suTemp=new SysUser();
+ SysUser suTemp = new SysUser();
suTemp.setHisUserId(sysUser1.getHisUserId());
- List<SysUser> usersTemp= sysUser2Mapper.selectUserList(suTemp);
- if (usersTemp.size()>0) {
+ List<SysUser> usersTemp = sysUser2Mapper.selectUserList(suTemp);
+ if (usersTemp.size() > 0) {
sysUser1.setUserId(usersTemp.get(0).getUserId());
+ sysUser1.setUserName(sysUser1.getHisUserId());
sysUser2Mapper.updateUser(sysUser1);
- }else{
+ } else {
+ sysUser1.setUserName(sysUser1.getHisUserId());
sysUser2Mapper.insertUser(sysUser1);
- usersTemp= sysUser2Mapper.selectUserList(suTemp);
+ usersTemp = sysUser2Mapper.selectUserList(suTemp);
}
//鏂板鐢ㄦ埛涓庨儴闂�
- List<SysUserDept> sysUserDept = chMapper.yhyksxx(sysUser1);
- for(SysUserDept sud :sysUserDept) {
- if (usersTemp.size()>0) {
+ //List<SysUserDept> sysUserDept = chMapper.yhyksxx(sysUser1);
+ List<SysUserDept> sysUserDept = sysUserDeptAll.stream().filter((SysUserDept b) -> b.getUserCode().equals(sysUser1.getHisUserId())).collect(Collectors.toList());
+
+ for (SysUserDept sud : sysUserDept) {
+ if (usersTemp.size() > 0) {
sud.setUserId(usersTemp.get(0).getUserId());
sysUserDeptMapper.insertSysUserDept(sud);
}
-
}
}
@@ -449,10 +455,20 @@
@Override
public Integer selectDeptList(SysDept dept) {
+ int count = 0;
List<SysDept> sysDepts = chMapper.selectDeptList(dept);
log.info("selectDeptList鐨勯噰闆嗗埌鐨勬暟閲忎负锛歿}", sysDepts.size());
- int i = sysDept2Mapper.batchDept(sysDepts);
- return i;
+ // count = sysDept2Mapper.batchDept(sysDepts);
+ for (SysDept row : sysDepts) {
+ SysDept sysDeptTemp = sysDept2Mapper.selectDeptByCode(row.getDeptCode(), null);
+ if (sysDeptTemp != null && sysDeptTemp.getDeptName() != null) {
+ row.setDeptId(sysDeptTemp.getDeptId());
+ count += sysDept2Mapper.updateDept(row);
+ } else {
+ count += sysDept2Mapper.insertDept(row);
+ }
+ }
+ return count;
}
--
Gitblit v1.9.3