Merge pull request #121 from gematik/feat/apo-vzd-minimal

fix: dependency basisprofile auf stable version
gematik · Mar 27, 2024 · 1720f99 · 1720f99
2 parents f09938d + cb3ecd8
commit 1720f99
Show file tree

Hide file tree

Showing 42 changed files with 80 additions and 45 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,16 @@
 # Changelog
 
+## 2024-03-16 - Version 0.11.2 & 0.11.1
+
+- fix: dependency basisprofile auf stable version: 1.4.0 (war 1.5.0-ballot)
+- fix: id MS auf allen Profilen
+
+### PractitionerRoleDirectory
+- feat: healthcareService & Organization MS
+
+### Extensions
+- fix EndpointVisibility.context war falsch gesetzt, jetzt korrekt (Organization -> Enpoint)
+
 ## 2024-03-16 - Version 0.11.0
 
 ### EndpointDirectory

diff --git a/package.json b/package.json
@@ -1,13 +1,13 @@
 {
   "name": "de.gematik.fhir.directory",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "author": "gematik GmbH",
   "description": "Package Release des gematik FHIR Directory",
   "fhirVersions": [
     "4.0.1"
   ],
   "dependencies": {
-    "de.basisprofil.r4": "1.5.0-ballot2",
+    "de.basisprofil.r4": "1.4.0",
     "de.ihe-d.terminology": "3.0.0"
 
   }

diff --git a/src/fhir/fsh-generated/fsh-index.json b/src/fhir/fsh-generated/fsh-index.json
@@ -173,7 +173,7 @@
     "fshType": "Profile",
     "fshFile": "profiles/EndpointDirectory.fsh",
     "startLine": 1,
-    "endLine": 24
+    "endLine": 25
   },
   {
     "outputFile": "StructureDefinition-EndpointVisibility.json",
@@ -205,7 +205,7 @@
     "fshType": "Profile",
     "fshFile": "profiles/OrganizationDirectory.fsh",
     "startLine": 1,
-    "endLine": 48
+    "endLine": 49
   },
   {
     "outputFile": "StructureDefinition-OrganizationVisibility.json",
@@ -229,7 +229,7 @@
     "fshType": "Profile",
     "fshFile": "profiles/PractitionerRoleDirectory.fsh",
     "startLine": 1,
-    "endLine": 15
+    "endLine": 17
   },
   {
     "outputFile": "ValueSet-AddressStateVS.json",

diff --git a/src/fhir/fsh-generated/fsh-index.txt b/src/fhir/fsh-generated/fsh-index.txt
@@ -20,14 +20,14 @@ Organization-OrganizationExample001.json             OrganizationExample001
 Practitioner-TIPractitionerExample001.json           PractitionerExample001               Instance    examples/PractitionerExample001.fsh                    1 - 18
 Practitioner-TIPractitionerExampleDentist.json       PractitionerExampleDentist           Instance    examples/Examples001.fsh                               14 - 27
 PractitionerRole-PractitionerRoleExample.json        PractitionerRoleExample              Instance    examples/Examples001.fsh                               29 - 36
-StructureDefinition-EndpointDirectory.json           EndpointDirectory                    Profile     profiles/EndpointDirectory.fsh                         1 - 24
+StructureDefinition-EndpointDirectory.json           EndpointDirectory                    Profile     profiles/EndpointDirectory.fsh                         1 - 25
 StructureDefinition-EndpointVisibility.json          EndpointVisibility                   Extension   profiles/Extension.fsh                                 25 - 33
 StructureDefinition-HealthcareServiceDirectory.json  HealthcareServiceDirectory           Profile     profiles/HealthcareServiceDirectory.fsh                1 - 36
 StructureDefinition-LocationDirectory.json           LocationDirectory                    Profile     profiles/LocationDirectory.fsh                         1 - 39
-StructureDefinition-OrganizationDirectory.json       OrganizationDirectory                Profile     profiles/OrganizationDirectory.fsh                     1 - 48
+StructureDefinition-OrganizationDirectory.json       OrganizationDirectory                Profile     profiles/OrganizationDirectory.fsh                     1 - 49
 StructureDefinition-OrganizationVisibility.json      OrganizationVisibility               Extension   profiles/Extension.fsh                                 1 - 9
 StructureDefinition-PractitionerDirectory.json       PractitionerDirectory                Profile     profiles/PractitionerDirectory.fsh                     1 - 39
-StructureDefinition-PractitionerRoleDirectory.json   PractitionerRoleDirectory            Profile     profiles/PractitionerRoleDirectory.fsh                 1 - 15
+StructureDefinition-PractitionerRoleDirectory.json   PractitionerRoleDirectory            Profile     profiles/PractitionerRoleDirectory.fsh                 1 - 17
 ValueSet-AddressStateVS.json                         AddressStateVS                       ValueSet    valuesets/AddressStateVS.fsh                           1 - 4
 ValueSet-EndpointConnectionTypeVS.json               EndpointConnectionTypeVS             ValueSet    valuesets/EndpointConnectionTypeVS.fsh                 1 - 5
 ValueSet-EndpointPayloadTypeVS.json                  EndpointPayloadTypeVS                ValueSet    valuesets/EndpointPayloadTypeVS.fsh                    1 - 4

diff --git a/src/fhir/fsh-generated/resources/CodeSystem-EndpointDirectoryConnectionType.json b/src/fhir/fsh-generated/resources/CodeSystem-EndpointDirectoryConnectionType.json
@@ -46,7 +46,7 @@
     }
   ],
   "publisher": "gematik GmbH",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "caseSensitive": false,
   "count": 9
 }
