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 | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 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 d858375..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;
@@ -1335,9 +1336,7 @@
Map yeWuXX = (Map) dataMap.get("YeWuXX");
Map<String, Object> BingRenXX = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("BingRenXX") : null;
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;
@@ -1354,8 +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.setOpreqcode(externalOperationInfo.getShenQingDID());
//鏌ヨ涓�涓嬶紝璇ユ偅鑰呮槸鍚﹀凡缁忔湁杩欎簺鏁版嵁
List<PatMedOperation> patMedOperations = patMedOperationMapper.selectPatMedOperationList(patMedOperation);
@@ -1406,9 +1403,17 @@
//涓芥按鏃犻櫌鍖猴紝榛樿鍊兼槸 1
patMedOperation.setCampusid("1");
patMedOperation.setSerialnum(externalInHospPatientInfo.getJiuZhenYWID());
+ patMedOperation.setInhospstate(externalInHospPatientInfo.getBingRenLXDM());
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);
@@ -1470,6 +1475,8 @@
patMedOperationItem.setOpposition(externalOperationDetail.getShouShuBW());
patMedOperationItem.setDelFlag("0");
patMedOperationItem.setOrgid(patMedOperation.getOrgid());
+ patMedOperationItem.setInhospstate(patMedOperation.getInhospstate());
+ patMedOperationItem.setSerialnum(patMedOperation.getSerialnum());
//涓芥按鏃犻櫌鍖猴紝榛樿鍊兼槸 1
patMedOperationItem.setCampusid("1");
if (externalOperationDetail.getZhuShouSBZ().equals("1") && addMianTableFalg == true) {
@@ -1978,6 +1985,12 @@
log.info("鎵嬫湳鐢宠鍏ュ弬绫诲瀷涓猴細{}", type);
addOperationInfo(dataMap);
return true;
+ case "SM_SQ_ShouShuAP":
+ log.info("鎵嬫湳瀹夋帓鍏ュ弬绫诲瀷涓猴細{}", type);
+ return true;
+ case "SM_SQ_CheXiao":
+ log.info("鎵嬫湳鎾ら攢鍏ュ弬绫诲瀷涓猴細{}", type);
+ return true;
case "TJ_YW_BaoGaoXX":
log.info("浣撴鎶ュ憡鍏ュ弬绫诲瀷涓猴細{}", type);
return true;
--
Gitblit v1.9.3