Skip to content

Commit

Permalink
Merge pull request #22 from ehealthsuisse/integrationA5E2.2
Browse files Browse the repository at this point in the history
integration A5E2.2
  • Loading branch information
oliveregger committed May 16, 2024
2 parents 97a2560 + d29b2db commit 4b9ad70
Show file tree
Hide file tree
Showing 31 changed files with 1,403 additions and 248 deletions.
37 changes: 31 additions & 6 deletions input/ch.fhir.ig.ch-atc.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,17 @@
<copyright value="CC0-1.0" />
<packageId value="ch.fhir.ig.ch-atc"/>
<fhirVersion value="4.0.1" />
<dependsOn id="cheprterm">
<dependsOn id="chterm">
<uri value="http://fhir.ch/ig/ch-term/ImplementationGuide/ch.fhir.ig.ch-term"/>
<packageId value="ch.fhir.ig.ch-term"/>
<!-- <version value="2.0.x"/> -->
<version value="current"/>
</dependsOn>
<dependsOn id="cheprfhir">
<uri value="http://fhir.ch/ig/ch-epr-fhir/ImplementationGuide/ch.fhir.ig.ch-epr-fhir"/>
<packageId value="ch.fhir.ig.ch-epr-fhir"/>
<version value="current"/>
</dependsOn>
<dependsOn id="hl7terminology">
<uri value="http://terminology.hl7.org/ImplementationGuide/hl7.terminology"/>
<packageId value="hl7.terminology"/>
Expand Down Expand Up @@ -212,8 +217,8 @@
<reference>
<reference value="Bundle/ch-atc-iti-81-response-sample" />
</reference>
<name value="CH ATC -Reponse Audit Trail" />
<description value="CH ATC -Reponse Audit Trail" />
<name value="CH ATC - Reponse Audit Trail" />
<description value="CH ATC - Reponse Audit Trail" />
<exampleCanonical value="http://fhir.ch/ig/ch-atc/StructureDefinition/CH-ATC.ITI-81.Response" />
</resource>