diff --git a/src/fhir/fsh-generated/resources/CodeSystem-EndpointDirectoryPayloadType.json b/src/fhir/fsh-generated/resources/CodeSystem-EndpointDirectoryPayloadType.json
@@ -14,7 +14,7 @@
     }
   ],
   "publisher": "gematik GmbH",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "caseSensitive": false,
   "count": 1
 }
diff --git a/src/fhir/fsh-generated/resources/CodeSystem-EndpointVisibilityCS.json b/src/fhir/fsh-generated/resources/CodeSystem-EndpointVisibilityCS.json
@@ -14,6 +14,6 @@
     }
   ],
   "publisher": "gematik GmbH",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "count": 1
 }
diff --git a/src/fhir/fsh-generated/resources/CodeSystem-HolderCS.json b/src/fhir/fsh-generated/resources/CodeSystem-HolderCS.json
@@ -474,7 +474,7 @@
     }
   ],
   "publisher": "gematik GmbH",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "caseSensitive": false,
   "count": 116
 }
diff --git a/src/fhir/fsh-generated/resources/CodeSystem-OrganizationProfessionOID.json b/src/fhir/fsh-generated/resources/CodeSystem-OrganizationProfessionOID.json
@@ -258,7 +258,7 @@
     }
   ],
   "publisher": "gematik GmbH",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "caseSensitive": false,
   "count": 62
 }
diff --git a/src/fhir/fsh-generated/resources/CodeSystem-OrganizationProviderType.json b/src/fhir/fsh-generated/resources/CodeSystem-OrganizationProviderType.json
@@ -25,7 +25,7 @@
     }
   ],
   "publisher": "gematik GmbH",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "caseSensitive": false,
   "count": 4
 }
diff --git a/src/fhir/fsh-generated/resources/CodeSystem-OrganizationVisibilityCS.json b/src/fhir/fsh-generated/resources/CodeSystem-OrganizationVisibilityCS.json
@@ -14,6 +14,6 @@
     }
   ],
   "publisher": "gematik GmbH",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "count": 1
 }
diff --git a/src/fhir/fsh-generated/resources/CodeSystem-Origin.json b/src/fhir/fsh-generated/resources/CodeSystem-Origin.json
@@ -17,7 +17,7 @@
     }
   ],
   "publisher": "gematik GmbH",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "caseSensitive": false,
   "count": 2
 }
