Skip to content

Commit

Permalink
include tracecontext #18
Browse files Browse the repository at this point in the history
  • Loading branch information
@ziegm
ziegm committed May 16, 2024
1 parent 66f10e1 commit d29b2db
Show file tree
Hide file tree
Showing 12 changed files with 170 additions and 159 deletions.
22 changes: 20 additions & 2 deletions input/examples/auditevent/atc-doc-create-rep-pat.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@
</identifier>
</observer>
</source>
<!-- Patient -->
<entity>
<!-- Patient -->
<what>
<identifier>
<system value="urn:oid:2.16.756.5.30.1.127.3.10.3"></system>
Expand All @@ -83,8 +83,26 @@
<display value="Patient"></display>
</role>
</entity>
<!-- Trace context -->
<entity>
<what>
<identifier>
<value value="00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-00"/>
</identifier>
</what>
<type>
<system value="http://terminology.hl7.org/CodeSystem/audit-entity-type"/>
<code value="4"/>
<display value="Other"/>
</type>
<role>
<system value="http://terminology.hl7.org/CodeSystem/object-role"/>
<code value="26"/>
<display value="Processing Element"/>
</role>
</entity>
<!-- Document -->
<entity>
<!-- Document -->
<what>
<identifier>
<type>
Expand Down
22 changes: 20 additions & 2 deletions input/examples/auditevent/atc-doc-read-ass-hpc.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,9 @@
</identifier>
</observer>
</source>
<!-- Patient -->
<entity>
<what>
<!-- Patient -->
<identifier>
<system value="urn:oid:2.16.756.5.30.1.127.3.10.3"></system>
<value value="761337610469261945"></value>
Expand All @@ -99,9 +99,27 @@
<display value="Patient"></display>
</role>
</entity>
<!-- Trace context -->
<entity>
<what>
<identifier>
<value value="00-abcdef12345678d90abcdef123456789-deadbeefdeadbeef-00"/>
</identifier>
</what>
<type>
<system value="http://terminology.hl7.org/CodeSystem/audit-entity-type"/>
<code value="4"/>
<display value="Other"/>
</type>
<role>
<system value="http://terminology.hl7.org/CodeSystem/object-role"/>
<code value="26"/>
<display value="Processing Element"/>
</role>
</entity>
<!-- Document -->
<entity>
<what>
<!-- Document -->
<identifier>
<type>
<coding>
Expand Down
22 changes: 20 additions & 2 deletions input/examples/auditevent/atc-doc-search.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@
</identifier>
</observer>
</source>
<!-- Patient -->
<entity>
<!-- Patient -->
<what>
<identifier>
<system value="urn:oid:2.16.756.5.30.1.127.3.10.3" />
Expand All @@ -82,8 +82,26 @@
<display value="Patient"/>
</role>
</entity>
<!-- Trace context -->
<entity>
<what>
<identifier>
<value value="00-0123456789abcdef0123456789abcdef-abcdef0123456789-00"/>
</identifier>
</what>
<type>
<system value="http://terminology.hl7.org/CodeSystem/audit-entity-type"/>
<code value="4"/>
<display value="Other"/>
</type>
<role>
<system value="http://terminology.hl7.org/CodeSystem/object-role"/>
<code value="26"/>
<display value="Processing Element"/>
</role>
</entity>
<!-- Query -->
<entity>
<!-- Query -->
<what>
<identifier>
<system value="urn:ietf:rfc:3986" />
Expand Down
27 changes: 21 additions & 6 deletions input/examples/auditevent/atc-hpd-group-entry-notify.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,8 @@
</identifier>
</observer>
</source>

<!-- Patient -->
<entity>
<!-- Patient -->
<what>
<identifier>
<system value="urn:oid:2.16.756.5.30.1.127.3.10.3" />
Expand All @@ -54,9 +53,26 @@
<display value="Patient"/>
</role>
</entity>

