From 0bd3850e552fd3aa61619db84e4d6e673640943d Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 22 四月 2026 19:30:51 +0800
Subject: [PATCH] 获取subid
---
smartor/src/main/java/com/smartor/service/impl/ServiceSLTDHealthcareRecordServiceImpl.java | 14 ++++++++------
1 files changed, 8 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 fa6a9d7..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 {
@@ -708,6 +708,7 @@
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");
@@ -791,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