Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fnusa updates #48

Merged
merged 3 commits into from
Jan 25, 2024
Merged

Fnusa updates #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7bfd89e
implemented export of CXX notes field as reasonCode.text
Jan 25, 2024
f476a81
Merge remote-tracking branch 'origin/master' into fnusa-updates
Jan 25, 2024
8c87d36
FNUSA: added export of Contact details phone1 and email in patient sc…
Jan 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/groovy/projects/patientfinder/medicationAdministration.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ medicationAdministration {
}
}

note {
reasonCode {
text = context.source[medication().notes()] as String
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/groovy/projects/patientfinder/medicationRequest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ medicationRequest {
}
}

note {
reasonCode {
text = context.source[medication().notes()] as String
}

Expand Down
12 changes: 12 additions & 0 deletions src/main/groovy/projects/patientfinder/patient.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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 }
Expand Down