From 5411824ad5fa9d3c77ab641eb0afdd0b2c141ac9 Mon Sep 17 00:00:00 2001 From: patrick-werner Date: Wed, 27 Mar 2024 15:19:47 +0100 Subject: [PATCH 1/2] fix: dependency basisprofile auf stable version fix: alle Profile id MS feat: PractitionerRoleDirectory.fsh: healthcareService & organization MS --- package.json | 4 ++-- src/fhir/fsh-generated/fsh-index.json | 6 +++--- src/fhir/fsh-generated/fsh-index.txt | 6 +++--- .../CodeSystem-EndpointDirectoryConnectionType.json | 2 +- .../CodeSystem-EndpointDirectoryPayloadType.json | 2 +- .../resources/CodeSystem-EndpointVisibilityCS.json | 2 +- .../fsh-generated/resources/CodeSystem-HolderCS.json | 2 +- .../CodeSystem-OrganizationProfessionOID.json | 2 +- .../CodeSystem-OrganizationProviderType.json | 2 +- .../CodeSystem-OrganizationVisibilityCS.json | 2 +- .../fsh-generated/resources/CodeSystem-Origin.json | 2 +- .../CodeSystem-PharmacyHealthcareSpecialityCS.json | 2 +- .../CodeSystem-PractitionerProfessionOID.json | 2 +- .../fsh-generated/resources/CodeSystem-Region.json | 2 +- .../StructureDefinition-EndpointDirectory.json | 7 ++++++- .../StructureDefinition-EndpointVisibility.json | 2 +- ...ructureDefinition-HealthcareServiceDirectory.json | 2 +- .../StructureDefinition-LocationDirectory.json | 2 +- .../StructureDefinition-OrganizationDirectory.json | 7 ++++++- .../StructureDefinition-OrganizationVisibility.json | 2 +- .../StructureDefinition-PractitionerDirectory.json | 2 +- ...tructureDefinition-PractitionerRoleDirectory.json | 12 +++++++++++- .../resources/ValueSet-AddressStateVS.json | 2 +- .../resources/ValueSet-EndpointConnectionTypeVS.json | 2 +- .../resources/ValueSet-EndpointPayloadTypeVS.json | 2 +- .../resources/ValueSet-EndpointVisibilityVS.json | 2 +- .../resources/ValueSet-HealthcareServiceTypeVS.json | 2 +- .../ValueSet-HealthcareSpecialityTypeVS.json | 2 +- .../ValueSet-OrganizationProfessionOIDTypeVS.json | 2 +- .../resources/ValueSet-OrganizationTypeVS.json | 2 +- .../resources/ValueSet-OrganizationVisibilityVS.json | 2 +- .../fsh-generated/resources/ValueSet-OriginVS.json | 2 +- .../ValueSet-PractitionerQualificationVS.json | 2 +- ...ValueSet-healthcareservice-characteristic-vs.json | 2 +- src/fhir/input/fsh/profiles/EndpointDirectory.fsh | 1 + .../fsh/profiles/HealthcareServiceDirectory.fsh | 2 +- src/fhir/input/fsh/profiles/LocationDirectory.fsh | 2 +- .../input/fsh/profiles/OrganizationDirectory.fsh | 3 ++- .../input/fsh/profiles/PractitionerRoleDirectory.fsh | 2 ++ src/fhir/input/fsh/ruleset.fsh | 2 +- src/fhir/sushi-config.yaml | 4 ++-- 41 files changed, 69 insertions(+), 45 deletions(-) diff --git a/package.json b/package.json index ec3ebe7c..883f3328 100644 --- 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 index f2be571e..5ca5d86a 100644 --- 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 index fbef62ff..8ab1b250 100644 --- 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 index e48a3e87..84b3aa03 100644 --- 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 index a93a8b8b..8cc12c28 100644 --- 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 index 9493ae07..0b14fdea 100644 --- 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 index bf58e09b..683160d6 100644 --- 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 index 666979f1..9fd3de15 100644 --- 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 index 90cc8351..e9b49806 100644 --- 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 index b935a1ea..74b7e7e6 100644 --- 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 index b35a7d38..0d7bf00c 100644 --- 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 index 172db16c..1dc6f79d 100644 --- 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 index 043839ec..53c5a554 100644 --- 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 index 7708a763..553f3f78 100644 --- 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 index ad563ac4..d5ab4106 100644 --- 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 index 51ae9447..080f2786 100644 --- 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 index 98bab615..cb1bea71 100644 --- 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 index 19cc1171..6fc42a28 100644 --- 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 index ac8d7c8c..17ca947f 100644 --- 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 index 4270b89b..4201e9d1 100644 --- 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 index 9de11575..85d9137b 100644 --- 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 index cffa3efb..91b9292e 100644 --- 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 index 50db26f7..33320d3e 100644 --- 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 index 861e66f5..bb7f7274 100644 --- 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 index 91c7dea4..012a23af 100644 --- 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 index 9f5678c4..0fa2199d 100644 --- 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 index e12850b2..92d334cc 100644 --- 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 index 56b87d56..243c58d1 100644 --- 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 index 0655b49f..c5079a13 100644 --- 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 index cbacb3b9..e3d7967d 100644 --- 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 index 8c97c0af..1164c6c1 100644 --- 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 index f02c0a86..d41647ff 100644 --- 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 index 50fd8ee1..994061a5 100644 --- 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": [ { diff --git a/src/fhir/fsh-generated/resources/ValueSet-healthcareservice-characteristic-vs.json b/src/fhir/fsh-generated/resources/ValueSet-healthcareservice-characteristic-vs.json index bed6f633..e5ad0680 100644 --- a/src/fhir/fsh-generated/resources/ValueSet-healthcareservice-characteristic-vs.json +++ b/src/fhir/fsh-generated/resources/ValueSet-healthcareservice-characteristic-vs.json @@ -7,7 +7,7 @@ "description": "HealthCareServiceCharacteristicVS", "url": "https://gematik.de/fhir/directory/ValueSet/healthcareservice-characteristic-vs", "publisher": "gematik GmbH", - "version": "0.11.1", + "version": "0.11.2", "compose": { "include": [ { diff --git a/src/fhir/input/fsh/profiles/EndpointDirectory.fsh b/src/fhir/input/fsh/profiles/EndpointDirectory.fsh index ffde5ca6..28fb8481 100644 --- a/src/fhir/input/fsh/profiles/EndpointDirectory.fsh +++ b/src/fhir/input/fsh/profiles/EndpointDirectory.fsh @@ -4,6 +4,7 @@ Parent: Endpoint Title: "Endpoint in gematik Directory" Description: "Endpoints for applications in the gematik Directory" * insert Meta +* id MS * extension contains EndpointVisibility named endpointVisibility 0..* MS * meta.tag 1.. MS * ^slicing.discriminator.type = #value diff --git a/src/fhir/input/fsh/profiles/HealthcareServiceDirectory.fsh b/src/fhir/input/fsh/profiles/HealthcareServiceDirectory.fsh index 50a16b04..69e4cf77 100644 --- a/src/fhir/input/fsh/profiles/HealthcareServiceDirectory.fsh +++ b/src/fhir/input/fsh/profiles/HealthcareServiceDirectory.fsh @@ -12,7 +12,7 @@ organisations specific for german Healthcare and Telematics Infrastructure. * meta.tag contains Origin 1..1 MS * meta.tag[Origin] from OriginVS * meta.tag[Origin].system = "https://gematik.de/fhir/directory/CodeSystem/Origin" -* id ..1 MS +* id MS * providedBy 1..1 MS * category MS * category from $IHEXDShealthcareFacilityTypeCodePatientRelatedHealthcare diff --git a/src/fhir/input/fsh/profiles/LocationDirectory.fsh b/src/fhir/input/fsh/profiles/LocationDirectory.fsh index 5c7d0b14..e66c190b 100644 --- a/src/fhir/input/fsh/profiles/LocationDirectory.fsh +++ b/src/fhir/input/fsh/profiles/LocationDirectory.fsh @@ -12,7 +12,7 @@ organisations specific for german Healthcare and Telematics Infrastructure. * meta.tag contains Origin 1..1 MS * meta.tag[Origin] from OriginVS * meta.tag[Origin].system = "https://gematik.de/fhir/directory/CodeSystem/Origin" -* id 0..1 MS +* id MS * name MS * description MS * address MS diff --git a/src/fhir/input/fsh/profiles/OrganizationDirectory.fsh b/src/fhir/input/fsh/profiles/OrganizationDirectory.fsh index 8f680ad8..b0afd6ce 100644 --- a/src/fhir/input/fsh/profiles/OrganizationDirectory.fsh +++ b/src/fhir/input/fsh/profiles/OrganizationDirectory.fsh @@ -13,7 +13,8 @@ organisations specific for german Healthcare and Telematics Infrastructure. * meta.tag contains Origin 1..1 MS * meta.tag[Origin] from OriginVS * meta.tag[Origin].system = "https://gematik.de/fhir/directory/CodeSystem/Origin" -* id 0..1 MS +* id MS +* active MS * name 1..1 MS * identifier 1..* MS * identifier ^slicing.discriminator.type = #value diff --git a/src/fhir/input/fsh/profiles/PractitionerRoleDirectory.fsh b/src/fhir/input/fsh/profiles/PractitionerRoleDirectory.fsh index 10067c45..9f529ac9 100644 --- a/src/fhir/input/fsh/profiles/PractitionerRoleDirectory.fsh +++ b/src/fhir/input/fsh/profiles/PractitionerRoleDirectory.fsh @@ -13,3 +13,5 @@ Title: "PractitionerRole in gematik Directory" * practitioner 1..1 MS * location MS * endpoint MS +* healthcareService MS +* organization MS diff --git a/src/fhir/input/fsh/ruleset.fsh b/src/fhir/input/fsh/ruleset.fsh index 8dc48a43..e9af82ed 100644 --- a/src/fhir/input/fsh/ruleset.fsh +++ b/src/fhir/input/fsh/ruleset.fsh @@ -1,4 +1,4 @@ RuleSet: Meta * ^status = #active * ^publisher = "gematik GmbH" -* ^version = "0.11.1" +* ^version = "0.11.2" diff --git a/src/fhir/sushi-config.yaml b/src/fhir/sushi-config.yaml index d401df6c..b32b7312 100644 --- a/src/fhir/sushi-config.yaml +++ b/src/fhir/sushi-config.yaml @@ -1,7 +1,7 @@ canonical: https://gematik.de/fhir/directory -version: 0.11.1 +version: 0.11.2 fhirVersion: 4.0.1 dependencies: - de.basisprofil.r4: 1.5.0-ballot2 + de.basisprofil.r4: 1.4.0 de.ihe-d.terminology: 3.0.0 FSHOnly: true From cb3ecd8b0550a4c933341707fab2e8c4ab39b6c9 Mon Sep 17 00:00:00 2001 From: patrick-werner Date: Wed, 27 Mar 2024 15:28:27 +0100 Subject: [PATCH 2/2] changelog added --- changelog.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/changelog.md b/changelog.md index efd08708..0844895d 100644 --- 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