From f6e31c2de04e10373ed4e7aea22bb3f13c8d2cf9 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期一, 24 八月 2026 17:44:49 +0800
Subject: [PATCH] 文件上传
---
smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java | 15 ++++++++-------
ruoyi-admin/src/main/resources/application-ls.yml | 2 +-
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application-ls.yml b/ruoyi-admin/src/main/resources/application-ls.yml
index ac62954..e69aac7 100644
--- a/ruoyi-admin/src/main/resources/application-ls.yml
+++ b/ruoyi-admin/src/main/resources/application-ls.yml
@@ -255,4 +255,4 @@
#鏂囦欢涓婁紶鍦板潃
fileUpload: https://9.208.2.190:8092
-profile: /home/ruoyi/uploadPath
+profile: /profile-api
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 343276d..ab13b48 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
@@ -18,6 +18,7 @@
import com.smartor.service.IServiceExternalService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -1337,7 +1338,6 @@
ExternalInHospPatientInfo externalInHospPatientInfo = BeanUtil.mapToBean(BingRenXX, ExternalInHospPatientInfo.class, true);
PatArchive patArchive = addPatArchive(externalInHospPatientInfo, null, null);
-
//鎵嬫湳淇℃伅鏂板
Map<String, Object> ssxx = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("ShouShuSQ") : null;
//鎵嬫湳鏇存柊
@@ -1353,12 +1353,6 @@
externalOperationInfo = BeanUtil.mapToBean(sscx, ExternalOperationInfo.class, true);
PatMedOperation patMedOperation = new PatMedOperation();
patMedOperation.setPatid(patArchive.getId());
- patMedOperation.setPatcode(externalInHospPatientInfo.getBingRenID());
- patMedOperation.setPaname(externalInHospPatientInfo.getXingMing());
- patMedOperation.setLeaveldeptcode(externalInHospPatientInfo.getDangQianKSID());
- patMedOperation.setLeaveldeptname(externalInHospPatientInfo.getDangQianKSMC());
- patMedOperation.setLeavehospitaldistrictcode(externalInHospPatientInfo.getDangQianBQID());
- patMedOperation.setLeavehospitaldistrictname(externalInHospPatientInfo.getDangQianBQMC());
patMedOperation.setOpreqcode(externalOperationInfo.getShenQingDID());
//鏌ヨ涓�涓嬶紝璇ユ偅鑰呮槸鍚﹀凡缁忔湁杩欎簺鏁版嵁
List<PatMedOperation> patMedOperations = patMedOperationMapper.selectPatMedOperationList(patMedOperation);
@@ -1413,6 +1407,13 @@
patMedOperation.setInhospno(externalInHospPatientInfo.getBingAnHao());
patMedOperation.setHospitalname(externalInHospPatientInfo.getZuZhiJGMC());
patMedOperation.setHospitalcode(externalInHospPatientInfo.getZuZhiJGID());
+
+ patMedOperation.setPatcode(externalInHospPatientInfo.getBingRenID());
+ patMedOperation.setPaname(externalInHospPatientInfo.getXingMing());
+ patMedOperation.setLeaveldeptcode(externalInHospPatientInfo.getDangQianKSID());
+ patMedOperation.setLeaveldeptname(externalInHospPatientInfo.getDangQianKSMC());
+ patMedOperation.setLeavehospitaldistrictcode(externalInHospPatientInfo.getDangQianBQID());
+ patMedOperation.setLeavehospitaldistrictname(externalInHospPatientInfo.getDangQianBQMC());
}
patMedOperation.setHospitaldistrictcode(null);
patMedOperation.setHospitaldistrictname(null);
--
Gitblit v1.9.3