feat: added Invariant CodingSytemCodeInv throwing a warning if a Co…

…ding element is missing system or code. feat: added a data type profile `CodingWithCodeAndSystem` setting .code and .system to a min cardinality of 1. Applied in the derived strict profiles at the same elements as the `CodingSytemCodeInv` invariant.
gematik · Jan 13, 2025 · 73f5216 · 73f5216
1 parent 4d258f3
commit 73f5216
Show file tree

Hide file tree

Showing 43 changed files with 795 additions and 110 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,6 +1,28 @@
 # Changelog
 
 ## 2025-01-10  Version 0.11.23
+- feat: added Invariant `CodingSytemCodeInv` throwing a warning if a Coding element is missing system or code. Added to:
+  - EndpointDirectory.meta.tag
+  - EndpointDirectory.connectionType
+  - EndpointDirectory.payloadType.coding
+  - OrganizationVisibility.valueCoding
+  - EndpointVisibility.valueCoding
+  - SpecialOpeningTimesEX.extension[qualifier].valueCoding
+  - NCPeHCountryEx.valueCoding
+  - HealthcareServiceDirectory.meta.tag
+  - HealthcareServiceDirectory.category.coding
+  - HealthcareServiceDirectory.type.coding
+  - HealthcareServiceDirectory.specialty.coding
+  - HealthcareServiceDirectory.communication.coding
+  - HealthcareServiceDirectory.characteristic.coding
+  - LocationDirectory.meta.tag
+  - OrganizationDirectory.meta.tag
+  - OrganizationDirectory.type.coding
+  - PractitionerDirectory.meta.tag
+  - PractitionerDirectory.qualification.code.coding
+  - PractitionerDirectory.communication.coding
+  - PractitionerRoleDirectory.meta.tag
+- feat: added a data type profile `CodingWithCodeAndSystem` setting .code and .system to a min cardinality of 1. Applied in the derived strict profiles at the same elements as the `CodingSytemCodeInv` invariant.
 - fix: added SearchParameters with Uplifted-Refchains extension for hapi fhir servers (was not included in 0.11.22 due to a technical issue)
 - fix: added strict profiles: These profiles are derived from the VZD-profiles, are restricted non-MS elements to 0..0, add closed slicing. Purpose technical validation for VZD implementations (was not included in 0.11.22 due to a technical issue)
 - fix: Extensions: OrganizationVisibility & EndpointVisibility had a required binding on Extension.value[x] which implies a min cardinality of 1. valueCoding is now set to 1.. explicitly.