<!-- Trace context -->
<entity>
<what>
<identifier>
<value value="00-9876543210abcdef9876543210abcdef-fedcba9876543210-00"/>
</identifier>
</what>
<type>
<system value="http://terminology.hl7.org/CodeSystem/audit-entity-type"/>
<code value="4"/>
<display value="Other"/>
</type>
<role>
<system value="http://terminology.hl7.org/CodeSystem/object-role"/>
<code value="26"/>
<display value="Processing Element"/>
</role>
</entity>
<!-- Healthcare professional -->
<entity>
<!-- Healthcare professional -->
<what>
<identifier>
<system value="urn:oid:2.51.1.3"/>
Expand All @@ -75,9 +91,8 @@
</role>
<name value="Dr. med. Sabine Musterfrau"/>
</entity>

<!-- Group -->
<entity>
<!-- Group -->
<what>
<identifier>
<value value="urn:oid:1.1.1.1.1"/>
Expand Down
20 changes: 19 additions & 1 deletion input/examples/auditevent/atc-log-read.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@
</identifier>
</observer>
</source>
<!-- Patient -->
<entity>
<what>
<!-- Patient -->
<identifier>
<system value="urn:oid:2.16.756.5.30.1.127.3.10.3"></system>
<value value="761337610469261945"></value>
Expand All @@ -59,4 +59,22 @@
<display value="Patient"></display>
</role>
</entity>
<!-- Trace context -->
<entity>
<what>
<identifier>
<value value="00-112233445566778899aabbccddeeff00-0011223344556677-00"/>
</identifier>
</what>
<type>
<system value="http://terminology.hl7.org/CodeSystem/audit-entity-type"/>
<code value="4"/>
<display value="Other"/>
</type>
<role>
<system value="http://terminology.hl7.org/CodeSystem/object-role"/>
<code value="26"/>
<display value="Processing Element"/>
</role>
</entity>
</AuditEvent>
22 changes: 20 additions & 2 deletions input/examples/auditevent/atc-pol-create-acc-right.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
</identifier>
</observer>
</source>
<!-- Patient -->
<entity>
<!-- Patient -->
<what>
<identifier>
<system value="urn:oid:2.16.756.5.30.1.127.3.10.3"></system>
Expand All @@ -59,8 +59,26 @@
<display value="Patient"></display>
</role>
</entity>
<!-- Trace context -->
<entity>
<what>
<identifier>
<value value="00-abcdef0123456789adbcdef012345678-abcdabcdabcdabcd-00"/>
</identifier>
</what>
<type>
<system value="http://terminology.hl7.org/CodeSystem/audit-entity-type"/>
<code value="4"/>
<display value="Other"/>
</type>
<role>
<system value="http://terminology.hl7.org/CodeSystem/object-role"/>
<code value="26"/>
<display value="Processing Element"/>
</role>
</entity>
<!-- Resource -->
<entity>
<!-- Resource -->
<what>
<identifier>
<system value="urn:oid:2.51.1.3"></system>
Expand Down
24 changes: 21 additions & 3 deletions input/examples/auditevent/atc-pol-create-rep.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@
<observer>
<identifier>
<system value="urn:ietf:rfc:3986"></system>
<!-- oid of system generating this audit event -->
<!-- oid of system generating this audit event -->
<value value="urn:oid:7.8.9.10.12"></value>
</identifier>
</observer>
</source>
<!-- Patient -->
<entity>
<what>
<!-- Patient -->
<identifier>
<system value="urn:oid:2.16.756.5.30.1.127.3.10.3"></system>
<value value="761337610469261945"></value>
Expand All @@ -59,8 +59,26 @@
<display value="Patient"></display>
</role>
</entity>
<!-- Trace context -->
<entity>
<what>
<identifier>
<value value="00-abcdef012345d6789abcdef012345678-abcdabcdabcdabcd-00"/>
</identifier>
</what>
<type>
<system value="http://terminology.hl7.org/CodeSystem/audit-entity-type"/>
<code value="4"/>
<display value="Other"/>
</type>
<role>
<system value="http://terminology.hl7.org/CodeSystem/object-role"/>
<code value="26"/>
<display value="Processing Element"/>
</role>
</entity>
<!-- Resource -->
<entity>
<!-- Resource -->
<type>
<system value="http://terminology.hl7.org/CodeSystem/audit-entity-type"></system>
<code value="2"></code>
Expand Down
1 change: 1 addition & 0 deletions input/pagecontent/changelog.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ All significant changes to this FHIR implementation guide will be documented on

