From 9814549e8064737867a155a92a53b8dd7982c80b Mon Sep 17 00:00:00 2001
From: zhs <zhs18203887318@163.com>
Date: 星期四, 17 四月 2025 16:48:01 +0800
Subject: [PATCH] 04-17_改_床位名称
---
smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java | 41 ++++++++++++++---------------------------
1 files changed, 14 insertions(+), 27 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 d2345fb..a213b6b 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
@@ -257,11 +257,10 @@
public Boolean addInDeptInfo(Map dataMap) {
log.error("ServiceExternalServiceImpl---addInDeptInfo鐨勬柊澧炵殑鍊间负锛歿}", dataMap);
Map yeWuXX = (Map) dataMap.get("YeWuXX");
- List<HashMap<String, Object>> epai = ObjectUtils.isNotEmpty(yeWuXX) ? (List<HashMap<String, Object>>) yeWuXX.get("DiZhiXXList") : null;
- List<HashMap<String, Object>> epli = ObjectUtils.isNotEmpty(yeWuXX) ? (List<HashMap<String, Object>>) yeWuXX.get("LianXiRList") : null;
- List<HashMap<String, Object>> hospPatientDiagnoseInfos = ObjectUtils.isNotEmpty(yeWuXX) ? (List<HashMap<String, Object>>) yeWuXX.get("ZhenDuanList") : null;
Map<String, Object> BingRenXX = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("BingRenXX") : null;
Map<String, Object> RuKeXX = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("RuKeXX") : null;
+
+ List<HashMap<String, Object>> epai = ObjectUtils.isNotEmpty(yeWuXX) ? (List<HashMap<String, Object>>) BingRenXX.get("DiZhiXXList") : null;
ExternalInHospPatientInfo externalInHospPatientInfo = BeanUtil.mapToBean(BingRenXX, ExternalInHospPatientInfo.class, true);
ExternalInDeptPatientInfo externalInDeptPatientInfo = BeanUtil.mapToBean(RuKeXX, ExternalInDeptPatientInfo.class, true);
@@ -270,6 +269,9 @@
externalInHospPatientInfo.setZhuZhiYSID(externalInDeptPatientInfo.getZhuZhiYSID());
externalInHospPatientInfo.setZhuZhiYSXM(externalInDeptPatientInfo.getZhuZhiYSXM());
externalInHospPatientInfo.setRuYuanSJ(externalInDeptPatientInfo.getRuYuanSJ());
+ externalInHospPatientInfo.setLianXiDH(ObjectUtils.isNotEmpty(BingRenXX.get("LianXiDH")) ? BingRenXX.get("LianXiDH").toString() : null);
+ externalInHospPatientInfo.setDangQianCWID(ObjectUtils.isNotEmpty(BingRenXX.get("DangQianCWID")) ? BingRenXX.get("DangQianCWID").toString() : null);
+ externalInHospPatientInfo.setDangQianCWMC(ObjectUtils.isNotEmpty(BingRenXX.get("DangQianCWMC")) ? BingRenXX.get("DangQianCWMC").toString() : null);
ExternalInHospPatientAddrInfo externalInHospPatientAddrInfo = null;
ExternalInHospPatientLiaisonInfo externalInHospPatientLiaisonInfo = null;
@@ -292,29 +294,10 @@
return info;
}).collect(Collectors.toList());
- List<ExternalInHospPatientLiaisonInfo> epli2 = epli.stream().map(map -> {
- ExternalInHospPatientLiaisonInfo info = new ExternalInHospPatientLiaisonInfo();
- info.setLianXiRXM((String) map.get("LianXiRXM"));
- info.setLianXiRDH((String) map.get("LianXiRDH"));
- info.setGuanXiDM((String) map.get("GuanXiDM"));
- info.setGuanXiMC((String) map.get("GuanXiMC"));
- return info;
- }).collect(Collectors.toList());
- externalInHospPatientInfo.setExternalInHospPatientLiaisonInfos(epli2);
-
- List<ExternalInHospPatientDiagnoseInfo> hospPatientDiagnoseInfos2 = hospPatientDiagnoseInfos.stream().map(map -> {
- ExternalInHospPatientDiagnoseInfo info = new ExternalInHospPatientDiagnoseInfo();
- info.setZhenDuanID((String) map.get("ZhenDuanID"));
- info.setZhenDuanMC((String) map.get("ZhenDuanMC"));
- return info;
- }).collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(epai)) externalInHospPatientAddrInfo = epai2.get(0);
- if (CollectionUtils.isNotEmpty(epli)) externalInHospPatientLiaisonInfo = epli2.get(0);
- if (CollectionUtils.isNotEmpty(hospPatientDiagnoseInfos))
- externalInHospPatientDiagnoseInfo = hospPatientDiagnoseInfos2.get(0);
//鏂板鎮ｈ�呭熀鏈俊鎭�
- PatArchive patArchive = addPatArchive(externalInHospPatientInfo, externalInHospPatientAddrInfo, externalInHospPatientLiaisonInfo);
+ PatArchive patArchive = addPatArchive(externalInHospPatientInfo, externalInHospPatientAddrInfo, null);
//鏂板鎮ｈ�呭叆闄俊鎭�
Boolean aBoolean = addPadInhospInfo(externalInHospPatientInfo, patArchive, externalInHospPatientDiagnoseInfo);
return aBoolean;
@@ -526,6 +509,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 +530,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,7 +545,7 @@
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());
@@ -572,6 +557,7 @@
patMedOuthosp.setDeptcode(externalJZInfo.getJiuZhenKSID());
patMedOuthosp.setAdmitdate(externalJZInfo.getJiuZhenRQ());
patMedOuthosp.setOrgid(FaSongJGID);
+ patMedOuthosp.setHospitalname(FaSongJGMC);
for (ExternalDiagnosisInfo externalDiagnosisInfo : externalDiagnosisInfoList) {
if (externalDiagnosisInfo.getZhenDuanLBMC().equals("涓昏瘖鏂�")) {
@@ -751,7 +737,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());
@@ -939,7 +925,8 @@
patMedInhosp.setLeaveldeptcode(externalInHospPatientInfo.getDangQianKSID());
patMedInhosp.setDeptname(externalInHospPatientInfo.getDangQianKSMC());
patMedInhosp.setLeaveldeptname(externalInHospPatientInfo.getDangQianKSMC());
- patMedInhosp.setBedNo(externalInHospPatientInfo.getDangQianCWID());
+ //杩欓噷鏄簥浣嶅悕绉拌繕鏄簥浣嶇紪鍙凤紵锛燂紵锛�
+ patMedInhosp.setBedNo(externalInHospPatientInfo.getDangQianCWMC());
patMedInhosp.setOrgid(externalInHospPatientInfo.getZuZhiJGID());
patMedInhosp.setHospitaldistrictid(externalInHospPatientInfo.getDangQianBQID());
patMedInhosp.setGuid(externalInHospPatientInfo.getZuZhiJGID());
@@ -973,9 +960,9 @@
patMedInhosp.setSchemestatus(1L);
}
+ patMedInhosp.setUpdateTime(new Date());
int i = 1;
if (CollectionUtils.isNotEmpty(patMedInhospList)) {
- patMedInhosp.setUpdateTime(new Date());
patMedInhosp.setInhospid(patMedInhospList.get(0).getInhospid());
i = patMedInhospMapper.updatePatMedInhosp(patMedInhosp);
} else {
--
Gitblit v1.9.3