diff --git a/src/fhir/fsh-generated/resources/CodeSystem-PharmacyHealthcareSpecialityCS.json b/src/fhir/fsh-generated/resources/CodeSystem-PharmacyHealthcareSpecialityCS.json
@@ -30,7 +30,7 @@
     }
   ],
   "publisher": "gematik GmbH",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "caseSensitive": false,
   "count": 5
 }
diff --git a/src/fhir/fsh-generated/resources/CodeSystem-PractitionerProfessionOID.json b/src/fhir/fsh-generated/resources/CodeSystem-PractitionerProfessionOID.json
@@ -159,7 +159,7 @@
     }
   ],
   "publisher": "gematik GmbH",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "caseSensitive": false,
   "count": 37
 }
diff --git a/src/fhir/fsh-generated/resources/CodeSystem-Region.json b/src/fhir/fsh-generated/resources/CodeSystem-Region.json
@@ -82,7 +82,7 @@
     }
   ],
   "publisher": "gematik GmbH",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "caseSensitive": false,
   "count": 18
 }
diff --git a/src/fhir/fsh-generated/resources/StructureDefinition-EndpointDirectory.json b/src/fhir/fsh-generated/resources/StructureDefinition-EndpointDirectory.json
@@ -2,7 +2,7 @@
   "resourceType": "StructureDefinition",
   "id": "EndpointDirectory",
   "url": "https://gematik.de/fhir/directory/StructureDefinition/EndpointDirectory",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "name": "EndpointDirectory",
   "title": "Endpoint in gematik Directory",
   "status": "active",
