From 88c5064877fa22316d794c225fff3ceced4371f3 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 03 三月 2025 20:03:43 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java | 27 +++++++++++++++++++++++----
1 files changed, 23 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 744839d..311421c 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
@@ -326,7 +326,20 @@
@Override
public Boolean addFinshJZInfo(Map dataMap) {
- //杩欎釜鍏堢瓑绛�
+ log.error("ServiceExternalServiceImpl---addFinshJZInfo鐨勬柊澧炵殑鍊间负锛歿}", dataMap);
+// Map yeWuXX = (Map) dataMap.get("YeWuXX");
+// Map<String, Object> BingRenXX = (Map<String, Object>) yeWuXX.get("BingRenXX");
+// Map<String, Object> JiuZhenXX = (Map<String, Object>) yeWuXX.get("JiuZhenXX");
+// ExternalInHospPatientInfo externalInHospPatientInfo = BeanUtil.mapToBean(BingRenXX, ExternalInHospPatientInfo.class, true);
+// PatMedOuthosp patMedOuthosp = new PatMedOuthosp();
+// patMedOuthosp.setOuthospno(externalInHospPatientInfo.getBingAnHao());
+// patMedOuthosp.setSerialnum(externalInHospPatientInfo.getBingAnHao());
+// patMedOuthosp.setPatid(Long.valueOf(externalInHospPatientInfo.getBingRenID()));
+// patMedOuthosp.setPatname(externalInHospPatientInfo.getXingMing());
+// patMedOuthosp.setHospitalname(externalInHospPatientInfo.getZuZhiJGMC());
+// patMedOuthosp.setHospitalcode(externalInHospPatientInfo.getZuZhiJGID());
+// patMedOuthosp.setIcd10code();
+
return null;
}
@@ -530,13 +543,17 @@
patArchive.setNation(externalInHospPatientInfo.getMinZuMC());
patArchive.setNativePlace(externalInHospPatientInfo.getGuoJiMC());
if (ObjectUtils.isNotEmpty(externalInHospPatientAddrInfo)) {
- patArchive.setPlaceOfResidence(externalInHospPatientAddrInfo.getShengFenMC() + externalInHospPatientAddrInfo.getShiDiQMC() + externalInHospPatientAddrInfo.getXianQuMC() + externalInHospPatientAddrInfo.getXiangZhenMC() + externalInHospPatientAddrInfo.getCunJiMC() + externalInHospPatientAddrInfo.getQiTaXX());
- patArchive.setBirthplace(externalInHospPatientAddrInfo.getShengFenMC() + externalInHospPatientAddrInfo.getShiDiQMC() + externalInHospPatientAddrInfo.getXianQuMC() + externalInHospPatientAddrInfo.getXiangZhenMC() + externalInHospPatientAddrInfo.getCunJiMC() + externalInHospPatientAddrInfo.getQiTaXX());
+ String por = externalInHospPatientAddrInfo.getShengFenMC() + externalInHospPatientAddrInfo.getShiDiQMC() + externalInHospPatientAddrInfo.getXianQuMC() + externalInHospPatientAddrInfo.getXiangZhenMC() + externalInHospPatientAddrInfo.getCunJiMC() + externalInHospPatientAddrInfo.getQiTaXX();
+ patArchive.setPlaceOfResidence(por.replace(null, ""));
+ String bp = externalInHospPatientAddrInfo.getShengFenMC() + externalInHospPatientAddrInfo.getShiDiQMC() + externalInHospPatientAddrInfo.getXianQuMC() + externalInHospPatientAddrInfo.getXiangZhenMC() + externalInHospPatientAddrInfo.getCunJiMC() + externalInHospPatientAddrInfo.getQiTaXX();
+ patArchive.setBirthplace(bp.replace(null, ""));
}
patArchive.setBirthdate(externalInHospPatientInfo.getChuShengRQ());
patArchive.setAge(externalInHospPatientInfo.getNianLing());
patArchive.setAgeUnit(externalInHospPatientInfo.getNianLingDW());
patArchive.setTelcode(externalInHospPatientInfo.getLianXiDH());
+ if (StringUtils.isEmpty(externalInHospPatientInfo.getLianXiDH()))
+ patArchive.setTelcode(externalInHospPatientInfo.getLianXiRDH());
patArchive.setRelativetelcode(externalInHospPatientInfo.getLianXiRDH());
patArchive.setGuid(externalInHospPatientInfo.getZuZhiJGID());
patArchive.setOrgid(externalInHospPatientInfo.getZuZhiJGID());
@@ -584,6 +601,8 @@
patMedInhosp.setLeavehospitaldistrictcode(externalInHospPatientInfo.getDangQianBQID());
patMedInhosp.setHospitaldistrictname(externalInHospPatientInfo.getDangQianBQMC());
patMedInhosp.setLeavehospitaldistrictname(externalInHospPatientInfo.getDangQianBQMC());
+ patMedInhosp.setTelcode(patArchive.getTelcode());
+ patMedInhosp.setDrname("");
}
if (ObjectUtils.isNotEmpty(externalInHospPatientDiagnoseInfo)) {
patMedInhosp.setIcd10code(StringUtils.isNotEmpty(patMedInhosp.getIcd10code()) ? patMedInhosp.getIcd10code() + "," + externalInHospPatientDiagnoseInfo.getZhenDuanID() : externalInHospPatientDiagnoseInfo.getZhenDuanID());
@@ -594,7 +613,7 @@
patMedInhosp.setPatid(patArchive.getId());
patMedInhosp.setPatno(patArchive.getPatientno());
patMedInhosp.setPatname(patArchive.getName());
- patMedInhosp.setDrname("");
+
patMedInhosp.setSchemestatus(1L);
patMedInhosp.setCreateTime(new Date());
}
--
Gitblit v1.9.3