From 235cf590b8ac4c77d0a9a715d026bc591d9df133 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期二, 15 九月 2026 15:31:33 +0800
Subject: [PATCH] 【丽水】采集处理只有诊断名称没有诊断码的数据
---
smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 50 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 e7c2dc4..1bb31fa 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
@@ -647,6 +647,21 @@
}).collect(Collectors.toList());
patMedInhosp1.setLeaveicd10code(hospPatientDiagnoseInfos2.get(0).getIcd10());
patMedInhosp1.setLeavediagname(hospPatientDiagnoseInfos2.get(0).getZhenDuanMC());
+ //鍙湁璇婃柇鍚嶇О娌℃湁璇婃柇鐮佺殑鏁版嵁
+ if(StringUtils.isNotEmpty(patMedInhosp1.getLeavediagname())
+ && !StringUtils.isNotEmpty(patMedInhosp1.getLeaveicd10code())){
+ Icd10 icd10 = new Icd10();
+ icd10.setIcdname(patMedInhosp1.getLeavediagname());
+ icd10.setDelFlag("0");
+ icd10.setOrgid(ObjectUtils.isNotEmpty(BingRenXX.get("ZuZhiJGID")) ? BingRenXX.get("ZuZhiJGID").toString() : null);
+ //涓芥按鏃犻櫌鍖猴紝榛樿鍊兼槸 1
+ icd10.setCampusid("1");
+ //閫氳繃icdCode鏌ヨ涓�涓嬶紝鏄惁瀛樺湪
+ List<Icd10> icd10s = icd10Mapper.exactQueryIcd10List(icd10);
+ if(CollectionUtils.isEmpty(icd10s)){
+ patMedInhosp1.setLeaveicd10code(icd10s.get(0).getIcdcode());
+ }
+ }
//patMedInhosp1.setDiagname(StringUtils.isNotEmpty(patMedInhosp1.getLeavediagname()) ? patMedInhosp1.getLeavediagname() + "," + hospPatientDiagnoseInfos2.get(0).getZhenDuanMC() : hospPatientDiagnoseInfos2.get(0).getZhenDuanMC());
patMedInhosp1.setDiagname(StringUtils.isNotEmpty(patMedInhosp1.getLeavediagname()) ? patMedInhosp1.getLeavediagname() : hospPatientDiagnoseInfos2.get(0).getZhenDuanMC());
}
@@ -812,16 +827,31 @@
}).collect(Collectors.toList());
patMedInhosp1.setLeaveicd10code(hospPatientDiagnoseInfos2.get(0).getIcd10());
patMedInhosp1.setLeavediagname(hospPatientDiagnoseInfos2.get(0).getZhenDuanMC());
+ //鍙湁璇婃柇鍚嶇О娌℃湁璇婃柇鐮佺殑鏁版嵁
+ if(StringUtils.isNotEmpty(patMedInhosp1.getLeavediagname())
+ && !StringUtils.isNotEmpty(patMedInhosp1.getLeaveicd10code())){
+ Icd10 icd10 = new Icd10();
+ icd10.setIcdname(patMedInhosp1.getLeavediagname());
+ icd10.setDelFlag("0");
+ icd10.setOrgid(ObjectUtils.isNotEmpty(BingRenXX.get("ZuZhiJGID")) ? BingRenXX.get("ZuZhiJGID").toString() : null);
+ //涓芥按鏃犻櫌鍖猴紝榛樿鍊兼槸 1
+ icd10.setCampusid("1");
+ //閫氳繃icdCode鏌ヨ涓�涓嬶紝鏄惁瀛樺湪
+ List<Icd10> icd10s = icd10Mapper.exactQueryIcd10List(icd10);
+ if(CollectionUtils.isEmpty(icd10s)){
+ patMedInhosp1.setLeaveicd10code(icd10s.get(0).getIcdcode());
+ }
+ }
//patMedInhosp1.setDiagname(StringUtils.isNotEmpty(patMedInhosp1.getLeavediagname()) ? patMedInhosp1.getLeavediagname() + "," + hospPatientDiagnoseInfos2.get(0).getZhenDuanMC() : hospPatientDiagnoseInfos2.get(0).getZhenDuanMC());
patMedInhosp1.setDiagname(StringUtils.isNotEmpty(patMedInhosp1.getLeavediagname()) ? patMedInhosp1.getLeavediagname() : hospPatientDiagnoseInfos2.get(0).getZhenDuanMC());
}
String orgid = ObjectUtils.isNotEmpty(BingRenXX) && ObjectUtils.isNotEmpty(BingRenXX.get("ZuZhiJGID")) ? BingRenXX.get("ZuZhiJGID").toString() : null;
- if(StringUtils.isNotEmpty(orgid) && orgid.equals("47246103233112211A1001")){
- //缂欎簯浜岄櫌 浣忛櫌璁板綍涓嶆洿鏂扮姸鎬�
- }else {
- patMedInhosp1.setInhospstate("1");
- }
+// if(StringUtils.isNotEmpty(orgid) && orgid.equals("47246103233112211A1001")){
+// //缂欎簯浜岄櫌 浣忛櫌璁板綍涓嶆洿鏂扮姸鎬�
+// }else {
+// patMedInhosp1.setInhospstate("1");
+// }
if (CollectionUtils.isNotEmpty(patMedInhospList)) {
patMedInhosp1.setUpdateTime(new Date());
@@ -1031,6 +1061,21 @@
}).collect(Collectors.toList());
patMedInhosp1.setLeaveicd10code(hospPatientDiagnoseInfos2.get(0).getIcd10());
patMedInhosp1.setLeavediagname(hospPatientDiagnoseInfos2.get(0).getZhenDuanMC());
+ //鍙湁璇婃柇鍚嶇О娌℃湁璇婃柇鐮佺殑鏁版嵁
+ if(StringUtils.isNotEmpty(patMedInhosp1.getLeavediagname())
+ && !StringUtils.isNotEmpty(patMedInhosp1.getLeaveicd10code())){
+ Icd10 icd10 = new Icd10();
+ icd10.setIcdname(patMedInhosp1.getLeavediagname());
+ icd10.setDelFlag("0");
+ icd10.setOrgid(ObjectUtils.isNotEmpty(BingRenXX.get("ZuZhiJGID")) ? BingRenXX.get("ZuZhiJGID").toString() : null);
+ //涓芥按鏃犻櫌鍖猴紝榛樿鍊兼槸 1
+ icd10.setCampusid("1");
+ //閫氳繃icdCode鏌ヨ涓�涓嬶紝鏄惁瀛樺湪
+ List<Icd10> icd10s = icd10Mapper.exactQueryIcd10List(icd10);
+ if(CollectionUtils.isEmpty(icd10s)){
+ patMedInhosp1.setLeaveicd10code(icd10s.get(0).getIcdcode());
+ }
+ }
//patMedInhosp1.setDiagname(StringUtils.isNotEmpty(patMedInhosp1.getLeavediagname()) ? patMedInhosp1.getLeavediagname() + "," + hospPatientDiagnoseInfos2.get(0).getZhenDuanMC() : hospPatientDiagnoseInfos2.get(0).getZhenDuanMC());
patMedInhosp1.setDiagname(StringUtils.isNotEmpty(patMedInhosp1.getLeavediagname()) ? patMedInhosp1.getLeavediagname() : hospPatientDiagnoseInfos2.get(0).getZhenDuanMC());
}
--
Gitblit v1.9.3