From cbe903c4c4493715ad8d307107fb95975acfc975 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 23 四月 2026 16:14:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
smartor/src/main/java/com/smartor/service/impl/ServiceSLTDHealthcareRecordServiceImpl.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceSLTDHealthcareRecordServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceSLTDHealthcareRecordServiceImpl.java
index 6db6b15..e400628 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSLTDHealthcareRecordServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSLTDHealthcareRecordServiceImpl.java
@@ -225,17 +225,16 @@
String professionalTitleName = getStringValue(diagnosisMap, "professionalTitleName");
if (professionalTitleName.contains("鍖诲笀")) {
sysUser.setUserType("鍖荤敓");
- sysUser.setSearchscope("1");
}
if (professionalTitleName.contains("鎶�")) {
sysUser.setUserType("鎶ゅ＋");
- sysUser.setSearchscope("2");
}
sysUser.setTitle(getStringValue(diagnosisMap, "professionalTitleName"));
}
}
}
-
+ //濡傛灉鐢ㄦ埛鐨勬偅鑰呰寖鍥翠负绌猴紝鍒欓粯璁や负0
+ if (StringUtils.isEmpty(sysUser.getSearchscope())) sysUser.setSearchscope("0");
sysUser.setPhonenumber(getStringValue(dataItem, "telephone"));
sysUser.setUserCode(getStringValue(dataItem, "jobNumber"));
//璁剧疆鎬у埆
@@ -250,12 +249,13 @@
sysUser.setCreateBy("admin");
sysUser.setCreateBy("admin");
sysUser.setOrgid("" + getLongValue(dataItem, "orgId"));
-// sysUser.setCampusid("" + getLongValue(dataItem, "cmpusId"));
BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
sysUser.setPassword(passwordEncoder.encode(userPwd));
-
SysUser sysUser1 = sysUser2Mapper.selectUserByUserName(sysUser.getUserName());
if (ObjectUtils.isNotEmpty(sysUser1)) {
+ //鐢变汉宸ョ淮鎶ょ殑瀛楁鏄笉闇�瑕佹洿鏂扮殑
+ sysUser.setSearchscope(null);
+ sysUser.setPassword(null);
sysUser.setUserId(sysUser1.getUserId());
sysUser2Mapper.updateUser(sysUser);
} else {
@@ -297,6 +297,7 @@
SysUserDept sud = new SysUserDept();
sud.setUserId(sysUser.getUserId());
sud.setDeptId(sysDept.getDeptId());
+ sud.setOrgid(sysDept.getOrgid());
List<SysUserDept> sysUserDepts = sysUserDeptMapper.selectSysUserDeptList(sud);
if (CollectionUtils.isNotEmpty(sysUserDepts)) {
sysUserDept.setId(sysUserDepts.get(0).getId());
@@ -552,6 +553,9 @@
patMedOuthosp.setCreateTime(new Date());
patMedOuthosp.setOrgid(dto.getOrgId());
patMedOuthosp.setCampusid(dto.getCampusId());
+ patMedOuthosp.setFuflag("1");
+ if (StringUtils.isNotEmpty(patArchive.getNotrequiredFlag()) && patArchive.getNotrequiredFlag().equals("1"))
+ patMedOuthosp.setFuflag("0");
return patMedOuthosp;
}
@@ -704,7 +708,10 @@
patMedInhosp.setNurseId(dto.getChiefNurseId() == null ? "" : dto.getChiefNurseId().toString());
patMedInhosp.setNurseName(dto.getChiefNurseName());
patMedInhosp.setSerialnum(dto.getHealthcareRecordNo());
+ patMedInhosp.setInhospno(dto.getHealthcareRecordNo());
patMedInhosp.setFuflag("1");
+ if (StringUtils.isNotEmpty(patArchive.getNotrequiredFlag()) && patArchive.getNotrequiredFlag().equals("1"))
+ patMedInhosp.setFuflag("0");
if ("0".equals(cry)) patMedInhosp.setInhospstate("0");
if ("1".equals(cry)) patMedInhosp.setInhospstate("1");
if ("3".equals(cry)) patMedInhosp.setInhospstate("3");
@@ -774,6 +781,8 @@
log.debug("銆恜rocessPatientArchive銆戞柊澧炴偅鑰呮。妗堬紝鎮ｈ�呯紪鍙凤細{}", patArchive.getPatientno());
} else {
patArchive.setId(existingArchives.get(0).getId());
+ patArchive.setNotrequiredFlag(existingArchives.get(0).getNotrequiredFlag());
+ patArchive.setNotrequiredreason(existingArchives.get(0).getNotrequiredreason());
patArchiveService.updateArchive(patArchive);
log.debug("銆恜rocessPatientArchive銆戞洿鏂版偅鑰呮。妗堬紝鎮ｈ�呯紪鍙凤細{}", patArchive.getPatientno());
}
@@ -783,7 +792,8 @@
private PatArchive buildPatientArchive(ServiceSLTDInhospResDTO dto) {
PatArchive patArchive = new PatArchive();
- patArchive.setPatientno(dto.getPatientId() == null ? null : String.valueOf(dto.getPatientId()));
+ patArchive.setPatientno(dto.getMedicalRecordNo() == null ? null : String.valueOf(dto.getMedicalRecordNo()));
+ patArchive.setPatidHis(dto.getPatientId() == null ? null : String.valueOf(dto.getPatientId()));
patArchive.setIdcardno(StringUtils.isEmpty(dto.getIdCardNo()) ? "" + dto.getMedicalCardId() : dto.getIdCardNo().trim());
patArchive.setName(dto.getPatientName());
patArchive.setSourcefrom(2L);
--
Gitblit v1.9.3