Merge pull request #457 from Nictiz/ZIBFHIR-102

ZIBFHIR-102: Various CodeSystem.property fixes
Nictiz · Sep 26, 2024 · 9f83ed4 · 9f83ed4
2 parents cd9fda8 + 8bb6b6b
commit 9f83ed4
Show file tree

Hide file tree

Showing 77 changed files with 289 additions and 1,419 deletions.
diff --git a/qa.yaml b/qa.yaml
@@ -12,8 +12,10 @@ patterns:
   other profiles:
   - resources/zib/*.xml
   - resources/nl-core/*.xml
-  conceptmaps: resources/**/ConceptMap-*.xml
-  terminology: resources/**/terminology/*.xml
+  ConceptMaps: resources/**/ConceptMap-*.xml
+  ValueSets: resources/**/ValueSet-*.xml
+  CodeSystems: resources/**/CodeSystem-*.xml
+  other terminology: resources/**/terminology/*.xml
   SearchParameters: SearchParameters/*.xml
   examples: examples/*.xml
 
@@ -40,11 +42,17 @@ steps:
     profile: "http://nictiz.nl/fhir/StructureDefinition/ProfilingGuidelinesR4-StructureDefinitions"
   validate ConceptMaps:
     description: Validate the ConceptMaps using the profile for ConceptMaps
-    patterns: conceptmaps
+    patterns: ConceptMaps
     profile: "http://nictiz.nl/fhir/StructureDefinition/ProfilingGuidelinesR4-ConceptMaps"
+  validate ValueSets:
+    description: Validate ValueSets
+    patterns: ValueSets
+  validate CodeSystems:
+    description: Validate CodeSystems
+    patterns: CodeSystems
   validate other terminology:
     description: Validate the other terminology resources
-    patterns: terminology
+    patterns: other terminology
   validate SearchParameters:
     description: Validate SearchParameters
     patterns: SearchParameters

diff --git a/.../terminology/CodeSystem-AanduidingBijHuisnummer-2.16.840.1.113883.2.4.3.11.60.101.5.3.xml b/.../terminology/CodeSystem-AanduidingBijHuisnummer-2.16.840.1.113883.2.4.3.11.60.101.5.3.xml
@@ -43,7 +43,7 @@
    <count value="2"/>
    <property>
       <code value="status"/>
-      <uri value="http://hl7.org/fhir/concept-properties"/>
+      <uri value="http://hl7.org/fhir/concept-properties#status"/>
       <description value="A code that indicates the status of the concept. Values found in this version of the code system are: active"/>
       <type value="code"/>
    </property>

diff --git a/...zib/terminology/CodeSystem-BarthelAanUitkleden-2.16.840.1.113883.2.4.3.11.60.40.4.1.8.xml b/...zib/terminology/CodeSystem-BarthelAanUitkleden-2.16.840.1.113883.2.4.3.11.60.40.4.1.8.xml
@@ -41,15 +41,9 @@
    <caseSensitive value="false"/>
    <content value="complete"/>
    <count value="3"/>
-   <property>
-      <code value="ordinal-value"/>
-      <uri value="http://hl7.org/fhir/StructureDefinition/ordinalValue"/>
-      <description value="A numeric value that allows the comparison (less than, greater than) or other numerical manipulation of a concept (e.g. Adding up components of a score). Scores are usually a whole number, but occasionally decimals are encountered in scores."/>
-      <type value="integer"/>
-   </property>
    <property>
       <code value="status"/>
-      <uri value="http://hl7.org/fhir/concept-properties"/>
+      <uri value="http://hl7.org/fhir/concept-properties#status"/>
       <description value="A code that indicates the status of the concept. Values found in this version of the code system are: active"/>
       <type value="code"/>
    </property>
@@ -59,10 +53,6 @@
       </extension>
       <code value="DRESS0"/>
       <display value="Afhankelijk"/>
-      <property>
-         <code value="ordinal-value"/>
-         <valueInteger value="0"/>
-      </property>
       <property>
          <code value="status"/>
          <valueCode value="active"/>
@@ -75,10 +65,6 @@
       <code value="DRESS1"/>
       <display value="Hulp"/>
       <definition value="Heeft hulp nodig maar kan ongeveer de helft zelf"/>
-      <property>
-         <code value="ordinal-value"/>
-         <valueInteger value="1"/>
-      </property>
       <property>
          <code value="status"/>
          <valueCode value="active"/>
@@ -90,10 +76,6 @@
       </extension>
       <code value="DRESS2"/>
       <display value="Onafhankelijk"/>
-      <property>
-         <code value="ordinal-value"/>
-         <valueInteger value="2"/>
-      </property>
       <property>
          <code value="status"/>
          <valueCode value="active"/>

diff --git a/...ib/terminology/CodeSystem-BarthelBadenDouchen-2.16.840.1.113883.2.4.3.11.60.40.4.1.10.xml b/...ib/terminology/CodeSystem-BarthelBadenDouchen-2.16.840.1.113883.2.4.3.11.60.40.4.1.10.xml
@@ -41,15 +41,9 @@
    <caseSensitive value="false"/>
    <content value="complete"/>
    <count value="2"/>
-   <property>
-      <code value="ordinal-value"/>
-      <uri value="http://hl7.org/fhir/StructureDefinition/ordinalValue"/>
-      <description value="A numeric value that allows the comparison (less than, greater than) or other numerical manipulation of a concept (e.g. Adding up components of a score). Scores are usually a whole number, but occasionally decimals are encountered in scores."/>
-      <type value="integer"/>
-   </property>
    <property>
       <code value="status"/>
-      <uri value="http://hl7.org/fhir/concept-properties"/>
+      <uri value="http://hl7.org/fhir/concept-properties#status"/>
       <description value="A code that indicates the status of the concept. Values found in this version of the code system are: active"/>
       <type value="code"/>
    </property>
@@ -59,10 +53,6 @@
       </extension>
       <code value="BATH0"/>
       <display value="Afhankelijk"/>
-      <property>
-         <code value="ordinal-value"/>
-         <valueInteger value="0"/>
-      </property>
       <property>
          <code value="status"/>
          <valueCode value="active"/>
@@ -74,10 +64,6 @@
       </extension>
       <code value="BATH1"/>
       <display value="Onafhankelijk"/>
-      <property>
-         <code value="ordinal-value"/>
-         <valueInteger value="1"/>
-      </property>
       <property>
          <code value="status"/>
          <valueCode value="active"/>

diff --git a/resources/zib/terminology/CodeSystem-BarthelBlaas-2.16.840.1.113883.2.4.3.11.60.40.4.1.2.xml b/resources/zib/terminology/CodeSystem-BarthelBlaas-2.16.840.1.113883.2.4.3.11.60.40.4.1.2.xml
@@ -41,15 +41,9 @@
    <caseSensitive value="false"/>
    <content value="complete"/>
    <count value="3"/>
-   <property>
-      <code value="ordinal-value"/>
-      <uri value="http://hl7.org/fhir/StructureDefinition/ordinalValue"/>
-      <description value="A numeric value that allows the comparison (less than, greater than) or other numerical manipulation of a concept (e.g. Adding up components of a score). Scores are usually a whole number, but occasionally decimals are encountered in scores."/>
-      <type value="integer"/>
-   </property>
    <property>
       <code value="status"/>
-      <uri value="http://hl7.org/fhir/concept-properties"/>
+      <uri value="http://hl7.org/fhir/concept-properties#status"/>
       <description value="A code that indicates the status of the concept. Values found in this version of the code system are: active"/>
       <type value="code"/>
    </property>
@@ -60,10 +54,6 @@
       <code value="URIN0"/>
       <display value="Incontinent"/>
       <definition value="Incontinent of katheter"/>
-      <property>
-         <code value="ordinal-value"/>
-         <valueInteger value="0"/>
-      </property>
       <property>
          <code value="status"/>
          <valueCode value="active"/>
@@ -76,10 +66,6 @@
       <code value="URIN1"/>
       <display value="Ongelukje"/>
       <definition value="Af en toe een ongelukje (max. 1 keer per 24 uur)"/>
-      <property>
-         <code value="ordinal-value"/>
-         <valueInteger value="1"/>
-      </property>
       <property>
          <code value="status"/>
          <valueCode value="active"/>
@@ -92,10 +78,6 @@
       <code value="URIN2"/>
       <display value="Continent"/>
       <definition value="Continent (gedurende meer dan 7 dagen)"/>
-      <property>
-         <code value="ordinal-value"/>
-         <valueInteger value="2"/>
-      </property>
       <property>
          <code value="status"/>
          <valueCode value="active"/>

diff --git a/resources/zib/terminology/CodeSystem-BarthelDarm-2.16.840.1.113883.2.4.3.11.60.40.4.1.1.xml b/resources/zib/terminology/CodeSystem-BarthelDarm-2.16.840.1.113883.2.4.3.11.60.40.4.1.1.xml
@@ -41,15 +41,9 @@
    <caseSensitive value="false"/>
    <content value="complete"/>
    <count value="3"/>
-   <property>
-      <code value="ordinal-value"/>
-      <uri value="http://hl7.org/fhir/StructureDefinition/ordinalValue"/>
-      <description value="A numeric value that allows the comparison (less than, greater than) or other numerical manipulation of a concept (e.g. Adding up components of a score). Scores are usually a whole number, but occasionally decimals are encountered in scores."/>
-      <type value="integer"/>
-   </property>
    <property>
       <code value="status"/>
-      <uri value="http://hl7.org/fhir/concept-properties"/>
+      <uri value="http://hl7.org/fhir/concept-properties#status"/>
       <description value="A code that indicates the status of the concept. Values found in this version of the code system are: active"/>
       <type value="code"/>
    </property>
@@ -59,10 +53,6 @@
       </extension>
       <code value="FECAL0"/>
       <display value="Incontinent"/>
-      <property>
-         <code value="ordinal-value"/>
-         <valueInteger value="0"/>
-      </property>
       <property>
          <code value="status"/>
          <valueCode value="active"/>
@@ -75,10 +65,6 @@
       <code value="FECAL1"/>
       <display value="Ongelukje"/>
       <definition value="Af en toe een ongelukje"/>
-      <property>
-         <code value="ordinal-value"/>
-         <valueInteger value="1"/>
-      </property>
       <property>
          <code value="status"/>
          <valueCode value="active"/>
@@ -90,10 +76,6 @@
       </extension>
       <code value="FECAL2"/>
       <display value="Continent"/>
-      <property>
-         <code value="ordinal-value"/>
-         <valueInteger value="2"/>
-      </property>
       <property>
          <code value="status"/>
          <valueCode value="active"/>

diff --git a/resources/zib/terminology/CodeSystem-BarthelEten-2.16.840.1.113883.2.4.3.11.60.40.4.1.5.xml b/resources/zib/terminology/CodeSystem-BarthelEten-2.16.840.1.113883.2.4.3.11.60.40.4.1.5.xml
@@ -41,15 +41,9 @@
    <caseSensitive value="false"/>
    <content value="complete"/>
    <count value="3"/>
-   <property>
-      <code value="ordinal-value"/>
-      <uri value="http://hl7.org/fhir/StructureDefinition/ordinalValue"/>
-      <description value="A numeric value that allows the comparison (less than, greater than) or other numerical manipulation of a concept (e.g. Adding up components of a score). Scores are usually a whole number, but occasionally decimals are encountered in scores."/>
-      <type value="integer"/>
-   </property>
    <property>
       <code value="status"/>
-      <uri value="http://hl7.org/fhir/concept-properties"/>
+      <uri value="http://hl7.org/fhir/concept-properties#status"/>
       <description value="A code that indicates the status of the concept. Values found in this version of the code system are: active"/>
       <type value="code"/>
    </property>
@@ -60,10 +54,6 @@
       <code value="FEED0"/>
       <display value="Niet zelfstandig"/>
       <definition value="Niet in staat (niet zelfstandig)"/>
-      <property>
-         <code value="ordinal-value"/>
-         <valueInteger value="0"/>
-      </property>
       <property>
          <code value="status"/>
          <valueCode value="active"/>
@@ -76,10 +66,6 @@
       <code value="FEED1"/>
       <display value="Hulp"/>
       <definition value="Heeft hulp nodig bij snijden, smeren van boter, enz."/>
-      <property>
-         <code value="ordinal-value"/>
-         <valueInteger value="1"/>
-      </property>
       <property>
          <code value="status"/>
          <valueCode value="active"/>
@@ -91,10 +77,6 @@
       </extension>
       <code value="FEED2"/>
       <display value="Onafhankelijk"/>
-      <property>
-         <code value="ordinal-value"/>
-         <valueInteger value="2"/>
-      </property>
       <property>
          <code value="status"/>
          <valueCode value="active"/>

diff --git a/...s/zib/terminology/CodeSystem-BarthelMobiliteit-2.16.840.1.113883.2.4.3.11.60.40.4.1.7.xml b/...s/zib/terminology/CodeSystem-BarthelMobiliteit-2.16.840.1.113883.2.4.3.11.60.40.4.1.7.xml
@@ -41,15 +41,9 @@
    <caseSensitive value="false"/>
    <content value="complete"/>
    <count value="4"/>
-   <property>
-      <code value="ordinal-value"/>
-      <uri value="http://hl7.org/fhir/StructureDefinition/ordinalValue"/>
-      <description value="A numeric value that allows the comparison (less than, greater than) or other numerical manipulation of a concept (e.g. Adding up components of a score). Scores are usually a whole number, but occasionally decimals are encountered in scores."/>
-      <type value="integer"/>
-   </property>
    <property>
       <code value="status"/>
-      <uri value="http://hl7.org/fhir/concept-properties"/>
+      <uri value="http://hl7.org/fhir/concept-properties#status"/>
       <description value="A code that indicates the status of the concept. Values found in this version of the code system are: active"/>
       <type value="code"/>
    </property>
@@ -60,10 +54,6 @@
       <code value="MOBIL0"/>
       <display value="Afhankelijk"/>
       <definition value="Kan zich niet verplaatsen"/>
-      <property>
-         <code value="ordinal-value"/>
-         <valueInteger value="0"/>
-      </property>
       <property>
          <code value="status"/>
          <valueCode value="active"/>
@@ -76,10 +66,6 @@
       <code value="MOBIL1"/>
       <display value="Onafhankelijk met rolstoel"/>
       <definition value="Onafhankelijk, maar maakt gebruik van rolstoel, incl. het zonder hulp nemen van hoeken en deuren."/>
-      <property>
-         <code value="ordinal-value"/>
-         <valueInteger value="1"/>
-      </property>
       <property>
          <code value="status"/>
          <valueCode value="active"/>
@@ -92,10 +78,6 @@
       <code value="MOBIL2"/>
       <display value="Loopt met hulp"/>
       <definition value="Loopt met hulp van 1 persoon (hulp van woorden of lichamelijk)"/>
-      <property>
-         <code value="ordinal-value"/>
-         <valueInteger value="2"/>
-      </property>
       <property>
          <code value="status"/>
          <valueCode value="active"/>
@@ -107,10 +89,6 @@
       </extension>
       <code value="MOBIL3"/>
       <display value="Onafhankelijk"/>
-      <property>
-         <code value="ordinal-value"/>
-         <valueInteger value="3"/>
-      </property>
       <property>
          <code value="status"/>
          <valueCode value="active"/>

diff --git a/...ib/terminology/CodeSystem-BarthelToiletgebruik-2.16.840.1.113883.2.4.3.11.60.40.4.1.4.xml b/...ib/terminology/CodeSystem-BarthelToiletgebruik-2.16.840.1.113883.2.4.3.11.60.40.4.1.4.xml
@@ -41,15 +41,9 @@
    <caseSensitive value="false"/>
    <content value="complete"/>
    <count value="3"/>
-   <property>
-      <code value="ordinal-value"/>
-      <uri value="http://hl7.org/fhir/StructureDefinition/ordinalValue"/>
-      <description value="A numeric value that allows the comparison (less than, greater than) or other numerical manipulation of a concept (e.g. Adding up components of a score). Scores are usually a whole number, but occasionally decimals are encountered in scores."/>
-      <type value="integer"/>
-   </property>
    <property>
       <code value="status"/>
-      <uri value="http://hl7.org/fhir/concept-properties"/>
+      <uri value="http://hl7.org/fhir/concept-properties#status"/>
       <description value="A code that indicates the status of the concept. Values found in this version of the code system are: active"/>
       <type value="code"/>
    </property>
@@ -59,10 +53,6 @@
       </extension>
       <code value="TOIL0"/>
       <display value="Afhankelijk"/>
-      <property>
-         <code value="ordinal-value"/>
-         <valueInteger value="0"/>
-      </property>
       <property>
          <code value="status"/>
          <valueCode value="active"/>
@@ -75,10 +65,6 @@
       <code value="TOIL1"/>
       <display value="Hulp"/>
       <definition value="Heeft enige hulp nodig maar kan sommige dingen zelf"/>
-      <property>
-         <code value="ordinal-value"/>
-         <valueInteger value="1"/>
-      </property>
       <property>
          <code value="status"/>
          <valueCode value="active"/>
@@ -91,10 +77,6 @@
       <code value="TOIL2"/>
       <display value="Onafhankelijk"/>
       <definition value="Onafhankelijk (op en af, uit- en aankleden, afvegen)"/>
-      <property>
-         <code value="ordinal-value"/>
-         <valueInteger value="2"/>
-      </property>
       <property>
          <code value="status"/>
          <valueCode value="active"/>