From 0a10b51863b939e646661394ae7e03acb0cb0039 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 14 四月 2025 19:08:47 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 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 7b3a1bf..e9ec5ab 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
@@ -526,6 +526,7 @@
Map yeWuXX = (Map) dataMap.get("YeWuXX");
Map XiaoXiTou = (Map) dataMap.get("XiaoXiTou");
String FaSongJGID = ObjectUtils.isNotEmpty(XiaoXiTou.get("FaSongJGID")) ? XiaoXiTou.get("FaSongJGID").toString() : null;
+ String FaSongJGMC = ObjectUtils.isNotEmpty(XiaoXiTou.get("FaSongJGMC")) ? XiaoXiTou.get("FaSongJGMC").toString() : null;
Map<String, Object> BingRenXX = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("BingRenXX") : null;
Map<String, Object> JiuZhenXX = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("JiuZhenXX") : null;
@@ -546,6 +547,7 @@
info.setZhenDuanMC((String) map.get("ZhenDuanMC"));
info.setZhenDuanLBDM((String) map.get("ZhenDuanLBDM"));
info.setZhenDuanLBMC((String) map.get("ZhenDuanLBMC"));
+ info.setIcd10((String) map.get("Icd10"));
return info;
}).collect(Collectors.toList());
}
@@ -560,8 +562,11 @@
PatMedOuthosp patMedOuthosp = new PatMedOuthosp();
patMedOuthosp.setOuthospno(externalInHospPatientInfo.getBingAnHao());
- patMedOuthosp.setSerialnum(ObjectUtils.isNotEmpty(yeWuXX.get("JiuZhenYWID")) ? yeWuXX.get("JiuZhenYWID").toString() : null);
+ patMedOuthosp.setSerialnum(externalInHospPatientInfo.getJiuZhenYWID());
+ List<PatMedOuthosp> patMedOuthosps = patMedOuthospMapper.selectPatMedOuthospList(patMedOuthosp);
+
patMedOuthosp.setPatid(patArchive.getId());
+ patMedOuthosp.setPatno(externalInHospPatientInfo.getBingAnHao());
patMedOuthosp.setPatname(externalInHospPatientInfo.getXingMing());
patMedOuthosp.setHospitalname(externalInHospPatientInfo.getZuZhiJGMC());
patMedOuthosp.setHospitalcode(externalInHospPatientInfo.getZuZhiJGID());
@@ -569,6 +574,7 @@
patMedOuthosp.setDeptcode(externalJZInfo.getJiuZhenKSID());
patMedOuthosp.setAdmitdate(externalJZInfo.getJiuZhenRQ());
patMedOuthosp.setOrgid(FaSongJGID);
+ patMedOuthosp.setHospitalname(FaSongJGMC);
for (ExternalDiagnosisInfo externalDiagnosisInfo : externalDiagnosisInfoList) {
if (externalDiagnosisInfo.getZhenDuanLBMC().equals("涓昏瘖鏂�")) {
@@ -586,9 +592,16 @@
patMedOuthosp.setMainsuit(externalWZInfo.getNeiRong());
}
}
- patMedOuthosp.setCreateTime(new Date());
- patMedOuthosp.setUpdateTime(new Date());
- int i = patMedOuthospMapper.insertPatMedOuthosp(patMedOuthosp);
+ int i = 0;
+ if (CollectionUtils.isNotEmpty(patMedOuthosps)) {
+ patMedOuthosp.setId(patMedOuthosps.get(0).getId());
+ patMedOuthosp.setUpdateTime(new Date());
+ i = patMedOuthospMapper.updatePatMedOuthosp(patMedOuthosp);
+ } else {
+ patMedOuthosp.setCreateTime(new Date());
+ patMedOuthosp.setUpdateTime(new Date());
+ i = patMedOuthospMapper.insertPatMedOuthosp(patMedOuthosp);
+ }
if (i > 0) {
return true;
}
@@ -741,7 +754,7 @@
patMedOperation.setPatno(externalInHospPatientInfo.getBingRenID());
patMedOperation.setPatname(externalInHospPatientInfo.getXingMing());
patMedOperation.setOrgid(externalInHospPatientInfo.getZuZhiJGID());
- patMedOperation.setSerialnum(externalInHospPatientInfo.getZhuYuanHao());
+ patMedOperation.setSerialnum(externalInHospPatientInfo.getJiuZhenYWID());
patMedOperation.setInhospno(externalInHospPatientInfo.getBingAnHao());
patMedOperation.setHospitalname(externalInHospPatientInfo.getZuZhiJGMC());
patMedOperation.setHospitalcode(externalInHospPatientInfo.getZuZhiJGID());
--
Gitblit v1.9.3