Merge branch 'main' into MM-4791

# Conflicts: # resources/zib/terminology/conceptmap-AllergieCategorieCodelijst-to-AllergyIntoleranceCategory.xml
Nictiz · Aug 28, 2023 · 335f7bc · 335f7bc
2 parents d215f60 + 54fc999
commit 335f7bc
Show file tree

Hide file tree

Showing 145 changed files with 8,647 additions and 374 deletions.
diff --git a/.github/workflows/qa-all.yml b/.github/workflows/qa-all.yml
@@ -11,7 +11,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Zib2020 QA
-        uses: Nictiz/Nictiz-R4-QA@main
+        uses: Nictiz/Nictiz-tooling-R4-QA@alpine
         with:
           changed-only: false
-          no-tx: true
+          verbosity-level: warning
diff --git a/.github/workflows/qa-changed.yml b/.github/workflows/qa-changed.yml
@@ -11,7 +11,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Zib2020 QA
-        uses: Nictiz/Nictiz-R4-QA@main
+        uses: Nictiz/Nictiz-tooling-R4-QA@alpine
         with:
           changed-only: true
-          fail-at: "warning"
+          extensible-binding-warnings: true
diff --git a/examples/nl-core-Alert-01-Condition-01.xml b/examples/nl-core-Alert-01-Condition-01.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Condition xmlns="http://hl7.org/fhir">
+   <id value="nl-core-Alert-01-Condition-01"/>
+   <meta>
+      <profile value="http://nictiz.nl/fhir/StructureDefinition/nl-core-Problem"/>
+   </meta>
+   <clinicalStatus>
+      <coding>
+         <system value="http://terminology.hl7.org/CodeSystem/condition-clinical"/>
+         <code value="active"/>
+         <display value="Active"/>
+      </coding>
+   </clinicalStatus>
+   <verificationStatus>
+      <coding>
+         <system value="http://terminology.hl7.org/CodeSystem/condition-ver-status"/>
+         <code value="confirmed"/>
+         <display value="Confirmed"/>
+      </coding>
+      <coding>
+         <system value="http://snomed.info/sct"/>
+         <code value="410605003"/>
+         <display value="Aanwezigheid bevestigd"/>
+      </coding>
+   </verificationStatus>
+   <category>
+      <coding>
+         <system value="http://snomed.info/sct"/>
+         <code value="404684003"/>
+         <display value="Klinische bevinding"/>
+      </coding>
+   </category>
+   <code>
+      <extension url="http://nictiz.nl/fhir/StructureDefinition/ext-Problem.FurtherSpecificationProblemName">
+         <valueString value="tweeling"/>
+      </extension>
+      <coding>
+         <system value="http://snomed.info/sct"/>
+         <code value="77386006"/>
+         <display value="Klinische bevinding"/>
+      </coding>
+   </code>
+   <subject>
+      <reference value="Patient/nl-core-Patient-01"/>
+      <type value="Patient"/>
+      <display value="Patient, Johanna Petronella Maria (Jo) van Putten-van der Giessen"/>
+   </subject>
+   <onsetDateTime value="2012-09-15"/>
+</Condition>
diff --git a/examples/nl-core-Alert-01.xml b/examples/nl-core-Alert-01.xml
@@ -29,7 +29,7 @@
    <subject>
       <reference value="Patient/nl-core-Patient-01"/>
       <type value="Patient"/>
-      <display value="Patient, Johanna Petronella Maria J.P.M. Jo van Putten van der Giessen"/>
+      <display value="Patient, Johanna Petronella Maria (Jo) van Putten-van der Giessen"/>
    </subject>
    <period>
       <start value="2012-09-15"/>

diff --git a/examples/nl-core-Alert-02.xml b/examples/nl-core-Alert-02.xml
@@ -22,7 +22,7 @@
    <subject>
       <reference value="Patient/nl-core-Patient-01"/>
       <type value="Patient"/>
-      <display value="Patient, Johanna Petronella Maria J.P.M. Jo van Putten van der Giessen"/>
+      <display value="Patient, Johanna Petronella Maria (Jo) van Putten-van der Giessen"/>
    </subject>
    <period>
       <start value="2010-06-01"/>

diff --git a/examples/nl-core-AllergyIntolerance-01.xml b/examples/nl-core-AllergyIntolerance-01.xml
@@ -43,7 +43,7 @@
    <patient>
       <reference value="Patient/nl-core-Patient-01"/>
       <type value="Patient"/>
-      <display value="Patient, Johanna Petronella Maria J.P.M. Jo van Putten van der Giessen"/>
+      <display value="Patient, Johanna Petronella Maria (Jo) van Putten-van der Giessen"/>
    </patient>
    <onsetDateTime value="2008-11-08"/>
    <lastOccurrence value="2009-11-15"/>

