From 7bfd89e12fe934f8f09b5202b938388de46e5308 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20K=C3=BCttner?= Date: Thu, 25 Jan 2024 11:08:17 +0100 Subject: [PATCH 1/2] implemented export of CXX notes field as reasonCode.text --- .../projects/patientfinder/medicationAdministration.groovy | 2 +- src/main/groovy/projects/patientfinder/medicationRequest.groovy | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/groovy/projects/patientfinder/medicationAdministration.groovy b/src/main/groovy/projects/patientfinder/medicationAdministration.groovy index fb5f4764..a9c8447b 100644 --- a/src/main/groovy/projects/patientfinder/medicationAdministration.groovy +++ b/src/main/groovy/projects/patientfinder/medicationAdministration.groovy @@ -115,7 +115,7 @@ medicationAdministration { } } - note { + reasonCode { text = context.source[medication().notes()] as String } diff --git a/src/main/groovy/projects/patientfinder/medicationRequest.groovy b/src/main/groovy/projects/patientfinder/medicationRequest.groovy index e0411879..c6163733 100644 --- a/src/main/groovy/projects/patientfinder/medicationRequest.groovy +++ b/src/main/groovy/projects/patientfinder/medicationRequest.groovy @@ -179,7 +179,7 @@ medicationRequest { } } - note { + reasonCode { text = context.source[medication().notes()] as String } From 8c87d36457da769391df7ab05377222ed1de6a1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20K=C3=BCttner?= Date: Thu, 25 Jan 2024 12:37:32 +0100 Subject: [PATCH 2/2] FNUSA: added export of Contact details phone1 and email in patient script --- .../groovy/projects/patientfinder/patient.groovy | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/main/groovy/projects/patientfinder/patient.groovy b/src/main/groovy/projects/patientfinder/patient.groovy index 9bcf9669..7094d6bc 100644 --- a/src/main/groovy/projects/patientfinder/patient.groovy +++ b/src/main/groovy/projects/patientfinder/patient.groovy @@ -7,6 +7,7 @@ import de.kairos.fhir.centraxx.metamodel.Ethnicity import de.kairos.fhir.centraxx.metamodel.MultilingualEntry import de.kairos.fhir.centraxx.metamodel.PatientAddress import de.kairos.fhir.centraxx.metamodel.enums.GenderType +import org.hl7.fhir.r4.model.codesystems.ContactPointSystem import static de.kairos.fhir.centraxx.metamodel.AbstractCode.CODE import static de.kairos.fhir.centraxx.metamodel.AbstractIdContainer.ID_CONTAINER_TYPE @@ -15,6 +16,7 @@ import static de.kairos.fhir.centraxx.metamodel.IdContainerType.DECISIVE import static de.kairos.fhir.centraxx.metamodel.PatientMaster.GENDER_TYPE import static de.kairos.fhir.centraxx.metamodel.RootEntities.patient import static de.kairos.fhir.centraxx.metamodel.RootEntities.patientMasterDataAnonymous + /** * Represented by a CXX PatientMasterDataAnonymous * Specified: http://www.hl7.org/fhir/us/core/StructureDefinition-us-core-patient.html @@ -83,6 +85,16 @@ patient { line lineString } } + contact { + telecom { + system = ContactPointSystem.PHONE.toCode() + value = ad[PatientAddress.PHONE1] + } + telecom { + system = ContactPointSystem.EMAIL.toCode() + value = ad[PatientAddress.EMAIL] + } + } } final def firstEthnicity = context.source[patient().patientContainer().ethnicities()].find { final def ethnicity -> ethnicity != null }