From 4bd221d2b4da1236aa36f73961e2f92ebf14a5d9 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期三, 08 四月 2026 15:30:15 +0800
Subject: [PATCH] 【丽水】PatArchiveVo 继承 PatArchive
---
smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
index 66c5a2e..9cd0b25 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
@@ -154,6 +154,9 @@
sysUser.setCampusid("1");
//鏍规嵁userName鍒ゆ柇涓�涓嬶紝鏄笉鏄箣鍓嶆湁鏂板
SysUser sysUser1 = null;
+ if(StringUtils.isEmpty(sysUser.getUserName()) || StringUtils.isEmpty(sysUser.getOrgid())){
+ return false;
+ }
List<SysUser> sysUserList = sysUserMapper.selectUserList(sysUser);
if (CollectionUtils.isNotEmpty(sysUserList)) {
sysUser1 = sysUserList.get(0);
@@ -548,6 +551,17 @@
}
if (CollectionUtils.isNotEmpty(epai)) externalInHospPatientAddrInfo = epai2.get(0);
if (CollectionUtils.isNotEmpty(epli)) externalInHospPatientLiaisonInfo = epli2.get(0);
+ List<HashMap<String, Object>> bingRenKZXXList = ObjectUtils.isNotEmpty(yeWuXX) ? (List<HashMap<String, Object>>) yeWuXX.get("BingRenKZXXList") : null;
+ if (CollectionUtils.isNotEmpty(bingRenKZXXList)) {
+ for(HashMap<String, Object> bingRenKZXX : bingRenKZXXList){
+ String XiangMuDM = ObjectUtils.isNotEmpty(bingRenKZXX.get("XiangMuDM")) ? bingRenKZXX.get("XiangMuDM").toString() : null;
+ if(StringUtils.isNotEmpty(XiangMuDM) && XiangMuDM.equals("DuanHaoXX")){
+ externalInHospPatientInfo.setDuanHaoXX(ObjectUtils.isNotEmpty(bingRenKZXX.get("XiangMuZMC")) ? bingRenKZXX.get("XiangMuZMC").toString() : null);
+ break;
+ }
+ }
+ }
+
//鏂板鎮ｈ�呭熀鏈俊鎭柊澧炴垨淇敼
PatArchive patArchive = addPatArchive(externalInHospPatientInfo, externalInHospPatientAddrInfo, externalInHospPatientLiaisonInfo);
@@ -1455,7 +1469,7 @@
patArchive.setPatientno(externalInHospPatientInfo.getJiuZhenKH());
patArchive.setBirthdate(parse);
patArchive.setPatidHis(externalInHospPatientInfo.getBingRenID());
- patArchive.setSourcefrom(1);
+ patArchive.setSourcefrom(1L);
patArchive.setPattype("2");
patArchive.setName(externalInHospPatientInfo.getXingMing());
if (StringUtils.isNotEmpty(externalInHospPatientInfo.getXingBieDM()))
@@ -1487,6 +1501,9 @@
patArchive.setTelcode(externalInHospPatientInfo.getLianXiDH());
if (StringUtils.isEmpty(patArchive.getTelcode()))
patArchive.setTelcode(externalInHospPatientInfo.getLianXiRDH());
+ //澧炲姞鐭彿淇℃伅
+ if (StringUtils.isNotEmpty(externalInHospPatientInfo.getDuanHaoXX()))
+ patArchive.setTelshortcode(externalInHospPatientInfo.getDuanHaoXX());
patArchive.setRelativetelcode(externalInHospPatientInfo.getLianXiRDH());
patArchive.setGuid(externalInHospPatientInfo.getZuZhiJGID());
patArchive.setInhospno(externalInHospPatientInfo.getBingAnHao());
--
Gitblit v1.9.3