#### Added
* Integration of volume 1, 2 and 3 from 'Ergänzung 2.2 zu Anhang 5 EPDV-EDI' in consideration of CP 'EPDBEP-244' [#12](https://github.com/ehealthsuisse/ch-atc/issues/12)
* Add tracecontext by using ChEprFhirAuditEvent as parent profile for all AuditEvent profiles in CH ATC [#18](https://github.com/ehealthsuisse/ch-atc/issues/18)

#### Changed / Updated
* Updated the IG dependencies to the current published versions
Expand Down
66 changes: 17 additions & 49 deletions input/resources/structuredefinition/AccessAuditTrailEvent.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<kind value="resource"/>
<abstract value="false"/>
<type value="AuditEvent"/>
<baseDefinition value="http://hl7.org/fhir/StructureDefinition/AuditEvent"/>
<baseDefinition value="http://fhir.ch/ig/ch-epr-fhir/StructureDefinition/ch-epr-fhir-auditevent"/>
<derivation value="constraint"/>
<differential>
<element id="AuditEvent">
Expand Down Expand Up @@ -162,54 +162,22 @@
<rules value="open"/>
</slicing>
</element>

<!-- Slice Patient -->
<element id="AuditEvent.entity:Patient">
<path value="AuditEvent.entity"/>
<sliceName value="Patient"/>
<short value="Patient"/>
<min value="1"/>
<max value="1"/>
<mapping>
<identity value="ch-atc"/>
<map value="Patient"/>
</mapping>
</element>
<element id="AuditEvent.entity:Patient.what.identifier">
<path value="AuditEvent.entity.what.identifier"/>
<short value="Patient Id (EPR-SPID)"/>
<min value="1"/>
<max value="1"/>
<type>
<code value="Identifier"/>
</type>
<mapping>
<identity value="ch-atc"/>
<map value="EPR-SPID"/>
</mapping>
</element>
<element id="AuditEvent.entity:Patient.what.identifier.system">
<path value="AuditEvent.entity.what.identifier.system"/>
<min value="1"/>
<fixedUri value="urn:oid:2.16.756.5.30.1.127.3.10.3"/>
</element>
<element id="AuditEvent.entity:Patient.type">
<path value="AuditEvent.entity.type"/>
<min value="1"/>
</element>
<element id="AuditEvent.entity:Patient.type.code">
<path value="AuditEvent.entity.type.code"/>
<min value="1"/>
<fixedCode value="1"/>
</element>
<element id="AuditEvent.entity:Patient.role">
<path value="AuditEvent.entity.role"/>
<min value="1"/>
</element>
<element id="AuditEvent.entity:Patient.role.code">
<path value="AuditEvent.entity.role.code"/>
<min value="1"/>
<fixedCode value="1"/>
</element>
<element id="AuditEvent.entity:Patient">
<path value="AuditEvent.entity"/>
<sliceName value="Patient"/>
<min value="1"/>
<mapping>
<identity value="ch-atc"/>
<map value="Patient"/>
</mapping>
</element>
<element id="AuditEvent.entity:Patient.what.identifier">
<path value="AuditEvent.entity.what.identifier"/>
<mapping>
<identity value="ch-atc"/>
<map value="EPR-SPID"/>
</mapping>
</element>
</differential>
</StructureDefinition>
Loading

0 comments on commit d29b2db

Please sign in to comment.