From 5cbcb6cce6349c81defb99ef1c178affe38e81f8 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期四, 23 四月 2026 16:13:10 +0800
Subject: [PATCH] 【市一】360接口实现
---
smartor/src/main/java/com/smartor/service/impl/ServiceSLTDHealthcareRecordServiceImpl.java | 56 +++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 39 insertions(+), 17 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 55b34de..e400628 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSLTDHealthcareRecordServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSLTDHealthcareRecordServiceImpl.java
@@ -40,7 +40,6 @@
public class ServiceSLTDHealthcareRecordServiceImpl implements IServiceSLTDHealthcareRecordService {
private static final String DATE_FORMAT = "yyyy-MM-dd HH:mm:ss";
- public static final String APP_KEY = "ak-zUMiOWhqXiJQWPB1pCbz0pjr";
@Autowired
private IPatArchiveService patArchiveService;
@@ -71,6 +70,9 @@
@Value("${userPwd}")
private String userPwd;
+
+ @Value("${lwl_app_key}")
+ private String APP_KEY;
@Override
public List<ServiceSLTDInhospResDTO> queryHealthcareRecordList(ServiceSLTDInhospReqVO reqVO) {
@@ -223,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"));
//璁剧疆鎬у埆
@@ -248,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 {
@@ -290,19 +292,19 @@
sysUserDept.setCreateTime(new Date());
sysUserDept.setDelFlag(0L);
- //鍒ゆ柇涓�涓嬫槸涓嶆槸宸茬粡瀛樺湪浜�
- if (ObjectUtils.isNotEmpty(sysUser1) && ObjectUtils.isNotEmpty(sysDept)) {
+ //鍒ゆ柇涓�涓嬬敤鎴�-閮ㄩ棬鍏崇郴鏄笉鏄凡缁忓瓨鍦ㄤ簡锛堟棤璁烘柊鐢ㄦ埛杩樻槸鑰佺敤鎴烽兘闇�瑕佸幓閲嶏級
+ if (ObjectUtils.isNotEmpty(sysUser.getUserId()) && ObjectUtils.isNotEmpty(sysDept)) {
SysUserDept sud = new SysUserDept();
- sud.setUserId(sysUser1.getUserId());
+ 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());
sysUserDeptMapper.updateSysUserDept(sysUserDept);
+ } else {
+ sysUserDeptMapper.insertSysUserDept(sysUserDept);
}
- } else {
- //涓嶅瓨鍦紝鍒欐柊澧�
- sysUserDeptMapper.insertSysUserDept(sysUserDept);
}
if (StringUtils.isNotEmpty(sysDept.getDeptType()) && sysDept.getDeptType().equals("1")) {
hospInfoList.add(Arrays.asList(sysDept.getDeptCode()));
@@ -325,7 +327,7 @@
sur.setOrgid(sysUser.getOrgid());
//鍏堟煡璇竴涓嬶紝鏄惁瀛樺湪
- SysUserRole sysUserRole = sysUserRoleMapper.selectUserRoleByRoleIdAndUserId(sysUser.getUserId(), 3L);
+ SysUserRole sysUserRole = sysUserRoleMapper.selectUserRoleByRoleIdAndUserId(3L, sysUser.getUserId());
if (ObjectUtils.isNotEmpty(sysUserRole)) continue;
userRoleList.add(sur);
@@ -551,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;
}
@@ -703,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");
@@ -751,9 +759,20 @@
}
private PatArchive processPatientArchive(ServiceSLTDInhospResDTO dto) {
- PatArchive queryArchive = new PatArchive();
- queryArchive.setIdcardno(StringUtils.isEmpty(dto.getIdCardNo()) ? "" + dto.getMedicalCardId() : dto.getIdCardNo().trim());
- List<PatArchive> existingArchives = patArchiveService.selectPatArchiveList(queryArchive);
+ List<PatArchive> existingArchives = null;
+
+ // 浼樺厛鎸� patientno 绮剧‘鏌ラ噸锛屾煡涓嶅埌鍐嶆寜 idcardno 鏌ラ噸锛圓ND鏉′欢浼氭紡鏌ュ悓涓�浜轰笉鍚宲atientno鐨勬儏鍐碉級
+ if (dto.getPatientId() != null) {
+ PatArchive queryByPatientNo = new PatArchive();
+ queryByPatientNo.setPatientno(String.valueOf(dto.getPatientId()));
+ queryByPatientNo.setIdcardno(StringUtils.isNotEmpty(dto.getIdCardNo()) ? dto.getIdCardNo().trim() : null);
+ existingArchives = patArchiveService.selectPatArchiveList(queryByPatientNo);
+ }
+// if (CollectionUtils.isEmpty(existingArchives) && !StringUtils.isEmpty(dto.getIdCardNo())) {
+// PatArchive queryByIdCard = new PatArchive();
+// queryByIdCard.setIdcardno(dto.getIdCardNo().trim());
+// existingArchives = patArchiveService.selectPatArchiveList(queryByIdCard);
+// }
PatArchive patArchive = buildPatientArchive(dto);
@@ -762,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());
}
@@ -771,7 +792,8 @@
private PatArchive buildPatientArchive(ServiceSLTDInhospResDTO dto) {
PatArchive patArchive = new PatArchive();
- patArchive.setPatientno("" + 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