From 7913a655b4f017eea4e8f95e34232143f92ecaaf Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 21 三月 2025 18:22:08 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java | 43 +++++++++++++++++++++++++++++++------------
1 files changed, 31 insertions(+), 12 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 9b68c57..2b2cc4e 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
@@ -246,6 +246,10 @@
PatMedInhosp patMedInhosp = new PatMedInhosp();
patMedInhosp.setInhospno(externalInHospPatientInfo.getZhuYuanHao());
List<PatMedInhosp> patMedInhospList = patMedInhospMapper.selectPatMedInhospList(patMedInhosp);
+ for (PatMedInhosp patMedInhosp1 : patMedInhospList) {
+ String tagname = patMedInhospMapper.getTagnameBypatid(patMedInhosp1.getPatid());
+ patMedInhosp1.setTagname(tagname);
+ }
if (CollectionUtils.isNotEmpty(patMedInhospList)) {
Map<String, Object> JiuZhenXX = (Map<String, Object>) yeWuXX.get("JiuZhenXX");
PatMedInhosp patMedInhosp1 = patMedInhospList.get(0);
@@ -309,7 +313,10 @@
PatMedInhosp patMedInhosp = new PatMedInhosp();
patMedInhosp.setInhospno(externalInHospPatientInfo.getZhuYuanHao());
List<PatMedInhosp> patMedInhospList = patMedInhospMapper.selectPatMedInhospList(patMedInhosp);
-
+ for (PatMedInhosp patMedInhosp1 : patMedInhospList) {
+ String tagname = patMedInhospMapper.getTagnameBypatid(patMedInhosp1.getPatid());
+ patMedInhosp1.setTagname(tagname);
+ }
Map<String, Object> JiuZhenXX = (Map<String, Object>) yeWuXX.get("JiuZhenXX");
PatMedInhosp patMedInhosp1 = new PatMedInhosp();
if (CollectionUtils.isNotEmpty(patMedInhospList)) patMedInhosp1 = patMedInhospList.get(0);
@@ -373,6 +380,10 @@
PatMedInhosp patMedInhosp = new PatMedInhosp();
patMedInhosp.setInhospno(externalInHospPatientInfo.getZhuYuanHao());
List<PatMedInhosp> patMedInhospList = patMedInhospMapper.selectPatMedInhospList(patMedInhosp);
+ for (PatMedInhosp patMedInhosp1 : patMedInhospList) {
+ String tagname = patMedInhospMapper.getTagnameBypatid(patMedInhosp1.getPatid());
+ patMedInhosp1.setTagname(tagname);
+ }
if (CollectionUtils.isNotEmpty(patMedInhospList)) {
Map<String, Object> JiuZhenXX = (Map<String, Object>) yeWuXX.get("JiuZhenXX");
PatMedInhosp patMedInhosp1 = patMedInhospList.get(0);
@@ -390,11 +401,17 @@
public Boolean addFinshJZInfo(Map dataMap) {
log.error("ServiceExternalServiceImpl---addFinshJZInfo鐨勬柊澧炵殑鍊间负锛歿}", dataMap);
Map yeWuXX = (Map) dataMap.get("YeWuXX");
+ Map XiaoXiTou = (Map) dataMap.get("XiaoXiTou");
+ String FaSongJGID = ObjectUtils.isNotEmpty(XiaoXiTou.get("FaSongJGID")) ? XiaoXiTou.get("FaSongJGID").toString() : null;
+
Map<String, Object> BingRenXX = (Map<String, Object>) yeWuXX.get("BingRenXX");
Map<String, Object> JiuZhenXX = (Map<String, Object>) yeWuXX.get("JiuZhenXX");
List<HashMap<String, Object>> ZhenDuanList = (List<HashMap<String, Object>>) yeWuXX.get("ZhenDuanList");
List<HashMap<String, Object>> externalWZInfos = (List<HashMap<String, Object>>) yeWuXX.get("WenZhenList");
ExternalInHospPatientInfo externalInHospPatientInfo = BeanUtil.mapToBean(BingRenXX, ExternalInHospPatientInfo.class, true);
+ //鐥呬汉淇℃伅閲屾病鏈夌粍缁囨満鏋処D
+ externalInHospPatientInfo.setZuZhiJGID(FaSongJGID);
+
ExternalJZInfo externalJZInfo = BeanUtil.mapToBean(JiuZhenXX, ExternalJZInfo.class, true);
List<ExternalDiagnosisInfo> externalDiagnosisInfoList = ZhenDuanList.stream().map(map -> {
ExternalDiagnosisInfo info = new ExternalDiagnosisInfo();
@@ -426,9 +443,6 @@
patMedOuthosp.setDeptname(externalJZInfo.getJiuZhenKSMC());
patMedOuthosp.setDeptcode(externalJZInfo.getJiuZhenKSID());
patMedOuthosp.setAdmitdate(externalJZInfo.getJiuZhenRQ());
-
- Map XiaoXiTou = (Map) dataMap.get("XiaoXiTou");
- String FaSongJGID = XiaoXiTou.get("FaSongJGID").toString();
patMedOuthosp.setOrgid(FaSongJGID);
for (ExternalDiagnosisInfo externalDiagnosisInfo : externalDiagnosisInfoList) {
@@ -437,6 +451,7 @@
patMedOuthosp.setIcd10code(externalDiagnosisInfo.getZhenDuanID());
patMedOuthosp.setDrcode(externalDiagnosisInfo.getZhenDuanYSID());
patMedOuthosp.setDrname(externalDiagnosisInfo.getZhenDuanYSXM());
+ patMedOuthosp.setIcd10code(externalDiagnosisInfo.getIcd10());
}
}
for (ExternalWZInfo externalWZInfo : ExternalWZInfoList) {
@@ -465,19 +480,23 @@
String FaSongJGID = XiaoXiTou.get("FaSongJGID").toString();
Icd10 icd10 = new Icd10();
icd10.setIcdcode(externalDiseaseInfo.getIcD10());
+ icd10.setDelFlag("0");
+ icd10.setOrgid(FaSongJGID);
+ //閫氳繃icdCode鏌ヨ涓�涓嬶紝鏄惁瀛樺湪
+ List<Icd10> icd10s = icd10Mapper.selectIcd10List(icd10);
icd10.setHisIcdid(externalDiseaseInfo.getJiBingID());
icd10.setIcdname(externalDiseaseInfo.getJiBingMC());
icd10.setGuid(externalDiseaseInfo.getZuZhiJGID());
icd10.setLastflag(externalDiseaseInfo.getMOJIBZ());
icd10.setChimedflag("" + externalDiseaseInfo.getZhongYiZDBZ());
- icd10.setOrgid(FaSongJGID);
-// icd10Association.setIcd10AssortName(externalDiseaseInfo.getJiBingFLMC());
-// icd10Association.setChineseMedicineDiagnoseSign(externalDiseaseInfo.getZhongYiZDBZ());
-// icd10Association.setChineseMedicineDiagnoseAssortCode(externalDiseaseInfo.getZhongYiZDFLDM());
-// icd10Association.setChineseMedicineDiagnoseAssortName(externalDiseaseInfo.getZhongYiZDFLMC());
-// icd10Association.setOutpatientUseAssort(externalDiseaseInfo.getMenZhenSYBZ());
-// icd10Association.setInpatientUseAssort(externalDiseaseInfo.getZhuYuanSYBZ());
- icd10Mapper.insertIcd10(icd10);
+ if (CollectionUtils.isNotEmpty(icd10s)) {
+ icd10.setUpdateTime(new Date());
+ icd10.setIcdid(icd10s.get(0).getIcdid());
+ icd10Mapper.updateIcd10(icd10);
+ } else {
+ icd10.setCreateTime(new Date());
+ icd10Mapper.insertIcd10(icd10);
+ }
return true;
}
--
Gitblit v1.9.3