#359: fix DICOM to FHIR translation

oehf · Jul 22, 2021 · 2e38a85 · 2e38a85
1 parent 0440c86
commit 2e38a85
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/...groovy/org/openehealth/ipf/commons/ihe/fhir/atna/translation/AuditRecordTranslator.groovy b/...groovy/org/openehealth/ipf/commons/ihe/fhir/atna/translation/AuditRecordTranslator.groovy
@@ -97,8 +97,8 @@ class AuditRecordTranslator implements ToFhirTranslator<AuditMessage> {
     static AuditEvent.AuditEventEntityComponent participantObject(ParticipantObjectIdentificationType atna) {
         AuditEvent.AuditEventEntityComponent fhir = new AuditEvent.AuditEventEntityComponent()
         fhir.what = new Reference().setIdentifier(new Identifier(
-                value: atna.participantObjectID
-                /*type: codeableConcept(atna.participantObjectIDTypeCode)*/))
+                value: atna.participantObjectID,
+                type: codeableConcept(atna.participantObjectIDTypeCode)))
         fhir.type = codingEnum(new AuditEntityTypeEnumFactory().fromCode(Short.toString(atna.participantObjectTypeCode.value)))
         fhir.role = codingEnum(new ObjectRoleEnumFactory().fromCode(Short.toString(atna.participantObjectTypeCodeRole.value)))
         atna.participantObjectDetails.each {

diff --git a/...vy/org/openehealth/ipf/commons/ihe/fhir/atna/translation/AuditRecordTranslatorTest.groovy b/...vy/org/openehealth/ipf/commons/ihe/fhir/atna/translation/AuditRecordTranslatorTest.groovy
@@ -59,6 +59,10 @@ class AuditRecordTranslatorTest {
         AuditRecordTranslator translator = new AuditRecordTranslator()
         AuditEvent auditEvent = translator.translate(auditMessage)
         log.debug('FHIR Resource:\n{}\n', FHIR_CONTEXT.newXmlParser().setPrettyPrint(true).encodeResourceToString(auditEvent))
+
+        auditEvent.entity.each { entity ->
+            assert entity.what.identifier.type != null
+        }
     }
 
     static AuditMessage createAuditMessage1() {