@@ -16,6 +16,11 @@
   "derivation": "constraint",
   "differential": {
     "element": [
+      {
+        "id": "Endpoint.id",
+        "path": "Endpoint.id",
+        "mustSupport": true
+      },
       {
         "id": "Endpoint.meta.tag",
         "path": "Endpoint.meta.tag",

diff --git a/src/fhir/fsh-generated/resources/StructureDefinition-EndpointVisibility.json b/src/fhir/fsh-generated/resources/StructureDefinition-EndpointVisibility.json
@@ -2,7 +2,7 @@
   "resourceType": "StructureDefinition",
   "id": "EndpointVisibility",
   "url": "https://gematik.de/fhir/directory/StructureDefinition/EndpointVisibility",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "name": "EndpointVisibility",
   "title": "EndpointVisibility",
   "status": "active",

diff --git a/src/fhir/fsh-generated/resources/StructureDefinition-HealthcareServiceDirectory.json b/src/fhir/fsh-generated/resources/StructureDefinition-HealthcareServiceDirectory.json
@@ -2,7 +2,7 @@
   "resourceType": "StructureDefinition",
   "id": "HealthcareServiceDirectory",
   "url": "https://gematik.de/fhir/directory/StructureDefinition/HealthcareServiceDirectory",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "name": "HealthcareServiceDirectory",
   "title": "HealthcareService in gematik Directory",
   "status": "active",

diff --git a/src/fhir/fsh-generated/resources/StructureDefinition-LocationDirectory.json b/src/fhir/fsh-generated/resources/StructureDefinition-LocationDirectory.json
@@ -2,7 +2,7 @@
   "resourceType": "StructureDefinition",
   "id": "LocationDirectory",
   "url": "https://gematik.de/fhir/directory/StructureDefinition/LocationDirectory",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "name": "LocationDirectory",
   "title": "Location in gematik Directory",
   "status": "active",

diff --git a/src/fhir/fsh-generated/resources/StructureDefinition-OrganizationDirectory.json b/src/fhir/fsh-generated/resources/StructureDefinition-OrganizationDirectory.json
@@ -2,7 +2,7 @@
   "resourceType": "StructureDefinition",
   "id": "OrganizationDirectory",
   "url": "https://gematik.de/fhir/directory/StructureDefinition/OrganizationDirectory",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "name": "OrganizationDirectory",
   "title": "Organization in gematik Directory",
   "status": "active",
@@ -149,6 +149,11 @@
         ],
         "mustSupport": true
       },
+      {
+        "id": "Organization.active",
+        "path": "Organization.active",
+        "mustSupport": true
+      },
       {
         "id": "Organization.type",
         "path": "Organization.type",

diff --git a/src/fhir/fsh-generated/resources/StructureDefinition-OrganizationVisibility.json b/src/fhir/fsh-generated/resources/StructureDefinition-OrganizationVisibility.json
@@ -2,7 +2,7 @@
   "resourceType": "StructureDefinition",
   "id": "OrganizationVisibility",
   "url": "https://gematik.de/fhir/directory/StructureDefinition/OrganizationVisibility",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "name": "OrganizationVisibility",
   "title": "OrganizationVisibility",
   "status": "active",

diff --git a/src/fhir/fsh-generated/resources/StructureDefinition-PractitionerDirectory.json b/src/fhir/fsh-generated/resources/StructureDefinition-PractitionerDirectory.json
@@ -2,7 +2,7 @@
   "resourceType": "StructureDefinition",
   "id": "PractitionerDirectory",
   "url": "https://gematik.de/fhir/directory/StructureDefinition/PractitionerDirectory",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "name": "PractitionerDirectory",
   "title": "Practitioner in gematik Directory",
   "status": "active",

diff --git a/src/fhir/fsh-generated/resources/StructureDefinition-PractitionerRoleDirectory.json b/src/fhir/fsh-generated/resources/StructureDefinition-PractitionerRoleDirectory.json
@@ -2,7 +2,7 @@
   "resourceType": "StructureDefinition",
   "id": "PractitionerRoleDirectory",
   "url": "https://gematik.de/fhir/directory/StructureDefinition/PractitionerRoleDirectory",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "name": "PractitionerRoleDirectory",
   "title": "PractitionerRole in gematik Directory",
   "status": "active",
@@ -59,11 +59,21 @@
         "min": 1,
         "mustSupport": true
       },
+      {
+        "id": "PractitionerRole.organization",
+        "path": "PractitionerRole.organization",
+        "mustSupport": true
+      },
       {
         "id": "PractitionerRole.location",
         "path": "PractitionerRole.location",
         "mustSupport": true
       },
+      {
+        "id": "PractitionerRole.healthcareService",
+        "path": "PractitionerRole.healthcareService",
+        "mustSupport": true
+      },
       {
         "id": "PractitionerRole.endpoint",
         "path": "PractitionerRole.endpoint",

diff --git a/src/fhir/fsh-generated/resources/ValueSet-AddressStateVS.json b/src/fhir/fsh-generated/resources/ValueSet-AddressStateVS.json
@@ -6,7 +6,7 @@
   "description": "ValueSet for `Address.state`",
   "url": "https://gematik.de/fhir/directory/ValueSet/AddressStateVS",
   "publisher": "gematik GmbH",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "compose": {
     "include": [
       {

diff --git a/src/fhir/fsh-generated/resources/ValueSet-EndpointConnectionTypeVS.json b/src/fhir/fsh-generated/resources/ValueSet-EndpointConnectionTypeVS.json
@@ -6,7 +6,7 @@
   "description": "ValueSet for `Endpoint.connectionType`",
   "url": "https://gematik.de/fhir/directory/ValueSet/EndpointConnectionTypeVS",
   "publisher": "gematik GmbH",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "compose": {
     "include": [
       {

diff --git a/src/fhir/fsh-generated/resources/ValueSet-EndpointPayloadTypeVS.json b/src/fhir/fsh-generated/resources/ValueSet-EndpointPayloadTypeVS.json
@@ -6,7 +6,7 @@
   "description": "ValueSet for `Endpoint.payloadType`",
   "url": "https://gematik.de/fhir/directory/ValueSet/EndpointPayloadTypeVS",
   "publisher": "gematik GmbH",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "compose": {
     "include": [
       {

diff --git a/src/fhir/fsh-generated/resources/ValueSet-EndpointVisibilityVS.json b/src/fhir/fsh-generated/resources/ValueSet-EndpointVisibilityVS.json
@@ -7,7 +7,7 @@
   "description": "EndpointVisibilityVS",
   "url": "https://gematik.de/fhir/directory/ValueSet/EndpointVisibilityVS",
   "publisher": "gematik GmbH",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "compose": {
     "include": [
       {

diff --git a/src/fhir/fsh-generated/resources/ValueSet-HealthcareServiceTypeVS.json b/src/fhir/fsh-generated/resources/ValueSet-HealthcareServiceTypeVS.json
@@ -6,7 +6,7 @@
   "description": "ValueSet for `HealthcareService.type`",
   "url": "https://gematik.de/fhir/directory/ValueSet/HealthcareServiceTypeVS",
   "publisher": "gematik GmbH",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "compose": {
     "include": [
       {

diff --git a/src/fhir/fsh-generated/resources/ValueSet-HealthcareSpecialityTypeVS.json b/src/fhir/fsh-generated/resources/ValueSet-HealthcareSpecialityTypeVS.json
@@ -7,7 +7,7 @@
   "description": "HealthcareService specialities",
   "url": "https://gematik.de/fhir/directory/ValueSet/HealthcareSpecialityTypeVS",
   "publisher": "gematik GmbH",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "compose": {
     "include": [
       {

diff --git a/src/fhir/fsh-generated/resources/ValueSet-OrganizationProfessionOIDTypeVS.json b/src/fhir/fsh-generated/resources/ValueSet-OrganizationProfessionOIDTypeVS.json
@@ -6,7 +6,7 @@
   "description": "ValueSet for `Organization.type`",
   "url": "https://gematik.de/fhir/directory/ValueSet/OrganizationProfessionOIDTypeVS",
   "publisher": "gematik GmbH",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "compose": {
     "include": [
       {

diff --git a/src/fhir/fsh-generated/resources/ValueSet-OrganizationTypeVS.json b/src/fhir/fsh-generated/resources/ValueSet-OrganizationTypeVS.json
@@ -6,7 +6,7 @@
   "description": "ValueSet for `Organization.type`",
   "url": "https://gematik.de/fhir/directory/ValueSet/OrganizationTypeVS",
   "publisher": "gematik GmbH",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "compose": {
     "include": [
       {

diff --git a/src/fhir/fsh-generated/resources/ValueSet-OrganizationVisibilityVS.json b/src/fhir/fsh-generated/resources/ValueSet-OrganizationVisibilityVS.json
@@ -7,7 +7,7 @@
   "description": "OrganizationVisibilityVS",
   "url": "https://gematik.de/fhir/directory/ValueSet/OrganizationVisibilityVS",
   "publisher": "gematik GmbH",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "compose": {
     "include": [
       {

diff --git a/src/fhir/fsh-generated/resources/ValueSet-OriginVS.json b/src/fhir/fsh-generated/resources/ValueSet-OriginVS.json
@@ -6,7 +6,7 @@
   "description": "ValueSet for `meta.tag[Origin]`",
   "url": "https://gematik.de/fhir/directory/ValueSet/OriginVS",
   "publisher": "gematik GmbH",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "compose": {
     "include": [
       {

diff --git a/src/fhir/fsh-generated/resources/ValueSet-PractitionerQualificationVS.json b/src/fhir/fsh-generated/resources/ValueSet-PractitionerQualificationVS.json
@@ -6,7 +6,7 @@
   "description": "ValueSet for `Practitoner.qualification`",
   "url": "https://gematik.de/fhir/directory/ValueSet/PractitionerQualificationVS",
   "publisher": "gematik GmbH",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "compose": {
     "include": [
       {