From 09538e3f9a0392144637d04495d5975b6d7578b8 Mon Sep 17 00:00:00 2001 From: liusheng <337615773@qq.com> Date: 星期五, 18 四月 2025 16:58:54 +0800 Subject: [PATCH] 代码提交 --- smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java | 6 ++++-- 1 files changed, 4 insertions(+), 2 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 a213b6b..695eef1 100644 --- a/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java +++ b/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java @@ -238,6 +238,7 @@ List<ExternalInHospPatientDiagnoseInfo> hospPatientDiagnoseInfos2 = hospPatientDiagnoseInfos.stream().map(map -> { ExternalInHospPatientDiagnoseInfo info = new ExternalInHospPatientDiagnoseInfo(); info.setZhenDuanID((String) map.get("ZhenDuanID")); + info.setIcd10((String) map.get("Icd10")); info.setZhenDuanMC((String) map.get("ZhenDuanMC")); return info; }).collect(Collectors.toList()); @@ -440,9 +441,10 @@ ExternalInHospPatientDiagnoseInfo info = new ExternalInHospPatientDiagnoseInfo(); info.setZhenDuanID((String) map.get("ZhenDuanID")); info.setZhenDuanMC((String) map.get("ZhenDuanMC")); + info.setIcd10((String) map.get("Icd10")); return info; }).collect(Collectors.toList()); - patMedInhosp1.setLeaveicd10code(StringUtils.isNotEmpty(patMedInhosp1.getLeaveicd10code()) ? patMedInhosp1.getLeaveicd10code() + "," + hospPatientDiagnoseInfos2.get(0).getZhenDuanID() : hospPatientDiagnoseInfos2.get(0).getZhenDuanID()); + patMedInhosp1.setLeaveicd10code(StringUtils.isNotEmpty(patMedInhosp1.getLeaveicd10code()) ? patMedInhosp1.getLeaveicd10code() + "," + hospPatientDiagnoseInfos2.get(0).getIcd10() : hospPatientDiagnoseInfos2.get(0).getIcd10()); patMedInhosp1.setLeavediagname(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() : hospPatientDiagnoseInfos2.get(0).getZhenDuanMC()); } @@ -947,7 +949,7 @@ // patMedInhosp.setIcd10code(StringUtils.isNotEmpty(patMedInhosp.getIcd10code()) ? patMedInhosp.getIcd10code() + "," + externalInHospPatientDiagnoseInfo.getZhenDuanID() : externalInHospPatientDiagnoseInfo.getZhenDuanID()); // patMedInhosp.setDiagname(StringUtils.isNotEmpty(patMedInhosp.getDiagname()) ? patMedInhosp.getDiagname() + "," + externalInHospPatientDiagnoseInfo.getZhenDuanMC() : externalInHospPatientDiagnoseInfo.getZhenDuanMC()); - patMedInhosp.setIcd10code(externalInHospPatientDiagnoseInfo.getZhenDuanID()); + patMedInhosp.setIcd10code(externalInHospPatientDiagnoseInfo.getIcd10()); patMedInhosp.setDiagname(externalInHospPatientDiagnoseInfo.getZhenDuanMC()); } -- Gitblit v1.9.3