diff --git a/examples/nl-core-AllergyIntolerance-02.xml b/examples/nl-core-AllergyIntolerance-02.xml
@@ -43,7 +43,7 @@
    <patient>
       <reference value="Patient/nl-core-Patient-01"/>
       <type value="Patient"/>
-      <display value="Patient, Johanna Petronella Maria J.P.M. Jo van Putten van der Giessen"/>
+      <display value="Patient, Johanna Petronella Maria (Jo) van Putten-van der Giessen"/>
    </patient>
    <onsetDateTime value="1995-01-01"/>
    <lastOccurrence value="1998-06-02"/>

diff --git a/examples/nl-core-BarthelADLIndex-01.xml b/examples/nl-core-BarthelADLIndex-01.xml
@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Observation xmlns="http://hl7.org/fhir">
+   <id value="nl-core-BarthelADLIndex-01"/>
+   <meta>
+      <profile value="http://nictiz.nl/fhir/StructureDefinition/nl-core-BarthelADLIndex"/>
+   </meta>
+   <status value="final"/>
+   <code>
+      <coding>
+         <system value="http://snomed.info/sct"/>
+         <code value="273302005"/>
+         <display value="Barthel-index"/>
+      </coding>
+   </code>
+   <subject>
+      <reference value="Patient/nl-core-Patient-01"/>
+      <type value="Patient"/>
+      <display value="Patient, Johanna Petronella Maria (Jo) van Putten-van der Giessen"/>
+   </subject>
+   <valueInteger value="14"/>
+   <component>
+      <code>
+         <coding>
+            <system value="urn:oid:2.16.840.1.113883.2.4.3.11.60.40.4.0.1"/>
+            <code value="4002004"/>
+            <display value="BarthelIndex Darm"/>
+         </coding>
+      </code>
+      <valueCodeableConcept>
+         <coding>
+            <system value="urn:oid:2.16.840.1.113883.2.4.3.11.60.40.4.1.1"/>
+            <code value="FECAL2"/>
+            <display value="Continent"/>
+         </coding>
+      </valueCodeableConcept>
+   </component>
+   <component>
+      <code>
+         <coding>
+            <system value="urn:oid:2.16.840.1.113883.2.4.3.11.60.40.4.0.1"/>
+            <code value="4002003"/>
+            <display value="BarthelIndex Blaas"/>
+         </coding>
+      </code>
+      <valueCodeableConcept>
+         <coding>
+            <system value="urn:oid:2.16.840.1.113883.2.4.3.11.60.40.4.1.2"/>
+            <code value="URIN1"/>
+            <display value="Ongelukje"/>
+         </coding>
+      </valueCodeableConcept>
+   </component>
+   <component>
+      <code>
+         <coding>
+            <system value="urn:oid:2.16.840.1.113883.2.4.3.11.60.40.4.0.1"/>
+            <code value="4002005"/>
+            <display value="BarthelIndex UiterlijkeVerzorging"/>
+         </coding>
+      </code>
+      <valueCodeableConcept>
+         <coding>
+            <system value="urn:oid:2.16.840.1.113883.2.4.3.11.60.40.4.1.3"/>
+            <code value="GROOM1"/>
+            <display value="Onafhankelijk"/>
+         </coding>
+      </valueCodeableConcept>
+   </component>
+   <component>
+      <code>
+         <coding>
+            <system value="urn:oid:2.16.840.1.113883.2.4.3.11.60.40.4.0.1"/>
+            <code value="4002006"/>
+            <display value="BarthelIndex Toiletgebruik"/>
+         </coding>
+      </code>
+      <valueCodeableConcept>
+         <coding>
+            <system value="urn:oid:2.16.840.1.113883.2.4.3.11.60.40.4.1.4"/>
+            <code value="TOIL2"/>
+            <display value="Onafhankelijk"/>
+         </coding>
+      </valueCodeableConcept>
+   </component>
+   <component>
+      <code>
+         <coding>
+            <system value="urn:oid:2.16.840.1.113883.2.4.3.11.60.40.4.0.1"/>
+            <code value="4002007"/>
+            <display value="BarthelIndex Eten"/>
+         </coding>
+      </code>
+      <valueCodeableConcept>
+         <coding>
+            <system value="urn:oid:2.16.840.1.113883.2.4.3.11.60.40.4.1.5"/>
+            <code value="FEED2"/>
+            <display value="Onafhankelijk"/>
+         </coding>
+      </valueCodeableConcept>
+   </component>
+   <component>
+      <code>
+         <coding>
+            <system value="urn:oid:2.16.840.1.113883.2.4.3.11.60.40.4.0.1"/>
+            <code value="4002008"/>
+            <display value="BarthelIndex Transfers"/>
+         </coding>
+      </code>
+      <valueCodeableConcept>
+         <coding>
+            <system value="urn:oid:2.16.840.1.113883.2.4.3.11.60.40.4.1.6"/>
+            <code value="TRANS1"/>
+            <display value="Veel hulp"/>
+         </coding>
+      </valueCodeableConcept>
+   </component>
+   <component>
+      <code>
+         <coding>
+            <system value="urn:oid:2.16.840.1.113883.2.4.3.11.60.40.4.0.1"/>
+            <code value="4002009"/>
+            <display value="BarthelIndex Mobiliteit"/>
+         </coding>
+      </code>
+      <valueCodeableConcept>
+         <coding>
+            <system value="urn:oid:2.16.840.1.113883.2.4.3.11.60.40.4.1.7"/>
+            <code value="MOBIL1"/>
+            <display value="Onafhankelijk met rolstoel"/>
+         </coding>
+      </valueCodeableConcept>
+   </component>
+   <component>
+      <code>
+         <coding>
+            <system value="urn:oid:2.16.840.1.113883.2.4.3.11.60.40.4.0.1"/>
+            <code value="4002010"/>
+            <display value="BarthelIndex AanUitkleden"/>
+         </coding>
+      </code>
+      <valueCodeableConcept>
+         <coding>
+            <system value="urn:oid:2.16.840.1.113883.2.4.3.11.60.40.4.1.8"/>
+            <code value="DRESS1"/>
+            <display value="Hulp"/>
+         </coding>
+      </valueCodeableConcept>
+   </component>
+   <component>
+      <code>
+         <coding>
+            <system value="urn:oid:2.16.840.1.113883.2.4.3.11.60.40.4.0.1"/>
+            <code value="4002011"/>
+            <display value="BarthelIndex TrappenLopen"/>
+         </coding>
+      </code>
+      <valueCodeableConcept>
+         <coding>
+            <system value="urn:oid:2.16.840.1.113883.2.4.3.11.60.40.4.1.9"/>
+            <code value="CLIMB2"/>
+            <display value="Onafhankelijk"/>
+         </coding>
+      </valueCodeableConcept>
+   </component>
+   <component>
+      <code>
+         <coding>
+            <system value="urn:oid:2.16.840.1.113883.2.4.3.11.60.40.4.0.1"/>
+            <code value="4002012"/>
+            <display value="BarthelIndex BadenDouchen"/>
+         </coding>
+      </code>
+      <valueCodeableConcept>
+         <coding>
+            <system value="urn:oid:2.16.840.1.113883.2.4.3.11.60.40.4.1.10"/>
+            <code value="BATH1"/>
+            <display value="Onafhankelijk"/>
+         </coding>
+      </valueCodeableConcept>
+   </component>
+</Observation>
diff --git a/examples/nl-core-BowelFunction-01-Condition-01.xml b/examples/nl-core-BowelFunction-01-Condition-01.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Condition xmlns="http://hl7.org/fhir">
+   <id value="nl-core-BowelFunction-01-Condition-01"/>
+   <meta>
+      <profile value="http://nictiz.nl/fhir/StructureDefinition/nl-core-Stoma"/>
+   </meta>
+   <category>
+      <coding>
+         <system value="http://snomed.info/sct"/>
+         <code value="245857005"/>
+         <display value="stoma"/>
+      </coding>
+   </category>
+   <code>
+      <coding>
+         <system value="http://snomed.info/sct"/>
+         <code value="261072008"/>
+         <display value="dubbelloops colostoma"/>
+      </coding>
+   </code>
+   <bodySite>
+      <extension url="http://nictiz.nl/fhir/StructureDefinition/ext-AnatomicalLocation.Laterality">
+         <valueCodeableConcept>
+            <coding>
+               <system value="http://snomed.info/sct"/>
+               <code value="7771000"/>
+               <display value="links"/>
+            </coding>
+         </valueCodeableConcept>
+      </extension>
+      <coding>
+         <system value="http://snomed.info/sct"/>
+         <code value="80581009"/>
+         <display value="bovenbuik"/>
+      </coding>
+   </bodySite>
+   <subject>
+      <reference value="Patient/nl-core-Patient-01"/>
+      <type value="Patient"/>
+      <display value="Patient, Johanna Petronella Maria (Jo) van Putten-van der Giessen"/>
+   </subject>
+   <onsetDateTime value="2014-02-28"/>
+   <note>
+      <text value="Stoma is definitief. Vandaag stoma verzorgd, samen met patiënt. Peristomale huid is licht geïrriteerd."/>
+   </note>
+</Condition>