Expand All @@ -227,19 +232,39 @@
<title value="Home"/>
<generation value="markdown"/>
</page>
<page>
<nameUrl value="volume-1.html"/>
<title value="Volume 1 - Integration Profiles"/>
<generation value="markdown"/>
</page>
<page>
<nameUrl value="volume-2.html"/>
<title value="Volume 2 - Transactions"/>
<generation value="markdown"/>
</page>
<page>
<nameUrl value="volume-3.html"/>
<title value="Volume 3 - Content Profiles"/>
<generation value="markdown"/>
</page>
<page>
<nameUrl value="profiles.html"/>
<title value="Profiles"/>
<generation value="html"/>
<generation value="markdown"/>
</page>
<page>
<nameUrl value="terminology.html"/>
<title value="Terminology"/>
<generation value="html"/>
<generation value="markdown"/>
</page>
<page>
<nameUrl value="searchparameters.html"/>
<title value="Search Parameters"/>
<generation value="markdown"/>
</page>
<page>
<nameUrl value="changelog.html"/>
<title value="Change Log"/>
<title value="Changelog"/>
<generation value="markdown"/>
</page>
</page>
Expand Down
4 changes: 2 additions & 2 deletions input/data/features.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ feedback:
# active: true
# tagId: G-ED8VLFMEVY
css:
navbar: 1F4D85
title: 1179BF
navbar: 144b8a
title: 4fa2da
35 changes: 27 additions & 8 deletions input/examples/auditevent/atc-doc-create-rep-pat.xml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<AuditEvent xmlns="http://hl7.org/fhir">
<id value="atc-doc-create-rep-pat"></id>
<id value="atc-doc-create-rep-pat"/>
<meta>
<profile value="http://fhir.ch/ig/ch-atc/StructureDefinition/DocumentAuditEvent"></profile>
</meta>
<text>
<status value="generated"></status>
<div xmlns="http://www.w3.org/1999/xhtml">Upload of Record artifcat 10.10.2020 18:29 from Julia Helfe-Gern on behalf of Jakob Wieder-Gesund </div>
<div xmlns="http://www.w3.org/1999/xhtml">Upload of Record Artifact 10.10.2020 18:29 from Julia Helfe-Gern on behalf of Jakob Wieder-Gesund </div>
</text>
<type>
<system value="http://dicom.nema.org/resources/ontology/DCM"></system>
Expand Down Expand Up @@ -52,19 +52,20 @@
<value value="761322222222222222"></value>
</identifier>
</who>
<name value="Julia Helfe Gern"></name>
<name value="Julia Helfe-Gern"></name>
<requestor value="true"></requestor>
</agent>
<source>
<observer>
<identifier>
<system value="urn:ietf:rfc:3986"></system>
<!-- oid of system generating this audit event -->
<value value="urn:oid:7.8.9.10.11"></value>
</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 @@ -82,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 All @@ -110,17 +129,17 @@
<detail>
<type value="Repository Unique Id"></type>
<valueBase64Binary value="MS4yLjM="></valueBase64Binary>
<!-- base64 of OID eg 1.2.3 == -->
<!-- base64 of OID eg 1.2.3 == -->
</detail>
<detail>
<type value="homeCommunityID"></type>
<valueBase64Binary value="NS42LjcuOA=="></valueBase64Binary>
<!-- base64 of OID URN homeCommunityId e.g. 5.6.7.8 -->
<!-- base64 of OID URN homeCommunityId e.g. 5.6.7.8 -->
</detail>
<detail>
<type value="EprDocumentTypeCode"></type>
<valueBase64Binary value="NDE5ODkxMDA4"></valueBase64Binary>
<!-- base64 typeCode 419891008 -->
<!-- base64 typeCode 419891008 -->
</detail>
<detail>
<type value="title"></type>
Expand Down
24 changes: 21 additions & 3 deletions input/examples/auditevent/atc-doc-read-ass-hpc.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</meta>
<text>
<status value="generated"></status>
<div xmlns="http://www.w3.org/1999/xhtml">Document retrieval of record artifact from Regula Fischer 20.10.2020 14:29 on behalf of Dr. med. Hans Allzeitbereit, Member of group Labor 1 Bertaspital, Emergency Access </div>
<div xmlns="http://www.w3.org/1999/xhtml">Document retrieval of record artifact from Regula Fischer 20.10.2020 14:29 on behalf of Dr. med. Hans Allzeitbereit, Member of group Labor 1 Bertaspital, Emergency Access </div>
</text>
<type>
<system value="http://dicom.nema.org/resources/ontology/DCM"></system>
Expand Down 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
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
29 changes: 22 additions & 7 deletions input/examples/auditevent/atc-hpd-group-entry-notify.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<text>
<status value="generated"/>
<div xmlns="http://www.w3.org/1999/xhtml">
10.10.2020 10:05: Healthcare professional Dr. med. Sabine Musterfrau has been added to Group Kardiologie Universitätsspital Musterstadt and patient Jakob Wieder-Gesund has been notified
10.10.2020 10:05: Healthcare professional Dr. med. Sabine Musterfrau has been added to Group Kardiologie Universitätsspital Musterstadt and patient Jakob Wieder-Gesund has been notified
</div>
</text>
<type>
Expand Down 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
22 changes: 20 additions & 2 deletions input/examples/auditevent/atc-log-read.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</meta>
<text>
<status value="generated"></status>
<div xmlns="http://www.w3.org/1999/xhtml">Jakob Wieder-Gesund has viewed the audit trail 22.09.2020 10:47 </div>
<div xmlns="http://www.w3.org/1999/xhtml">Jakob Wieder-Gesund accessed the audit trail 22.09.2020 10:47 </div>
</text>
<type>
<system value="http://dicom.nema.org/resources/ontology/DCM"></system>
Expand Down 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>
Loading

0 comments on commit 4b9ad70

Please sign in to comment.