From c18e2ce981ffc347956771c1a7ea0de722344fb2 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期四, 02 四月 2026 17:09:24 +0800
Subject: [PATCH] 【丽水】患者出入院时间报错问题处理

---
 smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 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..bc06dc1 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;
+                }
+            }
+        }
+
         //鏂板鎮h�呭熀鏈俊鎭柊澧炴垨淇敼
         PatArchive patArchive = addPatArchive(externalInHospPatientInfo, externalInHospPatientAddrInfo, externalInHospPatientLiaisonInfo);
 
@@ -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