diff --git a/fhirpkg.lock.json b/fhirpkg.lock.json
@@ -1,5 +1,5 @@
 {
-  "updated": "2025-01-10T16:26:19.960925+01:00",
+  "updated": "2025-01-13T10:31:27.000688+01:00",
   "dependencies": {
     "de.basisprofil.r4": "1.5.1",
     "hl7.fhir.r4.core": "4.0.1",

diff --git a/src/fhir/fsh-generated/fsh-index.json b/src/fhir/fsh-generated/fsh-index.json
@@ -20,8 +20,8 @@
     "fshName": "EndpointVisibilityCS",
     "fshType": "CodeSystem",
     "fshFile": "profiles/Extension.fsh",
-    "startLine": 59,
-    "endLine": 64
+    "startLine": 61,
+    "endLine": 66
   },
   {
     "outputFile": "CodeSystem-HealthcareServiceSpecialtyCS.json",
@@ -44,8 +44,8 @@
     "fshName": "OpeningTimeQualifierCS",
     "fshType": "CodeSystem",
     "fshFile": "profiles/Extension.fsh",
-    "startLine": 90,
-    "endLine": 95
+    "startLine": 93,
+    "endLine": 98
   },
   {
     "outputFile": "CodeSystem-OrganizationProfessionOID.json",
@@ -68,8 +68,8 @@
     "fshName": "OrganizationVisibilityCS",
     "fshType": "CodeSystem",
     "fshFile": "profiles/Extension.fsh",
-    "startLine": 34,
-    "endLine": 39
+    "startLine": 35,
+    "endLine": 40
   },
   {
     "outputFile": "CodeSystem-Origin.json",
@@ -200,8 +200,8 @@
     "endLine": 7
   },
   {
-    "outputFile": "Endpoint-EndpointExample.json",
-    "fshName": "EndpointExample",
+    "outputFile": "Endpoint-MessengerEndpointWithVisibility.json",
+    "fshName": "MessengerEndpointWithVisibility",
     "fshType": "Instance",
     "fshFile": "examples/Examples001.fsh",
     "startLine": 1,
@@ -447,117 +447,125 @@
     "startLine": 99,
     "endLine": 129
   },
+  {
+    "outputFile": "StructureDefinition-CodingWithCodeAndSystem.json",
+    "fshName": "CodingWithCodeAndSystem",
+    "fshType": "Profile",
+    "fshFile": "profiles/DataType.fsh",
+    "startLine": 1,
+    "endLine": 7
+  },
   {
     "outputFile": "StructureDefinition-EndpointDirectory.json",
     "fshName": "EndpointDirectory",
     "fshType": "Profile",
     "fshFile": "profiles/EndpointDirectory.fsh",
     "startLine": 1,
-    "endLine": 24
+    "endLine": 27
   },
   {
     "outputFile": "StructureDefinition-EndpointVisibility.json",
     "fshName": "EndpointVisibility",
     "fshType": "Extension",
     "fshFile": "profiles/Extension.fsh",
-    "startLine": 48,
-    "endLine": 57
+    "startLine": 49,
+    "endLine": 59
   },
   {
     "outputFile": "StructureDefinition-HealthcareServiceDirectory.json",
     "fshName": "HealthcareServiceDirectory",
     "fshType": "Profile",
     "fshFile": "profiles/HealthcareServiceDirectory.fsh",
     "startLine": 1,
-    "endLine": 67
+    "endLine": 73
   },
   {
     "outputFile": "StructureDefinition-HealthcareServiceDirectoryStrict.json",
     "fshName": "HealthcareServiceDirectoryStrict",
     "fshType": "Profile",
     "fshFile": "profiles/HealthcareServiceDirectory.fsh",
-    "startLine": 69,
-    "endLine": 95
+    "startLine": 75,
+    "endLine": 110
   },
   {
     "outputFile": "StructureDefinition-LocationDirectory.json",
     "fshName": "LocationDirectory",
     "fshType": "Profile",
     "fshFile": "profiles/LocationDirectory.fsh",
     "startLine": 1,
-    "endLine": 33
+    "endLine": 34
   },
   {
     "outputFile": "StructureDefinition-LocationDirectoryStrict.json",
     "fshName": "LocationDirectoryStrict",
     "fshType": "Profile",
     "fshFile": "profiles/LocationDirectory.fsh",
-    "startLine": 35,
-    "endLine": 52
+    "startLine": 36,
+    "endLine": 53
   },
   {
     "outputFile": "StructureDefinition-OrganizationDirectory.json",
     "fshName": "OrganizationDirectory",
     "fshType": "Profile",
     "fshFile": "profiles/OrganizationDirectory.fsh",
     "startLine": 1,
-    "endLine": 51
+    "endLine": 53
   },
   {
     "outputFile": "StructureDefinition-OrganizationDirectoryStrict.json",
     "fshName": "OrganizationDirectoryStrict",
     "fshType": "Profile",
     "fshFile": "profiles/OrganizationDirectory.fsh",
-    "startLine": 53,
-    "endLine": 65
+    "startLine": 55,
+    "endLine": 70
   },
   {
     "outputFile": "StructureDefinition-OrganizationVisibility.json",
     "fshName": "OrganizationVisibility",
     "fshType": "Extension",
     "fshFile": "profiles/Extension.fsh",
     "startLine": 23,
-    "endLine": 32
+    "endLine": 33
   },
   {
     "outputFile": "StructureDefinition-PhysicalFeaturesAdditionalNoteEX.json",
     "fshName": "PhysicalFeaturesAdditionalNoteEX",
     "fshType": "Extension",
     "fshFile": "profiles/Extension.fsh",
-    "startLine": 104,
-    "endLine": 111
+    "startLine": 107,
+    "endLine": 114
   },
   {
     "outputFile": "StructureDefinition-PractitionerDirectory.json",
     "fshName": "PractitionerDirectory",
     "fshType": "Profile",
     "fshFile": "profiles/PractitionerDirectory.fsh",
     "startLine": 1,
-    "endLine": 39
+    "endLine": 42
   },
   {
     "outputFile": "StructureDefinition-PractitionerDirectoryStrict.json",
     "fshName": "PractitionerDirectoryStrict",
     "fshType": "Profile",
     "fshFile": "profiles/PractitionerDirectory.fsh",
-    "startLine": 41,
-    "endLine": 51
+    "startLine": 44,
+    "endLine": 60
   },
   {
     "outputFile": "StructureDefinition-PractitionerRoleDirectory.json",
     "fshName": "PractitionerRoleDirectory",
     "fshType": "Profile",
     "fshFile": "profiles/PractitionerRoleDirectory.fsh",
     "startLine": 1,
-    "endLine": 17
+    "endLine": 18
   },
   {
     "outputFile": "StructureDefinition-PractitionerRoleDirectoryStrict.json",
     "fshName": "PractitionerRoleDirectoryStrict",
     "fshType": "Profile",
     "fshFile": "profiles/PractitionerRoleDirectory.fsh",
-    "startLine": 19,
-    "endLine": 34
+    "startLine": 20,
+    "endLine": 36
   },
   {
     "outputFile": "StructureDefinition-ServiceCoverageArea.json",
@@ -580,24 +588,24 @@
     "fshName": "SpecialOpeningTimesEX",
     "fshType": "Extension",
     "fshFile": "profiles/Extension.fsh",
-    "startLine": 73,
-    "endLine": 88
+    "startLine": 75,
+    "endLine": 91
   },
   {
     "outputFile": "StructureDefinition-endpoint-directory-Strict.json",
     "fshName": "EndpointDirectoryStrict",
     "fshType": "Profile",
     "fshFile": "profiles/EndpointDirectory.fsh",
-    "startLine": 26,
-    "endLine": 38
+    "startLine": 29,
+    "endLine": 45
   },
   {
     "outputFile": "StructureDefinition-ncpeh-country-ex.json",
     "fshName": "NCPeHCountryEx",
     "fshType": "Extension",
     "fshFile": "profiles/Extension.fsh",
-    "startLine": 113,
-    "endLine": 124
+    "startLine": 116,
+    "endLine": 128
   },
   {
     "outputFile": "ValueSet-AddressStateVS.json",
@@ -628,8 +636,8 @@
     "fshName": "EndpointVisibilityVS",
     "fshType": "ValueSet",
     "fshFile": "profiles/Extension.fsh",
-    "startLine": 66,
-    "endLine": 71
+    "startLine": 68,
+    "endLine": 73
   },
   {
     "outputFile": "ValueSet-HealthcareServiceTypeVS.json",
@@ -652,8 +660,8 @@
     "fshName": "OpeningTimeQualifierVS",
     "fshType": "ValueSet",
     "fshFile": "profiles/Extension.fsh",
-    "startLine": 97,
-    "endLine": 102
+    "startLine": 100,
+    "endLine": 105
   },
   {
     "outputFile": "ValueSet-OrganizationProfessionOIDTypeVS.json",
@@ -676,8 +684,8 @@
     "fshName": "OrganizationVisibilityVS",
     "fshType": "ValueSet",
     "fshFile": "profiles/Extension.fsh",
-    "startLine": 41,
-    "endLine": 46
+    "startLine": 42,
+    "endLine": 47
   },
   {
     "outputFile": "ValueSet-OriginVS.json",