From e12b7983327f4881f91c8d081c52abbbf5bbc1e4 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期四, 09 四月 2026 10:52:44 +0800
Subject: [PATCH] Merge branch 'master' into master-手术随访

---
 smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java |    5 ++++-
 1 files changed, 4 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 7a53d20..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);
@@ -1466,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()))

--
Gitblit v1.9.3