From 48e5dddcb914b6ee04febf3846e502e78ffda075 Mon Sep 17 00:00:00 2001 From: Patrick Werner Date: Fri, 20 Dec 2024 08:43:27 +0100 Subject: [PATCH] - feat: added SearchParameter for NCPeHCountryEx: OrganizationNCPeHCountrySP - feat: added SearchParameter for Organization.alias: OrganizationAliasSP - feat: 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 - feat: added SearchParameters with Uplifted-Refchains extension for hapi fhir servers --- changelog.md | 17 ++ package.json | 2 +- src/fhir/fsh-generated/fsh-index.json | 164 +++++++++++++++--- src/fhir/fsh-generated/fsh-index.txt | 44 +++-- ...ystem-EndpointDirectoryConnectionType.json | 2 +- ...deSystem-EndpointDirectoryPayloadType.json | 2 +- .../CodeSystem-EndpointVisibilityCS.json | 2 +- ...deSystem-HealthcareServiceSpecialtyCS.json | 2 +- .../resources/CodeSystem-HolderCS.json | 2 +- .../CodeSystem-OpeningTimeQualifierCS.json | 2 +- .../CodeSystem-OrganizationProfessionOID.json | 2 +- .../CodeSystem-OrganizationProviderType.json | 2 +- .../CodeSystem-OrganizationVisibilityCS.json | 2 +- .../resources/CodeSystem-Origin.json | 2 +- ...eSystem-PharmacyHealthcareSpecialtyCS.json | 2 +- .../resources/CodeSystem-PharmacyTypeCS.json | 2 +- .../CodeSystem-PharmacyTypeLDAPCS.json | 2 +- .../CodeSystem-PractitionerProfessionOID.json | 2 +- .../resources/CodeSystem-Region.json | 2 +- ...VZDHealthCareServiceCharacteristicsCS.json | 2 +- ...tem-aerztliche-fachrichtungen-oid-url.json | 2 +- .../CodeSystem-aerztlicheBerufsvarianten.json | 2 +- ...facharzttitelderaerztekammern-oid-url.json | 2 +- ...eSystem-kbv-cm-sfhir-bar2-wbo-oid-url.json | 2 +- ...cht-aerztliche-fachrichtungen-oid-url.json | 2 +- .../CodeSystem-physicalFeatures.json | 2 +- ...nen-nicht-aerztlicher-autoren-oid-url.json | 2 +- ...toren-zahnaerztlicher-autoren-oid-url.json | 2 +- ...zahnaerztliche-fachrichtungen-oid-url.json | 2 +- .../resources/Endpoint-EndpointExample.json | 5 +- ...t-OrganizationExample001-Endpoint-TIM.json | 2 +- ...PharmacyEndpointErpReservationExample.json | 5 +- ...dpointOnlineAppointmentBookingExample.json | 5 +- .../Endpoint-PharmacyEndpointTIMExample.json | 5 +- ...hcareService-HealthcareServiceExample.json | 2 +- ...Service-NCPeHHealthcareServiceExample.json | 2 +- ...vice-PharmacyHealthCareServiceExample.json | 2 +- .../Location-PharmacyLocationExample.json | 3 +- ...Organization-NCPeHOrganizationExample.json | 14 +- .../Organization-OrganizationExample.json | 2 +- .../Organization-OrganizationExample001.json | 7 +- ...anization-PharmacyOrganizationExample.json | 2 +- ...Practitioner-TIPractitionerExample001.json | 3 +- ...titioner-TIPractitionerExampleDentist.json | 2 +- .../SearchParameter-EndpointAddressSP.json | 2 +- .../SearchParameter-EndpointVisibilitySP.json | 2 +- ...thcareServiceCoverageAreaPostalCodeSP.json | 2 +- ...chParameter-OrganizationTypeDisplaySP.json | 2 +- ...rchParameter-OrganizationVisibilitySP.json | 2 +- ...Parameter-PractitionerQualificationSP.json | 2 +- ...StructureDefinition-EndpointDirectory.json | 2 +- ...tructureDefinition-EndpointVisibility.json | 2 +- ...Definition-HealthcareServiceDirectory.json | 12 +- ...StructureDefinition-LocationDirectory.json | 2 +- ...ctureDefinition-OrganizationDirectory.json | 2 +- ...tureDefinition-OrganizationVisibility.json | 2 +- ...tion-PhysicalFeaturesAdditionalNoteEX.json | 2 +- ...ctureDefinition-PractitionerDirectory.json | 2 +- ...eDefinition-PractitionerRoleDirectory.json | 2 +- ...ructureDefinition-ServiceCoverageArea.json | 2 +- ...eDefinition-ServiceCoveragePostalCode.json | 2 +- ...ctureDefinition-SpecialOpeningTimesEX.json | 2 +- .../StructureDefinition-ncpeh-country-ex.json | 23 ++- .../resources/ValueSet-AddressStateVS.json | 2 +- .../ValueSet-EndpointConnectionTypeVS.json | 2 +- .../ValueSet-EndpointPayloadTypeVS.json | 2 +- .../ValueSet-EndpointVisibilityVS.json | 2 +- .../ValueSet-HealthcareServiceTypeVS.json | 2 +- .../ValueSet-HealthcareSpecialtyTypeVS.json | 2 +- .../ValueSet-OpeningTimeQualifierVS.json | 2 +- ...ueSet-OrganizationProfessionOIDTypeVS.json | 2 +- .../ValueSet-OrganizationTypeVS.json | 2 +- .../ValueSet-OrganizationVisibilityVS.json | 2 +- .../resources/ValueSet-OriginVS.json | 2 +- ...t-PhysicalFeaturesHealthCareServiceVS.json | 2 +- .../ValueSet-PractitionerQualificationVS.json | 2 +- ...Set-healthcare-service-category-codes.json | 2 +- ...reservice-technical-characteristic-vs.json | 2 +- ...cpeh-healthcare-service-speciality-cs.json | 2 +- src/fhir/input/fsh/alias.fsh | 6 +- src/fhir/input/fsh/examples/Examples001.fsh | 13 +- src/fhir/input/fsh/examples/NCPeHExamples.fsh | 8 +- .../fsh/examples/OrganizationExample001.fsh | 9 +- .../input/fsh/examples/PharmacyExample.fsh | 20 +-- .../fsh/examples/PractitionerExample001.fsh | 3 +- .../input/fsh/profiles/EndpointDirectory.fsh | 19 +- src/fhir/input/fsh/profiles/Extension.fsh | 15 +- .../profiles/HealthcareServiceDirectory.fsh | 32 +++- .../input/fsh/profiles/LocationDirectory.fsh | 21 ++- .../fsh/profiles/OrganizationDirectory.fsh | 25 +-- .../fsh/profiles/PractitionerDirectory.fsh | 12 ++ .../profiles/PractitionerRoleDirectory.fsh | 17 ++ src/fhir/input/fsh/ruleset.fsh | 9 +- src/fhir/input/fsh/searchParameter.fsh | 24 ++- src/fhir/sushi-config.yaml | 2 +- 95 files changed, 464 insertions(+), 210 deletions(-) diff --git a/changelog.md b/changelog.md index c42030b9..d743bdb5 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,12 @@ # Changelog +## 2024-12-20 Version 0.11.22 + +- feat: added SearchParameter for NCPeHCountryEx: OrganizationNCPeHCountrySP +- feat: added SearchParameter for Organization.alias: OrganizationAliasSP +- feat: 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 +- feat: added SearchParameters with Uplifted-Refchains extension for hapi fhir servers + ## 2024-12-03 - Version 0.11.21 - feat: restricted all extensible bindings to required: - EndpointDirectory.code @@ -14,6 +21,16 @@ - feat: added CodeSystems for HealthcareServiceTypeVS which weren't included before - feat: added * OrganizationProfessionOID#1.2.276.0.76.4.292 "NCPeH Fachdienst" to HealthcareServiceCategoryCodes ValueSet +### data migration +- check instances if they are using concepts outside of the bound ValueSets: + - EndpointDirectory.code (NAME!!!) + - EndpointDirectory.payloadType + - HealthcareServiceDirectory.type + - HealthcareServiceDirectory.characteristic + - LocationDirectory.state + - PractitionerDirectory.qualification.code +- check instances if they are using concepts from ServiceType on HealthcareServiceDirectory.speciality + ## 2024-11-15 - Version 0.11.20 - fix: SystemsEngineering:tim.gematik.de Example address is now a matrix uri diff --git a/package.json b/package.json index 3edd92d3..218dc4d8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "de.gematik.fhir.directory", - "version": "0.11.21", + "version": "0.11.22", "author": "gematik GmbH", "description": "Package Release des gematik FHIR Directory", "fhirVersions": [ diff --git a/src/fhir/fsh-generated/fsh-index.json b/src/fhir/fsh-generated/fsh-index.json index 8173854f..baa8a474 100644 --- a/src/fhir/fsh-generated/fsh-index.json +++ b/src/fhir/fsh-generated/fsh-index.json @@ -205,7 +205,7 @@ "fshType": "Instance", "fshFile": "examples/Examples001.fsh", "startLine": 1, - "endLine": 12 + "endLine": 11 }, { "outputFile": "Endpoint-OrganizationExample001-Endpoint-TIM.json", @@ -220,32 +220,32 @@ "fshName": "PharmacyEndpointErpReservationExample", "fshType": "Instance", "fshFile": "examples/PharmacyExample.fsh", - "startLine": 127, - "endLine": 137 + "startLine": 123, + "endLine": 132 }, { "outputFile": "Endpoint-PharmacyEndpointOnlineAppointmentBookingExample.json", "fshName": "PharmacyEndpointOnlineAppointmentBookingExample", "fshType": "Instance", "fshFile": "examples/PharmacyExample.fsh", - "startLine": 139, - "endLine": 149 + "startLine": 134, + "endLine": 143 }, { "outputFile": "Endpoint-PharmacyEndpointTIMExample.json", "fshName": "PharmacyEndpointTIMExample", "fshType": "Instance", "fshFile": "examples/PharmacyExample.fsh", - "startLine": 115, - "endLine": 125 + "startLine": 112, + "endLine": 121 }, { "outputFile": "HealthcareService-HealthcareServiceExample.json", "fshName": "HealthcareServiceExample", "fshType": "Instance", "fshFile": "examples/Examples001.fsh", - "startLine": 68, - "endLine": 110 + "startLine": 67, + "endLine": 109 }, { "outputFile": "HealthcareService-NCPeHHealthcareServiceExample.json", @@ -268,16 +268,16 @@ "fshName": "LocationExample", "fshType": "Instance", "fshFile": "examples/Examples001.fsh", - "startLine": 53, - "endLine": 66 + "startLine": 52, + "endLine": 65 }, { "outputFile": "Location-PharmacyLocationExample.json", "fshName": "PharmacyLocationExample", "fshType": "Instance", "fshFile": "examples/PharmacyExample.fsh", - "startLine": 96, - "endLine": 113 + "startLine": 94, + "endLine": 110 }, { "outputFile": "Organization-NCPeHOrganizationExample.json", @@ -292,8 +292,8 @@ "fshName": "OrganizationExample", "fshType": "Instance", "fshFile": "examples/Examples001.fsh", - "startLine": 39, - "endLine": 51 + "startLine": 38, + "endLine": 50 }, { "outputFile": "Organization-OrganizationExample001.json", @@ -301,7 +301,7 @@ "fshType": "Instance", "fshFile": "examples/OrganizationExample001.fsh", "startLine": 14, - "endLine": 39 + "endLine": 38 }, { "outputFile": "Organization-PharmacyOrganizationExample.json", @@ -317,23 +317,23 @@ "fshType": "Instance", "fshFile": "examples/PractitionerExample001.fsh", "startLine": 1, - "endLine": 18 + "endLine": 17 }, { "outputFile": "Practitioner-TIPractitionerExampleDentist.json", "fshName": "PractitionerExampleDentist", "fshType": "Instance", "fshFile": "examples/Examples001.fsh", - "startLine": 14, - "endLine": 27 + "startLine": 13, + "endLine": 26 }, { "outputFile": "PractitionerRole-PractitionerRoleExample.json", "fshName": "PractitionerRoleExample", "fshType": "Instance", "fshFile": "examples/Examples001.fsh", - "startLine": 29, - "endLine": 36 + "startLine": 28, + "endLine": 35 }, { "outputFile": "SearchParameter-EndpointAddressSP.json", @@ -351,6 +351,30 @@ "startLine": 46, "endLine": 55 }, + { + "outputFile": "SearchParameter-HealthcareService-endpoint.json", + "fshName": "HealthcareService-endpoint", + "fshType": "Instance", + "fshFile": "upliftedRefChains.fsh", + "startLine": 65, + "endLine": 97 + }, + { + "outputFile": "SearchParameter-HealthcareService-location.json", + "fshName": "HealthcareService-location", + "fshType": "Instance", + "fshFile": "upliftedRefChains.fsh", + "startLine": 35, + "endLine": 63 + }, + { + "outputFile": "SearchParameter-HealthcareService-organization.json", + "fshName": "HealthcareService-organization", + "fshType": "Instance", + "fshFile": "upliftedRefChains.fsh", + "startLine": 1, + "endLine": 33 + }, { "outputFile": "SearchParameter-HealthcareServiceCoverageAreaPostalCodeSP.json", "fshName": "HealthcareServiceCoverageAreaPostalCodeSP", @@ -359,6 +383,22 @@ "startLine": 57, "endLine": 66 }, + { + "outputFile": "SearchParameter-OrganizationAliasSP.json", + "fshName": "OrganizationAliasSP", + "fshType": "Instance", + "fshFile": "searchParameter.fsh", + "startLine": 79, + "endLine": 88 + }, + { + "outputFile": "SearchParameter-OrganizationNCPeHCountrySP.json", + "fshName": "OrganizationNCPeHCountrySP", + "fshType": "Instance", + "fshFile": "searchParameter.fsh", + "startLine": 68, + "endLine": 77 + }, { "outputFile": "SearchParameter-OrganizationTypeDisplaySP.json", "fshName": "OrganizationTypeDisplaySP", @@ -383,13 +423,37 @@ "startLine": 35, "endLine": 44 }, + { + "outputFile": "SearchParameter-PractitionerRole-endpoint.json", + "fshName": "PractitionerRole-endpoint", + "fshType": "Instance", + "fshFile": "upliftedRefChains.fsh", + "startLine": 161, + "endLine": 190 + }, + { + "outputFile": "SearchParameter-PractitionerRole-location.json", + "fshName": "PractitionerRole-location", + "fshType": "Instance", + "fshFile": "upliftedRefChains.fsh", + "startLine": 131, + "endLine": 159 + }, + { + "outputFile": "SearchParameter-PractitionerRole-practitioner.json", + "fshName": "PractitionerRole-practitioner", + "fshType": "Instance", + "fshFile": "upliftedRefChains.fsh", + "startLine": 99, + "endLine": 129 + }, { "outputFile": "StructureDefinition-EndpointDirectory.json", "fshName": "EndpointDirectory", "fshType": "Profile", "fshFile": "profiles/EndpointDirectory.fsh", "startLine": 1, - "endLine": 25 + "endLine": 24 }, { "outputFile": "StructureDefinition-EndpointVisibility.json", @@ -405,7 +469,15 @@ "fshType": "Profile", "fshFile": "profiles/HealthcareServiceDirectory.fsh", "startLine": 1, - "endLine": 65 + "endLine": 67 + }, + { + "outputFile": "StructureDefinition-HealthcareServiceDirectoryStrict.json", + "fshName": "HealthcareServiceDirectoryStrict", + "fshType": "Profile", + "fshFile": "profiles/HealthcareServiceDirectory.fsh", + "startLine": 69, + "endLine": 95 }, { "outputFile": "StructureDefinition-LocationDirectory.json", @@ -415,6 +487,14 @@ "startLine": 1, "endLine": 33 }, + { + "outputFile": "StructureDefinition-LocationDirectoryStrict.json", + "fshName": "LocationDirectoryStrict", + "fshType": "Profile", + "fshFile": "profiles/LocationDirectory.fsh", + "startLine": 35, + "endLine": 52 + }, { "outputFile": "StructureDefinition-OrganizationDirectory.json", "fshName": "OrganizationDirectory", @@ -423,6 +503,14 @@ "startLine": 1, "endLine": 51 }, + { + "outputFile": "StructureDefinition-OrganizationDirectoryStrict.json", + "fshName": "OrganizationDirectoryStrict", + "fshType": "Profile", + "fshFile": "profiles/OrganizationDirectory.fsh", + "startLine": 53, + "endLine": 65 + }, { "outputFile": "StructureDefinition-OrganizationVisibility.json", "fshName": "OrganizationVisibility", @@ -447,6 +535,14 @@ "startLine": 1, "endLine": 39 }, + { + "outputFile": "StructureDefinition-PractitionerDirectoryStrict.json", + "fshName": "PractitionerDirectoryStrict", + "fshType": "Profile", + "fshFile": "profiles/PractitionerDirectory.fsh", + "startLine": 41, + "endLine": 51 + }, { "outputFile": "StructureDefinition-PractitionerRoleDirectory.json", "fshName": "PractitionerRoleDirectory", @@ -455,6 +551,14 @@ "startLine": 1, "endLine": 17 }, + { + "outputFile": "StructureDefinition-PractitionerRoleDirectoryStrict.json", + "fshName": "PractitionerRoleDirectoryStrict", + "fshType": "Profile", + "fshFile": "profiles/PractitionerRoleDirectory.fsh", + "startLine": 19, + "endLine": 34 + }, { "outputFile": "StructureDefinition-ServiceCoverageArea.json", "fshName": "ServiceCoverageArea", @@ -479,13 +583,21 @@ "startLine": 71, "endLine": 86 }, + { + "outputFile": "StructureDefinition-endpoint-directory-Strict.json", + "fshName": "EndpointDirectoryStrict", + "fshType": "Profile", + "fshFile": "profiles/EndpointDirectory.fsh", + "startLine": 26, + "endLine": 38 + }, { "outputFile": "StructureDefinition-ncpeh-country-ex.json", "fshName": "NCPeHCountryEx", "fshType": "Extension", - "fshFile": "profiles/OrganizationDirectory.fsh", - "startLine": 53, - "endLine": 64 + "fshFile": "profiles/Extension.fsh", + "startLine": 111, + "endLine": 122 }, { "outputFile": "ValueSet-AddressStateVS.json", diff --git a/src/fhir/fsh-generated/fsh-index.txt b/src/fhir/fsh-generated/fsh-index.txt index 74c4844d..d28c0bf0 100644 --- a/src/fhir/fsh-generated/fsh-index.txt +++ b/src/fhir/fsh-generated/fsh-index.txt @@ -24,42 +24,56 @@ CodeSystem-physicalFeatures.json PhysicalFeatu CodeSystem-qualifikationen-nicht-aerztlicher-autoren-oid-url.json QualifikationenNichtAerztlicherAutoren_OID_URL CodeSystem codesystems/external/QualifikationenNichtAerztlicherAutoren.fsh 1 - 183 CodeSystem-qualifikatoren-zahnaerztlicher-autoren-oid-url.json QualifikatorenZahnaerztlicherAutoren_OID_URL CodeSystem codesystems/external/QualifikatorenZahnaerztlicherAutoren.fsh 1 - 11 CodeSystem-zahnaerztliche-fachrichtungen-oid-url.json ZahnaerztlicheFachrichtungen_OID_URL CodeSystem codesystems/external/ZahnAerztlicheFachrichtungen.fsh 1 - 7 -Endpoint-EndpointExample.json EndpointExample Instance examples/Examples001.fsh 1 - 12 +Endpoint-EndpointExample.json EndpointExample Instance examples/Examples001.fsh 1 - 11 Endpoint-OrganizationExample001-Endpoint-TIM.json OrganizationExample001-Endpoint-TIM Instance examples/OrganizationExample001.fsh 1 - 12 -Endpoint-PharmacyEndpointErpReservationExample.json PharmacyEndpointErpReservationExample Instance examples/PharmacyExample.fsh 127 - 137 -Endpoint-PharmacyEndpointOnlineAppointmentBookingExample.json PharmacyEndpointOnlineAppointmentBookingExample Instance examples/PharmacyExample.fsh 139 - 149 -Endpoint-PharmacyEndpointTIMExample.json PharmacyEndpointTIMExample Instance examples/PharmacyExample.fsh 115 - 125 -HealthcareService-HealthcareServiceExample.json HealthcareServiceExample Instance examples/Examples001.fsh 68 - 110 +Endpoint-PharmacyEndpointErpReservationExample.json PharmacyEndpointErpReservationExample Instance examples/PharmacyExample.fsh 123 - 132 +Endpoint-PharmacyEndpointOnlineAppointmentBookingExample.json PharmacyEndpointOnlineAppointmentBookingExample Instance examples/PharmacyExample.fsh 134 - 143 +Endpoint-PharmacyEndpointTIMExample.json PharmacyEndpointTIMExample Instance examples/PharmacyExample.fsh 112 - 121 +HealthcareService-HealthcareServiceExample.json HealthcareServiceExample Instance examples/Examples001.fsh 67 - 109 HealthcareService-NCPeHHealthcareServiceExample.json NCPeHHealthcareServiceExample Instance examples/NCPeHExamples.fsh 12 - 22 HealthcareService-PharmacyHealthCareServiceExample.json PharmacyHealthCareServiceExample Instance examples/PharmacyExample.fsh 23 - 92 -Location-LocationExample.json LocationExample Instance examples/Examples001.fsh 53 - 66 -Location-PharmacyLocationExample.json PharmacyLocationExample Instance examples/PharmacyExample.fsh 96 - 113 +Location-LocationExample.json LocationExample Instance examples/Examples001.fsh 52 - 65 +Location-PharmacyLocationExample.json PharmacyLocationExample Instance examples/PharmacyExample.fsh 94 - 110 Organization-NCPeHOrganizationExample.json NCPeHOrganizationExample Instance examples/NCPeHExamples.fsh 1 - 10 -Organization-OrganizationExample.json OrganizationExample Instance examples/Examples001.fsh 39 - 51 -Organization-OrganizationExample001.json OrganizationExample001 Instance examples/OrganizationExample001.fsh 14 - 39 +Organization-OrganizationExample.json OrganizationExample Instance examples/Examples001.fsh 38 - 50 +Organization-OrganizationExample001.json OrganizationExample001 Instance examples/OrganizationExample001.fsh 14 - 38 Organization-PharmacyOrganizationExample.json PharmacyOrganizationExample Instance examples/PharmacyExample.fsh 1 - 21 -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 +Practitioner-TIPractitionerExample001.json PractitionerExample001 Instance examples/PractitionerExample001.fsh 1 - 17 +Practitioner-TIPractitionerExampleDentist.json PractitionerExampleDentist Instance examples/Examples001.fsh 13 - 26 +PractitionerRole-PractitionerRoleExample.json PractitionerRoleExample Instance examples/Examples001.fsh 28 - 35 SearchParameter-EndpointAddressSP.json EndpointAddressSP Instance searchParameter.fsh 13 - 22 SearchParameter-EndpointVisibilitySP.json EndpointVisibilitySP Instance searchParameter.fsh 46 - 55 +SearchParameter-HealthcareService-endpoint.json HealthcareService-endpoint Instance upliftedRefChains.fsh 65 - 97 +SearchParameter-HealthcareService-location.json HealthcareService-location Instance upliftedRefChains.fsh 35 - 63 +SearchParameter-HealthcareService-organization.json HealthcareService-organization Instance upliftedRefChains.fsh 1 - 33 SearchParameter-HealthcareServiceCoverageAreaPostalCodeSP.json HealthcareServiceCoverageAreaPostalCodeSP Instance searchParameter.fsh 57 - 66 +SearchParameter-OrganizationAliasSP.json OrganizationAliasSP Instance searchParameter.fsh 79 - 88 +SearchParameter-OrganizationNCPeHCountrySP.json OrganizationNCPeHCountrySP Instance searchParameter.fsh 68 - 77 SearchParameter-OrganizationTypeDisplaySP.json OrganizationTypeDisplaySP Instance searchParameter.fsh 1 - 11 SearchParameter-OrganizationVisibilitySP.json OrganizationVisibilitySP Instance searchParameter.fsh 24 - 33 SearchParameter-PractitionerQualificationSP.json PractitionerQualificationSP Instance searchParameter.fsh 35 - 44 -StructureDefinition-EndpointDirectory.json EndpointDirectory Profile profiles/EndpointDirectory.fsh 1 - 25 +SearchParameter-PractitionerRole-endpoint.json PractitionerRole-endpoint Instance upliftedRefChains.fsh 161 - 190 +SearchParameter-PractitionerRole-location.json PractitionerRole-location Instance upliftedRefChains.fsh 131 - 159 +SearchParameter-PractitionerRole-practitioner.json PractitionerRole-practitioner Instance upliftedRefChains.fsh 99 - 129 +StructureDefinition-EndpointDirectory.json EndpointDirectory Profile profiles/EndpointDirectory.fsh 1 - 24 StructureDefinition-EndpointVisibility.json EndpointVisibility Extension profiles/Extension.fsh 47 - 55 -StructureDefinition-HealthcareServiceDirectory.json HealthcareServiceDirectory Profile profiles/HealthcareServiceDirectory.fsh 1 - 65 +StructureDefinition-HealthcareServiceDirectory.json HealthcareServiceDirectory Profile profiles/HealthcareServiceDirectory.fsh 1 - 67 +StructureDefinition-HealthcareServiceDirectoryStrict.json HealthcareServiceDirectoryStrict Profile profiles/HealthcareServiceDirectory.fsh 69 - 95 StructureDefinition-LocationDirectory.json LocationDirectory Profile profiles/LocationDirectory.fsh 1 - 33 +StructureDefinition-LocationDirectoryStrict.json LocationDirectoryStrict Profile profiles/LocationDirectory.fsh 35 - 52 StructureDefinition-OrganizationDirectory.json OrganizationDirectory Profile profiles/OrganizationDirectory.fsh 1 - 51 +StructureDefinition-OrganizationDirectoryStrict.json OrganizationDirectoryStrict Profile profiles/OrganizationDirectory.fsh 53 - 65 StructureDefinition-OrganizationVisibility.json OrganizationVisibility Extension profiles/Extension.fsh 23 - 31 StructureDefinition-PhysicalFeaturesAdditionalNoteEX.json PhysicalFeaturesAdditionalNoteEX Extension profiles/Extension.fsh 102 - 109 StructureDefinition-PractitionerDirectory.json PractitionerDirectory Profile profiles/PractitionerDirectory.fsh 1 - 39 +StructureDefinition-PractitionerDirectoryStrict.json PractitionerDirectoryStrict Profile profiles/PractitionerDirectory.fsh 41 - 51 StructureDefinition-PractitionerRoleDirectory.json PractitionerRoleDirectory Profile profiles/PractitionerRoleDirectory.fsh 1 - 17 +StructureDefinition-PractitionerRoleDirectoryStrict.json PractitionerRoleDirectoryStrict Profile profiles/PractitionerRoleDirectory.fsh 19 - 34 StructureDefinition-ServiceCoverageArea.json ServiceCoverageArea Extension profiles/Extension.fsh 1 - 12 StructureDefinition-ServiceCoveragePostalCode.json ServiceCoveragePostalCode Extension profiles/Extension.fsh 14 - 21 StructureDefinition-SpecialOpeningTimesEX.json SpecialOpeningTimesEX Extension profiles/Extension.fsh 71 - 86 -StructureDefinition-ncpeh-country-ex.json NCPeHCountryEx Extension profiles/OrganizationDirectory.fsh 53 - 64 +StructureDefinition-endpoint-directory-Strict.json EndpointDirectoryStrict Profile profiles/EndpointDirectory.fsh 26 - 38 +StructureDefinition-ncpeh-country-ex.json NCPeHCountryEx Extension profiles/Extension.fsh 111 - 122 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 - 5 diff --git a/src/fhir/fsh-generated/resources/CodeSystem-EndpointDirectoryConnectionType.json b/src/fhir/fsh-generated/resources/CodeSystem-EndpointDirectoryConnectionType.json index 2e7e4414..5965d439 100644 --- a/src/fhir/fsh-generated/resources/CodeSystem-EndpointDirectoryConnectionType.json +++ b/src/fhir/fsh-generated/resources/CodeSystem-EndpointDirectoryConnectionType.json @@ -6,7 +6,7 @@ "id": "EndpointDirectoryConnectionType", "title": "Codes for Endpoint.connectionType", "description": "CodeSystem TI specific connection types assigned to the Endpoints", - "version": "0.11.21", + "version": "0.11.22", "url": "https://gematik.de/fhir/directory/CodeSystem/EndpointDirectoryConnectionType", "concept": [ { diff --git a/src/fhir/fsh-generated/resources/CodeSystem-EndpointDirectoryPayloadType.json b/src/fhir/fsh-generated/resources/CodeSystem-EndpointDirectoryPayloadType.json index aa2922a2..fe1dc5ad 100644 --- a/src/fhir/fsh-generated/resources/CodeSystem-EndpointDirectoryPayloadType.json +++ b/src/fhir/fsh-generated/resources/CodeSystem-EndpointDirectoryPayloadType.json @@ -6,7 +6,7 @@ "id": "EndpointDirectoryPayloadType", "title": "Codes for Endpoint.payloadType", "description": "CodeSystem TI specific payload types assigned to the Endpoints\n\nCodes are maintained by gematik.\nThe codes are used to declare which processes are supported by an entity with the corresponding entry in the gematik Directory.\nNew codes can be requested at gematik. There must exist a specification for each code so that developers can find out how to implement the process.", - "version": "0.11.21", + "version": "0.11.22", "url": "https://gematik.de/fhir/directory/CodeSystem/EndpointDirectoryPayloadType", "concept": [ { diff --git a/src/fhir/fsh-generated/resources/CodeSystem-EndpointVisibilityCS.json b/src/fhir/fsh-generated/resources/CodeSystem-EndpointVisibilityCS.json index e9ee3097..f764800e 100644 --- a/src/fhir/fsh-generated/resources/CodeSystem-EndpointVisibilityCS.json +++ b/src/fhir/fsh-generated/resources/CodeSystem-EndpointVisibilityCS.json @@ -6,7 +6,7 @@ "id": "EndpointVisibilityCS", "title": "EndpointVisibilityCS", "description": "EndpointVisibilityCS", - "version": "0.11.21", + "version": "0.11.22", "url": "https://gematik.de/fhir/directory/CodeSystem/EndpointVisibilityCS", "concept": [ { diff --git a/src/fhir/fsh-generated/resources/CodeSystem-HealthcareServiceSpecialtyCS.json b/src/fhir/fsh-generated/resources/CodeSystem-HealthcareServiceSpecialtyCS.json index 87bc4f6d..a1bc1f7c 100644 --- a/src/fhir/fsh-generated/resources/CodeSystem-HealthcareServiceSpecialtyCS.json +++ b/src/fhir/fsh-generated/resources/CodeSystem-HealthcareServiceSpecialtyCS.json @@ -6,7 +6,7 @@ "id": "HealthcareServiceSpecialtyCS", "title": "HealthcareService Specialty", "description": "Specialty codes of HealthcareServices", - "version": "0.11.21", + "version": "0.11.22", "url": "https://gematik.de/fhir/directory/CodeSystem/HealthcareServiceSpecialtyCS", "concept": [ { diff --git a/src/fhir/fsh-generated/resources/CodeSystem-HolderCS.json b/src/fhir/fsh-generated/resources/CodeSystem-HolderCS.json index c906d2e1..11e6edf1 100644 --- a/src/fhir/fsh-generated/resources/CodeSystem-HolderCS.json +++ b/src/fhir/fsh-generated/resources/CodeSystem-HolderCS.json @@ -6,7 +6,7 @@ "id": "HolderCS", "title": "Codes for identity authorities (Holder)", "description": "Code System for identity authories in the TI, which verify and control the identities of practitioners and organisations", - "version": "0.11.21", + "version": "0.11.22", "url": "https://gematik.de/fhir/directory/CodeSystem/HolderCS", "concept": [ { diff --git a/src/fhir/fsh-generated/resources/CodeSystem-OpeningTimeQualifierCS.json b/src/fhir/fsh-generated/resources/CodeSystem-OpeningTimeQualifierCS.json index f0be9d26..12b4dba7 100644 --- a/src/fhir/fsh-generated/resources/CodeSystem-OpeningTimeQualifierCS.json +++ b/src/fhir/fsh-generated/resources/CodeSystem-OpeningTimeQualifierCS.json @@ -6,7 +6,7 @@ "id": "OpeningTimeQualifierCS", "title": "OpeningTimeQualifierCS", "description": "Qualifier code for HealthCareService opening times", - "version": "0.11.21", + "version": "0.11.22", "url": "https://gematik.de/fhir/directory/CodeSystem/OpeningTimeQualifierCS", "concept": [ { diff --git a/src/fhir/fsh-generated/resources/CodeSystem-OrganizationProfessionOID.json b/src/fhir/fsh-generated/resources/CodeSystem-OrganizationProfessionOID.json index f56fde07..297ab994 100644 --- a/src/fhir/fsh-generated/resources/CodeSystem-OrganizationProfessionOID.json +++ b/src/fhir/fsh-generated/resources/CodeSystem-OrganizationProfessionOID.json @@ -6,7 +6,7 @@ "id": "OrganizationProfessionOID", "title": "CodeSystem for ProfessionOID of Institutions", "description": "The codes for Organizations based on Profession OIDs defined in [gemSpec_OID](https://fachportal.gematik.de/fachportal-import/files/gemSpec_OID_V3.10.0.pdf)", - "version": "0.11.21", + "version": "0.11.22", "url": "https://gematik.de/fhir/directory/CodeSystem/OrganizationProfessionOID", "concept": [ { diff --git a/src/fhir/fsh-generated/resources/CodeSystem-OrganizationProviderType.json b/src/fhir/fsh-generated/resources/CodeSystem-OrganizationProviderType.json index 74969d26..037fa6de 100644 --- a/src/fhir/fsh-generated/resources/CodeSystem-OrganizationProviderType.json +++ b/src/fhir/fsh-generated/resources/CodeSystem-OrganizationProviderType.json @@ -5,7 +5,7 @@ "name": "OrganizationProviderType", "id": "OrganizationProviderType", "description": "CodeSystem of TI Service Provider types as to be found in the gematik Directory", - "version": "0.11.21", + "version": "0.11.22", "url": "https://gematik.de/fhir/directory/CodeSystem/OrganizationProviderType", "concept": [ { diff --git a/src/fhir/fsh-generated/resources/CodeSystem-OrganizationVisibilityCS.json b/src/fhir/fsh-generated/resources/CodeSystem-OrganizationVisibilityCS.json index 0adca991..cc1001b8 100644 --- a/src/fhir/fsh-generated/resources/CodeSystem-OrganizationVisibilityCS.json +++ b/src/fhir/fsh-generated/resources/CodeSystem-OrganizationVisibilityCS.json @@ -6,7 +6,7 @@ "id": "OrganizationVisibilityCS", "title": "OrganizationVisibilityCS", "description": "OrganizationVisibilityCS", - "version": "0.11.21", + "version": "0.11.22", "url": "https://gematik.de/fhir/directory/CodeSystem/OrganizationVisibilityCS", "concept": [ { diff --git a/src/fhir/fsh-generated/resources/CodeSystem-Origin.json b/src/fhir/fsh-generated/resources/CodeSystem-Origin.json index f28e4486..b70b37f8 100644 --- a/src/fhir/fsh-generated/resources/CodeSystem-Origin.json +++ b/src/fhir/fsh-generated/resources/CodeSystem-Origin.json @@ -5,7 +5,7 @@ "name": "Origin", "id": "Origin", "description": "CodeSystem which identifies the origin of a resource in the FHIR Directory", - "version": "0.11.21", + "version": "0.11.22", "url": "https://gematik.de/fhir/directory/CodeSystem/Origin", "concept": [ { diff --git a/src/fhir/fsh-generated/resources/CodeSystem-PharmacyHealthcareSpecialtyCS.json b/src/fhir/fsh-generated/resources/CodeSystem-PharmacyHealthcareSpecialtyCS.json index 8b027ef1..5c6b04a1 100644 --- a/src/fhir/fsh-generated/resources/CodeSystem-PharmacyHealthcareSpecialtyCS.json +++ b/src/fhir/fsh-generated/resources/CodeSystem-PharmacyHealthcareSpecialtyCS.json @@ -6,7 +6,7 @@ "id": "PharmacyHealthcareSpecialtyCS", "title": "Pharmacy HealthcareService Specialty", "description": "Specialty codes of pharmacy HealthcareServices", - "version": "0.11.21", + "version": "0.11.22", "url": "https://gematik.de/fhir/directory/CodeSystem/PharmacyHealthcareSpecialtyCS", "concept": [ { diff --git a/src/fhir/fsh-generated/resources/CodeSystem-PharmacyTypeCS.json b/src/fhir/fsh-generated/resources/CodeSystem-PharmacyTypeCS.json index a7924001..c41c03d1 100644 --- a/src/fhir/fsh-generated/resources/CodeSystem-PharmacyTypeCS.json +++ b/src/fhir/fsh-generated/resources/CodeSystem-PharmacyTypeCS.json @@ -6,7 +6,7 @@ "id": "PharmacyTypeCS", "title": "Pharmacy type", "description": "Pharmacy type codes of accessability for patients", - "version": "0.11.21", + "version": "0.11.22", "url": "https://gematik.de/fhir/directory/CodeSystem/PharmacyTypeCS", "concept": [ { diff --git a/src/fhir/fsh-generated/resources/CodeSystem-PharmacyTypeLDAPCS.json b/src/fhir/fsh-generated/resources/CodeSystem-PharmacyTypeLDAPCS.json index 2adf720d..d0bf3eb5 100644 --- a/src/fhir/fsh-generated/resources/CodeSystem-PharmacyTypeLDAPCS.json +++ b/src/fhir/fsh-generated/resources/CodeSystem-PharmacyTypeLDAPCS.json @@ -6,7 +6,7 @@ "id": "PharmacyTypeLDAPCS", "title": "Pharmacy type LDAP", "description": "Pharmacy type codes used in the LDAP-VZD", - "version": "0.11.21", + "version": "0.11.22", "url": "https://gematik.de/fhir/directory/CodeSystem/PharmacyTypeLDAPCS", "concept": [ { diff --git a/src/fhir/fsh-generated/resources/CodeSystem-PractitionerProfessionOID.json b/src/fhir/fsh-generated/resources/CodeSystem-PractitionerProfessionOID.json index ebd05ee8..f38ec0dd 100644 --- a/src/fhir/fsh-generated/resources/CodeSystem-PractitionerProfessionOID.json +++ b/src/fhir/fsh-generated/resources/CodeSystem-PractitionerProfessionOID.json @@ -6,7 +6,7 @@ "id": "PractitionerProfessionOID", "title": "CodeSystem for Practitioner's ProfessionOID", "description": "The codes for Practitioners based on Profession OIDs defined in [gemSpec_OID](https://fachportal.gematik.de/fachportal-import/files/gemSpec_OID_V3.10.0.pdf)", - "version": "0.11.21", + "version": "0.11.22", "url": "https://gematik.de/fhir/directory/CodeSystem/PractitionerProfessionOID", "concept": [ { diff --git a/src/fhir/fsh-generated/resources/CodeSystem-Region.json b/src/fhir/fsh-generated/resources/CodeSystem-Region.json index 21f7758b..9e4cbcae 100644 --- a/src/fhir/fsh-generated/resources/CodeSystem-Region.json +++ b/src/fhir/fsh-generated/resources/CodeSystem-Region.json @@ -6,7 +6,7 @@ "id": "Region", "title": "Codes for regions in german healthcare system.", "description": "Additionally to german Bundeslander there are 2 sub-provinces \n`Nordrhein` and `Westfalen-Lippe`.", - "version": "0.11.21", + "version": "0.11.22", "url": "https://gematik.de/fhir/directory/CodeSystem/Region", "concept": [ { diff --git a/src/fhir/fsh-generated/resources/CodeSystem-VZDHealthCareServiceCharacteristicsCS.json b/src/fhir/fsh-generated/resources/CodeSystem-VZDHealthCareServiceCharacteristicsCS.json index 8010a835..e4cfded4 100644 --- a/src/fhir/fsh-generated/resources/CodeSystem-VZDHealthCareServiceCharacteristicsCS.json +++ b/src/fhir/fsh-generated/resources/CodeSystem-VZDHealthCareServiceCharacteristicsCS.json @@ -5,7 +5,7 @@ "name": "VZDHealthCareServiceCharacteristicsCS", "id": "VZDHealthCareServiceCharacteristicsCS", "description": "CodeSystem of VZD specific HealthcareService characteristics", - "version": "0.11.21", + "version": "0.11.22", "url": "https://gematik.de/fhir/directory/CodeSystem/VZDHealthCareServiceCharacteristicsCS", "concept": [ { diff --git a/src/fhir/fsh-generated/resources/CodeSystem-aerztliche-fachrichtungen-oid-url.json b/src/fhir/fsh-generated/resources/CodeSystem-aerztliche-fachrichtungen-oid-url.json index 09c9a7fb..9d10525e 100644 --- a/src/fhir/fsh-generated/resources/CodeSystem-aerztliche-fachrichtungen-oid-url.json +++ b/src/fhir/fsh-generated/resources/CodeSystem-aerztliche-fachrichtungen-oid-url.json @@ -6,7 +6,7 @@ "id": "aerztliche-fachrichtungen-oid-url", "title": "AerztlicheFachrichtungen", "description": "AerztlicheFachrichtungen", - "version": "0.11.21", + "version": "0.11.22", "url": "urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4", "concept": [ { diff --git a/src/fhir/fsh-generated/resources/CodeSystem-aerztlicheBerufsvarianten.json b/src/fhir/fsh-generated/resources/CodeSystem-aerztlicheBerufsvarianten.json index 04faffac..a99c3b2a 100644 --- a/src/fhir/fsh-generated/resources/CodeSystem-aerztlicheBerufsvarianten.json +++ b/src/fhir/fsh-generated/resources/CodeSystem-aerztlicheBerufsvarianten.json @@ -6,7 +6,7 @@ "id": "aerztlicheBerufsvarianten", "title": "AerztlicheBerufsvarianten", "description": "AerztlicheBerufsvarianten", - "version": "0.11.21", + "version": "0.11.22", "url": "urn:oid:1.2.276.0.76.5.493", "concept": [ { diff --git a/src/fhir/fsh-generated/resources/CodeSystem-facharzttitelderaerztekammern-oid-url.json b/src/fhir/fsh-generated/resources/CodeSystem-facharzttitelderaerztekammern-oid-url.json index f5cab0e5..3471e68b 100644 --- a/src/fhir/fsh-generated/resources/CodeSystem-facharzttitelderaerztekammern-oid-url.json +++ b/src/fhir/fsh-generated/resources/CodeSystem-facharzttitelderaerztekammern-oid-url.json @@ -6,7 +6,7 @@ "id": "facharzttitelderaerztekammern-oid-url", "title": "Facharzttitel Der Aerztekammern", "description": "Facharzttitel Der Aerztekammern", - "version": "0.11.21", + "version": "0.11.22", "url": "urn:oid:1.2.276.0.76.5.514", "concept": [ { diff --git a/src/fhir/fsh-generated/resources/CodeSystem-kbv-cm-sfhir-bar2-wbo-oid-url.json b/src/fhir/fsh-generated/resources/CodeSystem-kbv-cm-sfhir-bar2-wbo-oid-url.json index 0a331fcb..aa880aff 100644 --- a/src/fhir/fsh-generated/resources/CodeSystem-kbv-cm-sfhir-bar2-wbo-oid-url.json +++ b/src/fhir/fsh-generated/resources/CodeSystem-kbv-cm-sfhir-bar2-wbo-oid-url.json @@ -6,7 +6,7 @@ "id": "kbv-cm-sfhir-bar2-wbo-oid-url", "title": "KBV_CS_SFHIR_BAR2_WBO Fachgruppen", "description": "Fachgruppen-Codes nach Weiterbildungsordnung Bundesarztregister, BAR-Schlüsselverzeichnis Anlage 4", - "version": "0.11.21", + "version": "0.11.22", "url": "urn:oid:1.2.276.0.76.5.114", "concept": [ { diff --git a/src/fhir/fsh-generated/resources/CodeSystem-nicht-aerztliche-fachrichtungen-oid-url.json b/src/fhir/fsh-generated/resources/CodeSystem-nicht-aerztliche-fachrichtungen-oid-url.json index 19bf3e5b..a3ce7b3f 100644 --- a/src/fhir/fsh-generated/resources/CodeSystem-nicht-aerztliche-fachrichtungen-oid-url.json +++ b/src/fhir/fsh-generated/resources/CodeSystem-nicht-aerztliche-fachrichtungen-oid-url.json @@ -6,7 +6,7 @@ "id": "nicht-aerztliche-fachrichtungen-oid-url", "title": "NichtAerztlicheFachrichtungen_OID_URL", "description": "NichtAerztlicheFachrichtungen_OID_URL", - "version": "0.11.21", + "version": "0.11.22", "url": "urn:oid:1.3.6.1.4.1.19376.3.276.1.5.5", "concept": [ { diff --git a/src/fhir/fsh-generated/resources/CodeSystem-physicalFeatures.json b/src/fhir/fsh-generated/resources/CodeSystem-physicalFeatures.json index 09c6b37e..8c8c0635 100644 --- a/src/fhir/fsh-generated/resources/CodeSystem-physicalFeatures.json +++ b/src/fhir/fsh-generated/resources/CodeSystem-physicalFeatures.json @@ -5,7 +5,7 @@ "name": "PhysicalFeaturesHealthCareServiceCS", "id": "physicalFeatures", "description": "CodeSystem of defined physical features", - "version": "0.11.21", + "version": "0.11.22", "url": "https://gematik.de/fhir/directory/CodeSystem/physicalFeatures", "concept": [ { diff --git a/src/fhir/fsh-generated/resources/CodeSystem-qualifikationen-nicht-aerztlicher-autoren-oid-url.json b/src/fhir/fsh-generated/resources/CodeSystem-qualifikationen-nicht-aerztlicher-autoren-oid-url.json index 939b5fe7..b5d51a6a 100644 --- a/src/fhir/fsh-generated/resources/CodeSystem-qualifikationen-nicht-aerztlicher-autoren-oid-url.json +++ b/src/fhir/fsh-generated/resources/CodeSystem-qualifikationen-nicht-aerztlicher-autoren-oid-url.json @@ -6,7 +6,7 @@ "id": "qualifikationen-nicht-aerztlicher-autoren-oid-url", "title": "Qualifikationen Nicht Aerztlicher Autoren", "description": "Qualifikationen Nicht Aerztlicher Autoren", - "version": "0.11.21", + "version": "0.11.22", "url": "urn:oid:1.3.6.1.4.1.19376.3.276.1.5.11", "concept": [ { diff --git a/src/fhir/fsh-generated/resources/CodeSystem-qualifikatoren-zahnaerztlicher-autoren-oid-url.json b/src/fhir/fsh-generated/resources/CodeSystem-qualifikatoren-zahnaerztlicher-autoren-oid-url.json index 05942cdc..2b395511 100644 --- a/src/fhir/fsh-generated/resources/CodeSystem-qualifikatoren-zahnaerztlicher-autoren-oid-url.json +++ b/src/fhir/fsh-generated/resources/CodeSystem-qualifikatoren-zahnaerztlicher-autoren-oid-url.json @@ -6,7 +6,7 @@ "id": "qualifikatoren-zahnaerztlicher-autoren-oid-url", "title": "Qualifikatoren Zahnaerztlicher Autoren", "description": "Qualifikatoren Zahnaerztlicher Autoren", - "version": "0.11.21", + "version": "0.11.22", "url": "urn:oid:1.2.276.0.76.5.492", "concept": [ { diff --git a/src/fhir/fsh-generated/resources/CodeSystem-zahnaerztliche-fachrichtungen-oid-url.json b/src/fhir/fsh-generated/resources/CodeSystem-zahnaerztliche-fachrichtungen-oid-url.json index 91d057c2..39adbd3f 100644 --- a/src/fhir/fsh-generated/resources/CodeSystem-zahnaerztliche-fachrichtungen-oid-url.json +++ b/src/fhir/fsh-generated/resources/CodeSystem-zahnaerztliche-fachrichtungen-oid-url.json @@ -6,7 +6,7 @@ "id": "zahnaerztliche-fachrichtungen-oid-url", "title": "ZahnaerztlicheFachrichtungen", "description": "ZahnaerztlicheFachrichtungen", - "version": "0.11.21", + "version": "0.11.22", "url": "urn:oid:1.2.276.0.76.5.494", "concept": [ { diff --git a/src/fhir/fsh-generated/resources/Endpoint-EndpointExample.json b/src/fhir/fsh-generated/resources/Endpoint-EndpointExample.json index 39e3512c..f57a7f51 100644 --- a/src/fhir/fsh-generated/resources/Endpoint-EndpointExample.json +++ b/src/fhir/fsh-generated/resources/Endpoint-EndpointExample.json @@ -9,7 +9,7 @@ } ], "profile": [ - "https://gematik.de/fhir/directory/StructureDefinition/EndpointDirectory" + "https://gematik.de/fhir/directory/StructureDefinition/endpoint-directory-Strict" ] }, "extension": [ @@ -28,9 +28,6 @@ "display": "TI-Messenger Endpoint" }, "name": "Messenger", - "managingOrganization": { - "reference": "Organization/OrganizationExample" - }, "payloadType": [ { "coding": [ diff --git a/src/fhir/fsh-generated/resources/Endpoint-OrganizationExample001-Endpoint-TIM.json b/src/fhir/fsh-generated/resources/Endpoint-OrganizationExample001-Endpoint-TIM.json index 9211505b..897f8e28 100644 --- a/src/fhir/fsh-generated/resources/Endpoint-OrganizationExample001-Endpoint-TIM.json +++ b/src/fhir/fsh-generated/resources/Endpoint-OrganizationExample001-Endpoint-TIM.json @@ -9,7 +9,7 @@ } ], "profile": [ - "https://gematik.de/fhir/directory/StructureDefinition/EndpointDirectory" + "https://gematik.de/fhir/directory/StructureDefinition/endpoint-directory-Strict" ] }, "status": "active", diff --git a/src/fhir/fsh-generated/resources/Endpoint-PharmacyEndpointErpReservationExample.json b/src/fhir/fsh-generated/resources/Endpoint-PharmacyEndpointErpReservationExample.json index d04a7ae1..cb9dac2b 100644 --- a/src/fhir/fsh-generated/resources/Endpoint-PharmacyEndpointErpReservationExample.json +++ b/src/fhir/fsh-generated/resources/Endpoint-PharmacyEndpointErpReservationExample.json @@ -9,7 +9,7 @@ } ], "profile": [ - "https://gematik.de/fhir/directory/StructureDefinition/EndpointDirectory" + "https://gematik.de/fhir/directory/StructureDefinition/endpoint-directory-Strict" ] }, "status": "active", @@ -19,9 +19,6 @@ "display": "Reservierung" }, "name": "ERP Reservierung", - "managingOrganization": { - "reference": "Organization/PharmacyOrganizationExample" - }, "address": "https://be-305314293.adv-erezept.de/gematik/onPremise//", "payloadType": [ { diff --git a/src/fhir/fsh-generated/resources/Endpoint-PharmacyEndpointOnlineAppointmentBookingExample.json b/src/fhir/fsh-generated/resources/Endpoint-PharmacyEndpointOnlineAppointmentBookingExample.json index e81b5e44..95e8aafe 100644 --- a/src/fhir/fsh-generated/resources/Endpoint-PharmacyEndpointOnlineAppointmentBookingExample.json +++ b/src/fhir/fsh-generated/resources/Endpoint-PharmacyEndpointOnlineAppointmentBookingExample.json @@ -9,7 +9,7 @@ } ], "profile": [ - "https://gematik.de/fhir/directory/StructureDefinition/EndpointDirectory" + "https://gematik.de/fhir/directory/StructureDefinition/endpoint-directory-Strict" ] }, "status": "active", @@ -19,9 +19,6 @@ "display": "Online Terminbuchung" }, "name": "Online Terminbuchung", - "managingOrganization": { - "reference": "Organization/PharmacyOrganizationExample" - }, "address": "https://rathausapotheke.de/terminbuchung", "payloadType": [ { diff --git a/src/fhir/fsh-generated/resources/Endpoint-PharmacyEndpointTIMExample.json b/src/fhir/fsh-generated/resources/Endpoint-PharmacyEndpointTIMExample.json index 0dc3a52d..0cf2ddd5 100644 --- a/src/fhir/fsh-generated/resources/Endpoint-PharmacyEndpointTIMExample.json +++ b/src/fhir/fsh-generated/resources/Endpoint-PharmacyEndpointTIMExample.json @@ -9,7 +9,7 @@ } ], "profile": [ - "https://gematik.de/fhir/directory/StructureDefinition/EndpointDirectory" + "https://gematik.de/fhir/directory/StructureDefinition/endpoint-directory-Strict" ] }, "status": "active", @@ -19,9 +19,6 @@ "display": "TI-Messenger Endpoint" }, "name": "Messenger", - "managingOrganization": { - "reference": "Organization/PharmacyOrganizationExample" - }, "payloadType": [ { "coding": [ diff --git a/src/fhir/fsh-generated/resources/HealthcareService-HealthcareServiceExample.json b/src/fhir/fsh-generated/resources/HealthcareService-HealthcareServiceExample.json index a3254f8e..fc67a9a9 100644 --- a/src/fhir/fsh-generated/resources/HealthcareService-HealthcareServiceExample.json +++ b/src/fhir/fsh-generated/resources/HealthcareService-HealthcareServiceExample.json @@ -9,7 +9,7 @@ } ], "profile": [ - "https://gematik.de/fhir/directory/StructureDefinition/HealthcareServiceDirectory" + "https://gematik.de/fhir/directory/StructureDefinition/HealthcareServiceDirectoryStrict" ] }, "identifier": [ diff --git a/src/fhir/fsh-generated/resources/HealthcareService-NCPeHHealthcareServiceExample.json b/src/fhir/fsh-generated/resources/HealthcareService-NCPeHHealthcareServiceExample.json index dbc70d3a..0bb61111 100644 --- a/src/fhir/fsh-generated/resources/HealthcareService-NCPeHHealthcareServiceExample.json +++ b/src/fhir/fsh-generated/resources/HealthcareService-NCPeHHealthcareServiceExample.json @@ -9,7 +9,7 @@ } ], "profile": [ - "https://gematik.de/fhir/directory/StructureDefinition/HealthcareServiceDirectory" + "https://gematik.de/fhir/directory/StructureDefinition/HealthcareServiceDirectoryStrict" ] }, "identifier": [ diff --git a/src/fhir/fsh-generated/resources/HealthcareService-PharmacyHealthCareServiceExample.json b/src/fhir/fsh-generated/resources/HealthcareService-PharmacyHealthCareServiceExample.json index 7e76c627..cc9b7641 100644 --- a/src/fhir/fsh-generated/resources/HealthcareService-PharmacyHealthCareServiceExample.json +++ b/src/fhir/fsh-generated/resources/HealthcareService-PharmacyHealthCareServiceExample.json @@ -9,7 +9,7 @@ } ], "profile": [ - "https://gematik.de/fhir/directory/StructureDefinition/HealthcareServiceDirectory" + "https://gematik.de/fhir/directory/StructureDefinition/HealthcareServiceDirectoryStrict" ] }, "identifier": [ diff --git a/src/fhir/fsh-generated/resources/Location-PharmacyLocationExample.json b/src/fhir/fsh-generated/resources/Location-PharmacyLocationExample.json index 00a77244..e2cc03ce 100644 --- a/src/fhir/fsh-generated/resources/Location-PharmacyLocationExample.json +++ b/src/fhir/fsh-generated/resources/Location-PharmacyLocationExample.json @@ -9,7 +9,7 @@ } ], "profile": [ - "https://gematik.de/fhir/directory/StructureDefinition/LocationDirectory" + "https://gematik.de/fhir/directory/StructureDefinition/LocationDirectoryStrict" ] }, "name": "Rathausapotheke", @@ -25,7 +25,6 @@ "postalCode": "60596", "country": "DE" }, - "availabilityExceptions": "An Feiertagen geschlossen", "managingOrganization": { "reference": "Organization/OrganizationExample001" }, diff --git a/src/fhir/fsh-generated/resources/Organization-NCPeHOrganizationExample.json b/src/fhir/fsh-generated/resources/Organization-NCPeHOrganizationExample.json index c5aa5fa9..5d81a685 100644 --- a/src/fhir/fsh-generated/resources/Organization-NCPeHOrganizationExample.json +++ b/src/fhir/fsh-generated/resources/Organization-NCPeHOrganizationExample.json @@ -9,7 +9,7 @@ } ], "profile": [ - "https://gematik.de/fhir/directory/StructureDefinition/OrganizationDirectory" + "https://gematik.de/fhir/directory/StructureDefinition/OrganizationDirectoryStrict" ] }, "identifier": [ @@ -21,14 +21,10 @@ "extension": [ { "url": "https://gematik.de/fhir/directory/StructureDefinition/ncpeh-country-ex", - "valueCodeableConcept": { - "coding": [ - { - "code": "PT", - "system": "urn:iso:std:iso:3166", - "display": "Portugal" - } - ] + "valueCoding": { + "code": "PT", + "system": "urn:iso:std:iso:3166", + "display": "Portugal" } } ], diff --git a/src/fhir/fsh-generated/resources/Organization-OrganizationExample.json b/src/fhir/fsh-generated/resources/Organization-OrganizationExample.json index 6223eea9..dd179691 100644 --- a/src/fhir/fsh-generated/resources/Organization-OrganizationExample.json +++ b/src/fhir/fsh-generated/resources/Organization-OrganizationExample.json @@ -9,7 +9,7 @@ } ], "profile": [ - "https://gematik.de/fhir/directory/StructureDefinition/OrganizationDirectory" + "https://gematik.de/fhir/directory/StructureDefinition/OrganizationDirectoryStrict" ] }, "identifier": [ diff --git a/src/fhir/fsh-generated/resources/Organization-OrganizationExample001.json b/src/fhir/fsh-generated/resources/Organization-OrganizationExample001.json index db701534..efaf0b57 100644 --- a/src/fhir/fsh-generated/resources/Organization-OrganizationExample001.json +++ b/src/fhir/fsh-generated/resources/Organization-OrganizationExample001.json @@ -9,7 +9,7 @@ } ], "profile": [ - "https://gematik.de/fhir/directory/StructureDefinition/OrganizationDirectory" + "https://gematik.de/fhir/directory/StructureDefinition/OrganizationDirectoryStrict" ] }, "identifier": [ @@ -67,10 +67,5 @@ } ] } - ], - "endpoint": [ - { - "reference": "Endpoint/OrganizationExample001-Endpoint-TIM" - } ] } diff --git a/src/fhir/fsh-generated/resources/Organization-PharmacyOrganizationExample.json b/src/fhir/fsh-generated/resources/Organization-PharmacyOrganizationExample.json index 18cadb18..c43b30c6 100644 --- a/src/fhir/fsh-generated/resources/Organization-PharmacyOrganizationExample.json +++ b/src/fhir/fsh-generated/resources/Organization-PharmacyOrganizationExample.json @@ -9,7 +9,7 @@ } ], "profile": [ - "https://gematik.de/fhir/directory/StructureDefinition/OrganizationDirectory" + "https://gematik.de/fhir/directory/StructureDefinition/OrganizationDirectoryStrict" ] }, "identifier": [ diff --git a/src/fhir/fsh-generated/resources/Practitioner-TIPractitionerExample001.json b/src/fhir/fsh-generated/resources/Practitioner-TIPractitionerExample001.json index 559c07b7..cd2db220 100644 --- a/src/fhir/fsh-generated/resources/Practitioner-TIPractitionerExample001.json +++ b/src/fhir/fsh-generated/resources/Practitioner-TIPractitionerExample001.json @@ -9,7 +9,7 @@ } ], "profile": [ - "https://gematik.de/fhir/directory/StructureDefinition/PractitionerDirectory" + "https://gematik.de/fhir/directory/StructureDefinition/PractitionerDirectoryStrict" ] }, "identifier": [ @@ -22,7 +22,6 @@ "value": "123456789" } ], - "active": true, "qualification": [ { "code": { diff --git a/src/fhir/fsh-generated/resources/Practitioner-TIPractitionerExampleDentist.json b/src/fhir/fsh-generated/resources/Practitioner-TIPractitionerExampleDentist.json index 4df701ff..cfbcda7e 100644 --- a/src/fhir/fsh-generated/resources/Practitioner-TIPractitionerExampleDentist.json +++ b/src/fhir/fsh-generated/resources/Practitioner-TIPractitionerExampleDentist.json @@ -9,7 +9,7 @@ } ], "profile": [ - "https://gematik.de/fhir/directory/StructureDefinition/PractitionerDirectory" + "https://gematik.de/fhir/directory/StructureDefinition/PractitionerDirectoryStrict" ] }, "identifier": [ diff --git a/src/fhir/fsh-generated/resources/SearchParameter-EndpointAddressSP.json b/src/fhir/fsh-generated/resources/SearchParameter-EndpointAddressSP.json index 67e7d1c4..5b9fad44 100644 --- a/src/fhir/fsh-generated/resources/SearchParameter-EndpointAddressSP.json +++ b/src/fhir/fsh-generated/resources/SearchParameter-EndpointAddressSP.json @@ -2,7 +2,7 @@ "resourceType": "SearchParameter", "id": "EndpointAddressSP", "url": "https://gematik.de/fhir/directory/SearchParameter/EndpointAddressSP", - "version": "0.11.21", + "version": "0.11.22", "status": "active", "experimental": false, "publisher": "gematik GmbH", diff --git a/src/fhir/fsh-generated/resources/SearchParameter-EndpointVisibilitySP.json b/src/fhir/fsh-generated/resources/SearchParameter-EndpointVisibilitySP.json index 310d9a94..a8c4cdca 100644 --- a/src/fhir/fsh-generated/resources/SearchParameter-EndpointVisibilitySP.json +++ b/src/fhir/fsh-generated/resources/SearchParameter-EndpointVisibilitySP.json @@ -2,7 +2,7 @@ "resourceType": "SearchParameter", "id": "EndpointVisibilitySP", "url": "https://gematik.de/fhir/directory/SearchParameter/EndpointVisibilitySP", - "version": "0.11.21", + "version": "0.11.22", "status": "active", "experimental": false, "publisher": "gematik GmbH", diff --git a/src/fhir/fsh-generated/resources/SearchParameter-HealthcareServiceCoverageAreaPostalCodeSP.json b/src/fhir/fsh-generated/resources/SearchParameter-HealthcareServiceCoverageAreaPostalCodeSP.json index 8bcf975b..bb825cdd 100644 --- a/src/fhir/fsh-generated/resources/SearchParameter-HealthcareServiceCoverageAreaPostalCodeSP.json +++ b/src/fhir/fsh-generated/resources/SearchParameter-HealthcareServiceCoverageAreaPostalCodeSP.json @@ -2,7 +2,7 @@ "resourceType": "SearchParameter", "id": "HealthcareServiceCoverageAreaPostalCodeSP", "url": "https://gematik.de/fhir/directory/SearchParameter/HealthcareServiceCoverageAreaPostalCodeSP", - "version": "0.11.21", + "version": "0.11.22", "status": "active", "experimental": false, "publisher": "gematik GmbH", diff --git a/src/fhir/fsh-generated/resources/SearchParameter-OrganizationTypeDisplaySP.json b/src/fhir/fsh-generated/resources/SearchParameter-OrganizationTypeDisplaySP.json index bdb3f45e..64979fe7 100644 --- a/src/fhir/fsh-generated/resources/SearchParameter-OrganizationTypeDisplaySP.json +++ b/src/fhir/fsh-generated/resources/SearchParameter-OrganizationTypeDisplaySP.json @@ -2,7 +2,7 @@ "resourceType": "SearchParameter", "id": "OrganizationTypeDisplaySP", "url": "https://gematik.de/fhir/directory/SearchParameter/OrganizationTypeDisplaySP", - "version": "0.11.21", + "version": "0.11.22", "status": "active", "experimental": false, "publisher": "gematik GmbH", diff --git a/src/fhir/fsh-generated/resources/SearchParameter-OrganizationVisibilitySP.json b/src/fhir/fsh-generated/resources/SearchParameter-OrganizationVisibilitySP.json index a1d2bd6f..80da4130 100644 --- a/src/fhir/fsh-generated/resources/SearchParameter-OrganizationVisibilitySP.json +++ b/src/fhir/fsh-generated/resources/SearchParameter-OrganizationVisibilitySP.json @@ -2,7 +2,7 @@ "resourceType": "SearchParameter", "id": "OrganizationVisibilitySP", "url": "https://gematik.de/fhir/directory/SearchParameter/OrganizationVisibilitySP", - "version": "0.11.21", + "version": "0.11.22", "status": "active", "experimental": false, "publisher": "gematik GmbH", diff --git a/src/fhir/fsh-generated/resources/SearchParameter-PractitionerQualificationSP.json b/src/fhir/fsh-generated/resources/SearchParameter-PractitionerQualificationSP.json index cb757071..5d94a05b 100644 --- a/src/fhir/fsh-generated/resources/SearchParameter-PractitionerQualificationSP.json +++ b/src/fhir/fsh-generated/resources/SearchParameter-PractitionerQualificationSP.json @@ -2,7 +2,7 @@ "resourceType": "SearchParameter", "id": "PractitionerQualificationSP", "url": "https://gematik.de/fhir/directory/SearchParameter/PractitionerQualificationSP", - "version": "0.11.21", + "version": "0.11.22", "status": "active", "experimental": false, "publisher": "gematik GmbH", diff --git a/src/fhir/fsh-generated/resources/StructureDefinition-EndpointDirectory.json b/src/fhir/fsh-generated/resources/StructureDefinition-EndpointDirectory.json index 9243a08e..fe70460e 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.21", + "version": "0.11.22", "name": "EndpointDirectory", "title": "Endpoint in gematik Directory", "status": "active", diff --git a/src/fhir/fsh-generated/resources/StructureDefinition-EndpointVisibility.json b/src/fhir/fsh-generated/resources/StructureDefinition-EndpointVisibility.json index 452713a2..0083d853 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.21", + "version": "0.11.22", "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 630ea8c6..f69c8bf1 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.21", + "version": "0.11.22", "name": "HealthcareServiceDirectory", "title": "HealthcareService in gematik Directory", "status": "active", @@ -322,6 +322,16 @@ "path": "HealthcareService.notAvailable", "mustSupport": true }, + { + "id": "HealthcareService.notAvailable.description", + "path": "HealthcareService.notAvailable.description", + "mustSupport": true + }, + { + "id": "HealthcareService.notAvailable.during", + "path": "HealthcareService.notAvailable.during", + "mustSupport": true + }, { "id": "HealthcareService.availabilityExceptions", "path": "HealthcareService.availabilityExceptions", diff --git a/src/fhir/fsh-generated/resources/StructureDefinition-LocationDirectory.json b/src/fhir/fsh-generated/resources/StructureDefinition-LocationDirectory.json index 39ef4ae8..607cfa2b 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.21", + "version": "0.11.22", "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 e87d8628..1c60f645 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.21", + "version": "0.11.22", "name": "OrganizationDirectory", "title": "Organization in gematik Directory", "status": "active", diff --git a/src/fhir/fsh-generated/resources/StructureDefinition-OrganizationVisibility.json b/src/fhir/fsh-generated/resources/StructureDefinition-OrganizationVisibility.json index 66940700..2918646d 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.21", + "version": "0.11.22", "name": "OrganizationVisibility", "title": "OrganizationVisibility", "status": "active", diff --git a/src/fhir/fsh-generated/resources/StructureDefinition-PhysicalFeaturesAdditionalNoteEX.json b/src/fhir/fsh-generated/resources/StructureDefinition-PhysicalFeaturesAdditionalNoteEX.json index 8c20e839..9983b76a 100644 --- a/src/fhir/fsh-generated/resources/StructureDefinition-PhysicalFeaturesAdditionalNoteEX.json +++ b/src/fhir/fsh-generated/resources/StructureDefinition-PhysicalFeaturesAdditionalNoteEX.json @@ -2,7 +2,7 @@ "resourceType": "StructureDefinition", "id": "PhysicalFeaturesAdditionalNoteEX", "url": "https://gematik.de/fhir/directory/StructureDefinition/PhysicalFeaturesAdditionalNoteEX", - "version": "0.11.21", + "version": "0.11.22", "name": "PhysicalFeaturesAdditionalNoteEX", "title": "Physical Features Additional Note", "status": "active", diff --git a/src/fhir/fsh-generated/resources/StructureDefinition-PractitionerDirectory.json b/src/fhir/fsh-generated/resources/StructureDefinition-PractitionerDirectory.json index 9de8d5ff..ccb9d5fb 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.21", + "version": "0.11.22", "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 54b941e1..7e5cf38f 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.21", + "version": "0.11.22", "name": "PractitionerRoleDirectory", "title": "PractitionerRole in gematik Directory", "status": "active", diff --git a/src/fhir/fsh-generated/resources/StructureDefinition-ServiceCoverageArea.json b/src/fhir/fsh-generated/resources/StructureDefinition-ServiceCoverageArea.json index 50c9ea27..7fc7cbf7 100644 --- a/src/fhir/fsh-generated/resources/StructureDefinition-ServiceCoverageArea.json +++ b/src/fhir/fsh-generated/resources/StructureDefinition-ServiceCoverageArea.json @@ -2,7 +2,7 @@ "resourceType": "StructureDefinition", "id": "ServiceCoverageArea", "url": "https://gematik.de/fhir/directory/StructureDefinition/ServiceCoverageArea", - "version": "0.11.21", + "version": "0.11.22", "name": "ServiceCoverageArea", "title": "ServiceCoverageArea", "status": "active", diff --git a/src/fhir/fsh-generated/resources/StructureDefinition-ServiceCoveragePostalCode.json b/src/fhir/fsh-generated/resources/StructureDefinition-ServiceCoveragePostalCode.json index 60c7a8de..d616b8fc 100644 --- a/src/fhir/fsh-generated/resources/StructureDefinition-ServiceCoveragePostalCode.json +++ b/src/fhir/fsh-generated/resources/StructureDefinition-ServiceCoveragePostalCode.json @@ -2,7 +2,7 @@ "resourceType": "StructureDefinition", "id": "ServiceCoveragePostalCode", "url": "https://gematik.de/fhir/directory/StructureDefinition/ServiceCoveragePostalCode", - "version": "0.11.21", + "version": "0.11.22", "name": "ServiceCoveragePostalCode", "title": "ServiceCoveragePostalCode", "status": "active", diff --git a/src/fhir/fsh-generated/resources/StructureDefinition-SpecialOpeningTimesEX.json b/src/fhir/fsh-generated/resources/StructureDefinition-SpecialOpeningTimesEX.json index 7bc4652b..d8e20adf 100644 --- a/src/fhir/fsh-generated/resources/StructureDefinition-SpecialOpeningTimesEX.json +++ b/src/fhir/fsh-generated/resources/StructureDefinition-SpecialOpeningTimesEX.json @@ -2,7 +2,7 @@ "resourceType": "StructureDefinition", "id": "SpecialOpeningTimesEX", "url": "https://gematik.de/fhir/directory/StructureDefinition/SpecialOpeningTimesEX", - "version": "0.11.21", + "version": "0.11.22", "name": "SpecialOpeningTimesEX", "title": "SpecialOpeningTimesEX", "status": "active", diff --git a/src/fhir/fsh-generated/resources/StructureDefinition-ncpeh-country-ex.json b/src/fhir/fsh-generated/resources/StructureDefinition-ncpeh-country-ex.json index 2da528c5..f05375e9 100644 --- a/src/fhir/fsh-generated/resources/StructureDefinition-ncpeh-country-ex.json +++ b/src/fhir/fsh-generated/resources/StructureDefinition-ncpeh-country-ex.json @@ -2,10 +2,13 @@ "resourceType": "StructureDefinition", "id": "ncpeh-country-ex", "url": "https://gematik.de/fhir/directory/StructureDefinition/ncpeh-country-ex", - "version": "0.11.21", + "version": "0.11.22", "name": "NCPeHCountryEx", "title": "National Contact Point of Health (NCPeH) Country Extension", - "status": "draft", + "status": "active", + "experimental": false, + "date": "2024-10-29", + "publisher": "gematik GmbH", "description": "The country extension for National Contact Point of Health (NCPeH) Organizations, representing the country in which the NCPeH is located.", "fhirVersion": "4.0.1", "kind": "complex-type", @@ -43,7 +46,7 @@ "min": 1, "type": [ { - "code": "CodeableConcept" + "code": "Coding" } ], "mustSupport": true, @@ -53,20 +56,14 @@ } }, { - "id": "Extension.value[x].coding", - "path": "Extension.value[x].coding", - "max": "1", - "mustSupport": true - }, - { - "id": "Extension.value[x].coding.system", - "path": "Extension.value[x].coding.system", + "id": "Extension.value[x].system", + "path": "Extension.value[x].system", "min": 1, "mustSupport": true }, { - "id": "Extension.value[x].coding.code", - "path": "Extension.value[x].coding.code", + "id": "Extension.value[x].code", + "path": "Extension.value[x].code", "min": 1, "mustSupport": true } diff --git a/src/fhir/fsh-generated/resources/ValueSet-AddressStateVS.json b/src/fhir/fsh-generated/resources/ValueSet-AddressStateVS.json index 31445157..f1cb01ae 100644 --- a/src/fhir/fsh-generated/resources/ValueSet-AddressStateVS.json +++ b/src/fhir/fsh-generated/resources/ValueSet-AddressStateVS.json @@ -4,7 +4,7 @@ "name": "AddressStateVS", "id": "AddressStateVS", "description": "ValueSet for `Address.state`", - "version": "0.11.21", + "version": "0.11.22", "url": "https://gematik.de/fhir/directory/ValueSet/AddressStateVS", "experimental": false, "publisher": "gematik GmbH", diff --git a/src/fhir/fsh-generated/resources/ValueSet-EndpointConnectionTypeVS.json b/src/fhir/fsh-generated/resources/ValueSet-EndpointConnectionTypeVS.json index 9ef50f06..24636187 100644 --- a/src/fhir/fsh-generated/resources/ValueSet-EndpointConnectionTypeVS.json +++ b/src/fhir/fsh-generated/resources/ValueSet-EndpointConnectionTypeVS.json @@ -4,7 +4,7 @@ "name": "EndpointConnectionTypeVS", "id": "EndpointConnectionTypeVS", "description": "ValueSet for `Endpoint.connectionType`", - "version": "0.11.21", + "version": "0.11.22", "url": "https://gematik.de/fhir/directory/ValueSet/EndpointConnectionTypeVS", "experimental": false, "publisher": "gematik GmbH", diff --git a/src/fhir/fsh-generated/resources/ValueSet-EndpointPayloadTypeVS.json b/src/fhir/fsh-generated/resources/ValueSet-EndpointPayloadTypeVS.json index 84c42d67..cadb4f21 100644 --- a/src/fhir/fsh-generated/resources/ValueSet-EndpointPayloadTypeVS.json +++ b/src/fhir/fsh-generated/resources/ValueSet-EndpointPayloadTypeVS.json @@ -4,7 +4,7 @@ "name": "EndpointPayloadTypeVS", "id": "EndpointPayloadTypeVS", "description": "ValueSet for `Endpoint.payloadType`", - "version": "0.11.21", + "version": "0.11.22", "url": "https://gematik.de/fhir/directory/ValueSet/EndpointPayloadTypeVS", "experimental": false, "publisher": "gematik GmbH", diff --git a/src/fhir/fsh-generated/resources/ValueSet-EndpointVisibilityVS.json b/src/fhir/fsh-generated/resources/ValueSet-EndpointVisibilityVS.json index 8367947c..56abcfc4 100644 --- a/src/fhir/fsh-generated/resources/ValueSet-EndpointVisibilityVS.json +++ b/src/fhir/fsh-generated/resources/ValueSet-EndpointVisibilityVS.json @@ -5,7 +5,7 @@ "id": "EndpointVisibilityVS", "title": "EndpointVisibilityVS", "description": "EndpointVisibilityVS", - "version": "0.11.21", + "version": "0.11.22", "url": "https://gematik.de/fhir/directory/ValueSet/EndpointVisibilityVS", "experimental": false, "publisher": "gematik GmbH", diff --git a/src/fhir/fsh-generated/resources/ValueSet-HealthcareServiceTypeVS.json b/src/fhir/fsh-generated/resources/ValueSet-HealthcareServiceTypeVS.json index 3f94e510..a0e9e701 100644 --- a/src/fhir/fsh-generated/resources/ValueSet-HealthcareServiceTypeVS.json +++ b/src/fhir/fsh-generated/resources/ValueSet-HealthcareServiceTypeVS.json @@ -4,7 +4,7 @@ "name": "HealthcareServiceTypeVS", "id": "HealthcareServiceTypeVS", "description": "ValueSet for `HealthcareService.type`", - "version": "0.11.21", + "version": "0.11.22", "url": "https://gematik.de/fhir/directory/ValueSet/HealthcareServiceTypeVS", "experimental": false, "publisher": "gematik GmbH", diff --git a/src/fhir/fsh-generated/resources/ValueSet-HealthcareSpecialtyTypeVS.json b/src/fhir/fsh-generated/resources/ValueSet-HealthcareSpecialtyTypeVS.json index 15d1cd13..3e4ad267 100644 --- a/src/fhir/fsh-generated/resources/ValueSet-HealthcareSpecialtyTypeVS.json +++ b/src/fhir/fsh-generated/resources/ValueSet-HealthcareSpecialtyTypeVS.json @@ -5,7 +5,7 @@ "id": "HealthcareSpecialtyTypeVS", "title": "ValueSet of HealthcareService specialities", "description": "HealthcareService specialities", - "version": "0.11.21", + "version": "0.11.22", "url": "https://gematik.de/fhir/directory/ValueSet/HealthcareSpecialtyTypeVS", "experimental": false, "publisher": "gematik GmbH", diff --git a/src/fhir/fsh-generated/resources/ValueSet-OpeningTimeQualifierVS.json b/src/fhir/fsh-generated/resources/ValueSet-OpeningTimeQualifierVS.json index d59b8df1..a87c06ec 100644 --- a/src/fhir/fsh-generated/resources/ValueSet-OpeningTimeQualifierVS.json +++ b/src/fhir/fsh-generated/resources/ValueSet-OpeningTimeQualifierVS.json @@ -5,7 +5,7 @@ "id": "OpeningTimeQualifierVS", "title": "OpeningTimeQualifierVS", "description": "ValueSet of Qualifier codes for HealthCareService opening times", - "version": "0.11.21", + "version": "0.11.22", "url": "https://gematik.de/fhir/directory/ValueSet/OpeningTimeQualifierVS", "experimental": false, "publisher": "gematik GmbH", diff --git a/src/fhir/fsh-generated/resources/ValueSet-OrganizationProfessionOIDTypeVS.json b/src/fhir/fsh-generated/resources/ValueSet-OrganizationProfessionOIDTypeVS.json index c223c50f..446cef4b 100644 --- a/src/fhir/fsh-generated/resources/ValueSet-OrganizationProfessionOIDTypeVS.json +++ b/src/fhir/fsh-generated/resources/ValueSet-OrganizationProfessionOIDTypeVS.json @@ -4,7 +4,7 @@ "name": "OrganizationProfessionOIDTypeVS", "id": "OrganizationProfessionOIDTypeVS", "description": "ValueSet for `Organization.type`", - "version": "0.11.21", + "version": "0.11.22", "url": "https://gematik.de/fhir/directory/ValueSet/OrganizationProfessionOIDTypeVS", "experimental": false, "publisher": "gematik GmbH", diff --git a/src/fhir/fsh-generated/resources/ValueSet-OrganizationTypeVS.json b/src/fhir/fsh-generated/resources/ValueSet-OrganizationTypeVS.json index 0a3684bb..8013316f 100644 --- a/src/fhir/fsh-generated/resources/ValueSet-OrganizationTypeVS.json +++ b/src/fhir/fsh-generated/resources/ValueSet-OrganizationTypeVS.json @@ -4,7 +4,7 @@ "name": "OrganizationTypeVS", "id": "OrganizationTypeVS", "description": "ValueSet for `Organization.type`", - "version": "0.11.21", + "version": "0.11.22", "url": "https://gematik.de/fhir/directory/ValueSet/OrganizationTypeVS", "experimental": false, "publisher": "gematik GmbH", diff --git a/src/fhir/fsh-generated/resources/ValueSet-OrganizationVisibilityVS.json b/src/fhir/fsh-generated/resources/ValueSet-OrganizationVisibilityVS.json index 005841e8..82d4adc3 100644 --- a/src/fhir/fsh-generated/resources/ValueSet-OrganizationVisibilityVS.json +++ b/src/fhir/fsh-generated/resources/ValueSet-OrganizationVisibilityVS.json @@ -5,7 +5,7 @@ "id": "OrganizationVisibilityVS", "title": "OrganizationVisibilityVS", "description": "OrganizationVisibilityVS", - "version": "0.11.21", + "version": "0.11.22", "url": "https://gematik.de/fhir/directory/ValueSet/OrganizationVisibilityVS", "experimental": false, "publisher": "gematik GmbH", diff --git a/src/fhir/fsh-generated/resources/ValueSet-OriginVS.json b/src/fhir/fsh-generated/resources/ValueSet-OriginVS.json index 333c7d17..71f5104e 100644 --- a/src/fhir/fsh-generated/resources/ValueSet-OriginVS.json +++ b/src/fhir/fsh-generated/resources/ValueSet-OriginVS.json @@ -4,7 +4,7 @@ "name": "OriginVS", "id": "OriginVS", "description": "ValueSet for `meta.tag[Origin]`", - "version": "0.11.21", + "version": "0.11.22", "url": "https://gematik.de/fhir/directory/ValueSet/OriginVS", "experimental": false, "publisher": "gematik GmbH", diff --git a/src/fhir/fsh-generated/resources/ValueSet-PhysicalFeaturesHealthCareServiceVS.json b/src/fhir/fsh-generated/resources/ValueSet-PhysicalFeaturesHealthCareServiceVS.json index 54580b4f..1eedc25a 100644 --- a/src/fhir/fsh-generated/resources/ValueSet-PhysicalFeaturesHealthCareServiceVS.json +++ b/src/fhir/fsh-generated/resources/ValueSet-PhysicalFeaturesHealthCareServiceVS.json @@ -4,7 +4,7 @@ "name": "PhysicalFeaturesHealthCareServiceVS", "id": "PhysicalFeaturesHealthCareServiceVS", "description": "ValueSet of defined physical features", - "version": "0.11.21", + "version": "0.11.22", "url": "https://gematik.de/fhir/directory/ValueSet/PhysicalFeaturesHealthCareServiceVS", "experimental": false, "publisher": "gematik GmbH", diff --git a/src/fhir/fsh-generated/resources/ValueSet-PractitionerQualificationVS.json b/src/fhir/fsh-generated/resources/ValueSet-PractitionerQualificationVS.json index 03168506..e082f477 100644 --- a/src/fhir/fsh-generated/resources/ValueSet-PractitionerQualificationVS.json +++ b/src/fhir/fsh-generated/resources/ValueSet-PractitionerQualificationVS.json @@ -4,7 +4,7 @@ "name": "PractitionerQualificationVS", "id": "PractitionerQualificationVS", "description": "ValueSet for `Practitoner.qualification`", - "version": "0.11.21", + "version": "0.11.22", "url": "https://gematik.de/fhir/directory/ValueSet/PractitionerQualificationVS", "experimental": false, "publisher": "gematik GmbH", diff --git a/src/fhir/fsh-generated/resources/ValueSet-healthcare-service-category-codes.json b/src/fhir/fsh-generated/resources/ValueSet-healthcare-service-category-codes.json index c326b134..9233bd78 100644 --- a/src/fhir/fsh-generated/resources/ValueSet-healthcare-service-category-codes.json +++ b/src/fhir/fsh-generated/resources/ValueSet-healthcare-service-category-codes.json @@ -5,7 +5,7 @@ "id": "healthcare-service-category-codes", "title": "HealthcareService Category Codes", "description": "Codes for the VZD HealthcareService category element.", - "version": "0.11.21", + "version": "0.11.22", "url": "https://gematik.de/fhir/directory/ValueSet/healthcare-service-category-codes", "compose": { "include": [ diff --git a/src/fhir/fsh-generated/resources/ValueSet-healthcareservice-technical-characteristic-vs.json b/src/fhir/fsh-generated/resources/ValueSet-healthcareservice-technical-characteristic-vs.json index e66e4717..2ac15e8d 100644 --- a/src/fhir/fsh-generated/resources/ValueSet-healthcareservice-technical-characteristic-vs.json +++ b/src/fhir/fsh-generated/resources/ValueSet-healthcareservice-technical-characteristic-vs.json @@ -5,7 +5,7 @@ "id": "healthcareservice-technical-characteristic-vs", "title": "HealthCareServiceTechnicalCharacteristicVS", "description": "HealthCareServiceTechnicalCharacteristicVS", - "version": "0.11.21", + "version": "0.11.22", "url": "https://gematik.de/fhir/directory/ValueSet/healthcareservice-technical-characteristic-vs", "experimental": false, "publisher": "gematik GmbH", diff --git a/src/fhir/fsh-generated/resources/ValueSet-ncpeh-healthcare-service-speciality-cs.json b/src/fhir/fsh-generated/resources/ValueSet-ncpeh-healthcare-service-speciality-cs.json index 460b6774..539c0fe1 100644 --- a/src/fhir/fsh-generated/resources/ValueSet-ncpeh-healthcare-service-speciality-cs.json +++ b/src/fhir/fsh-generated/resources/ValueSet-ncpeh-healthcare-service-speciality-cs.json @@ -5,7 +5,7 @@ "id": "ncpeh-healthcare-service-speciality-cs", "title": "NCPeH HealthcareService Speciality ValueSet", "description": "Supported documents by a National Contact Point", - "version": "0.11.21", + "version": "0.11.22", "url": "https://gematik.de/fhir/directory/ValueSet/ncpeh-healthcare-service-speciality-cs", "compose": { "include": [ diff --git a/src/fhir/input/fsh/alias.fsh b/src/fhir/input/fsh/alias.fsh index 4b7feaf5..e3974b85 100644 --- a/src/fhir/input/fsh/alias.fsh +++ b/src/fhir/input/fsh/alias.fsh @@ -5,6 +5,7 @@ Alias: $ContactPointSystemCS = http://hl7.org/fhir/contact-point-system Alias: $HL7EndpointConnectionType = http://terminology.hl7.org/CodeSystem/endpoint-connection-type Alias: $UCUM = http://unitsofmeasure.org Alias: $loinc = http://loinc.org +Alias: $sct = http://snomed.info/sct Alias: $IHEXDSauthorSpeciality = http://ihe-d.de/ValueSets/IHEXDSauthorSpeciality @@ -33,5 +34,6 @@ Alias: $DaysOfWeek = http://hl7.org/fhir/days-of-week Alias: $ContactPointSystem = http://hl7.org/fhir/contact-point-system Alias: $ContactPointUse = http://hl7.org/fhir/contact-point-use Alias: $CommonLanguages = urn:ietf:bcp:47 -Alias: $sct = http://snomed.info/sct -Alias: $IHEXDShealthcareFacilityTypeCodePatientRelatedHealthcare = http://ihe-d.de/ValueSets/IHEXDShealthcareFacilityTypeCodePatientRelatedHealthcare \ No newline at end of file + +Alias: $IHEXDShealthcareFacilityTypeCodePatientRelatedHealthcare = http://ihe-d.de/ValueSets/IHEXDShealthcareFacilityTypeCodePatientRelatedHealthcare +Alias: $refChainEx = https://smilecdr.com/fhir/ns/StructureDefinition/searchparameter-uplift-refchain \ No newline at end of file diff --git a/src/fhir/input/fsh/examples/Examples001.fsh b/src/fhir/input/fsh/examples/Examples001.fsh index 6d6b1bb6..9bb0e681 100644 --- a/src/fhir/input/fsh/examples/Examples001.fsh +++ b/src/fhir/input/fsh/examples/Examples001.fsh @@ -1,5 +1,5 @@ Instance: EndpointExample -InstanceOf: EndpointDirectory +InstanceOf: EndpointDirectoryStrict Usage: #example Description: "Example of a Endpoint as to be found in gematik FHIR Directory" * meta.tag[Origin] = Origin#owner @@ -7,12 +7,11 @@ Description: "Example of a Endpoint as to be found in gematik FHIR Directory" * status = #active "Active" * connectionType = EndpointDirectoryConnectionType#tim "TI-Messenger Endpoint" * name = "Messenger" -* managingOrganization = Reference(OrganizationExample) * payloadType = EndpointDirectoryPayloadType#tim-chat "TI-Messenger chat" * address = "matrix:u/74c1fecc710ce4c8a8bbe310fbc5954c2a5e1e9ef5f70d651da1bfc4c9abe43f:example-domain.de" Instance: PractitionerExampleDentist -InstanceOf: PractitionerDirectory +InstanceOf: PractitionerDirectoryStrict Usage: #example Description: "Example of a Practitioner (Dentist) as to be found in gematik FHIR Directory" * meta.tag[Origin] = Origin#ldap @@ -37,12 +36,12 @@ Description: "Example of an PractitionerRole as to be found in gematik FHIR Dire Instance: OrganizationExample -InstanceOf: OrganizationDirectory +InstanceOf: OrganizationDirectoryStrict Usage: #example Description: "Example of an Organization as to be found in gematik FHIR Directory" * meta.tag[Origin] = Origin#ldap * identifier[TelematikID].value = "2-2.58.00000040" -* type = https://gematik.de/fhir/directory/CodeSystem/OrganizationProfessionOID#1.2.276.0.76.4.51 "Zahnarztpraxis" +* type[profession] = https://gematik.de/fhir/directory/CodeSystem/OrganizationProfessionOID#1.2.276.0.76.4.51 "Zahnarztpraxis" * name = "Zahnarztpraxis Dr. Mustermann" * active = true * alias = "Zahnarztpraxis am Bahnhof" @@ -66,7 +65,7 @@ Description: "Example of a Location as to be found in gematik FHIR Directory" * managingOrganization = Reference(OrganizationExample001) Instance: HealthcareServiceExample -InstanceOf: HealthcareServiceDirectory +InstanceOf: HealthcareServiceDirectoryStrict Usage: #example Description: "Example of an HealthcareService as to be found in gematik FHIR Directory" * meta.tag[Origin] = Origin#ldap @@ -107,4 +106,4 @@ Description: "Example of an HealthcareService as to be found in gematik FHIR Dir * availableTime.availableEndTime = "18:00:00" * availabilityExceptions = "An Feiertagen geschlossen" * endpoint[+] = Reference(EndpointExample) -* characteristic = VZDHealthCareServiceCharacteristicsCS#erx-token-receiver "eRX Token Receiver" +* characteristic[technicalCharacteristic] = VZDHealthCareServiceCharacteristicsCS#erx-token-receiver "eRX Token Receiver" diff --git a/src/fhir/input/fsh/examples/NCPeHExamples.fsh b/src/fhir/input/fsh/examples/NCPeHExamples.fsh index 4aa8fcf3..ee4a3067 100644 --- a/src/fhir/input/fsh/examples/NCPeHExamples.fsh +++ b/src/fhir/input/fsh/examples/NCPeHExamples.fsh @@ -1,16 +1,16 @@ Instance: NCPeHOrganizationExample -InstanceOf: OrganizationDirectory +InstanceOf: OrganizationDirectoryStrict Usage: #example Description: "Example of an NCPeH Organization as to be found in gematik FHIR Directory" * meta.tag[Origin] = Origin#ldap -* extension[ncpehCountryEx].valueCodeableConcept = urn:iso:std:iso:3166#PT "Portugal" +* extension[ncpehCountryEx].valueCoding = urn:iso:std:iso:3166#PT "Portugal" * identifier[TelematikID].value = "2-2.58.00000041" -* type = OrganizationProfessionOID#1.2.276.0.76.4.292 "NCPeH Fachdienst" +* type[profession] = OrganizationProfessionOID#1.2.276.0.76.4.292 "NCPeH Fachdienst" * name = "NCPeH Portugal" * active = true Instance: NCPeHHealthcareServiceExample -InstanceOf: HealthcareServiceDirectory +InstanceOf: HealthcareServiceDirectoryStrict Usage: #example Description: "Example of a NCPeH HealthcareService as to be found in gematik FHIR Directory" * meta.tag[Origin] = Origin#ldap diff --git a/src/fhir/input/fsh/examples/OrganizationExample001.fsh b/src/fhir/input/fsh/examples/OrganizationExample001.fsh index 8fea643d..608af4f2 100644 --- a/src/fhir/input/fsh/examples/OrganizationExample001.fsh +++ b/src/fhir/input/fsh/examples/OrganizationExample001.fsh @@ -1,5 +1,5 @@ Instance: OrganizationExample001-Endpoint-TIM -InstanceOf: EndpointDirectory +InstanceOf: EndpointDirectoryStrict Usage: #example Description: """ Example TI-Messenger Endpoint @@ -12,14 +12,14 @@ Example TI-Messenger Endpoint * payloadType = EndpointDirectoryPayloadType#tim-chat Instance: OrganizationExample001 -InstanceOf: OrganizationDirectory +InstanceOf: OrganizationDirectoryStrict Usage: #example Description: "Example of an Organization as to be found in gematik FHIR Directory" * meta.tag[Origin] = Origin#ldap * active = true * extension[organizationVisibility].valueCoding = OrganizationVisibilityCS#hide-erezeptApp * identifier[TelematikID].value = "9-2.58.00000040" -* type = OrganizationProfessionOID#1.2.276.0.76.4.58 +* type[profession] = OrganizationProfessionOID#1.2.276.0.76.4.58 * name = "gematik GmbH" * active = true * alias = "gematik" @@ -35,5 +35,4 @@ Friedrichstr. 136, // Gibt es bedarf an TI/DE-spezifischen Kontakt-Zwecken? * contact.name.text = "gematik ITSM" * contact.telecom[+].system = $ContactPointSystemCS#email -* contact.telecom[=].value = "betrieb@gematik.de" -* endpoint[+] = Reference(OrganizationExample001-Endpoint-TIM) +* contact.telecom[=].value = "betrieb@gematik.de" \ No newline at end of file diff --git a/src/fhir/input/fsh/examples/PharmacyExample.fsh b/src/fhir/input/fsh/examples/PharmacyExample.fsh index 636bc2c6..af05e2ef 100644 --- a/src/fhir/input/fsh/examples/PharmacyExample.fsh +++ b/src/fhir/input/fsh/examples/PharmacyExample.fsh @@ -1,11 +1,11 @@ Instance: PharmacyOrganizationExample -InstanceOf: OrganizationDirectory +InstanceOf: OrganizationDirectoryStrict Usage: #example Title: "PharmacyOrganizationExample" Description: "PharmacyOrganizationExample" * meta.tag[Origin] = Origin#ldap * identifier[TelematikID].value = "3-07.2.1444560000.16.108" -* type = OrganizationProfessionOID#1.2.276.0.76.4.54 "Öffentliche Apotheke" +* type[profession] = OrganizationProfessionOID#1.2.276.0.76.4.54 "Öffentliche Apotheke" * name = "Rathausapotheke" * active = true * alias = "Rathausapotheke" @@ -21,7 +21,7 @@ Description: "PharmacyOrganizationExample" * address.country = "DE" Instance: PharmacyHealthCareServiceExample -InstanceOf: HealthcareServiceDirectory +InstanceOf: HealthcareServiceDirectoryStrict Usage: #example Title: "PharmacyHealthCareServiceExample" Description: "PharmacyHealthCareServiceExample" @@ -91,10 +91,8 @@ Description: "PharmacyHealthCareServiceExample" * extension[serviceCoveragePostalCode][+] * valueString = "60598" - - Instance: PharmacyLocationExample -InstanceOf: LocationDirectory +InstanceOf: LocationDirectoryStrict Usage: #example Description: "Example of a Pharmacy Location as to be found in gematik FHIR Directory" * meta.tag[Origin] = Origin#ldap @@ -107,43 +105,39 @@ Description: "Example of a Pharmacy Location as to be found in gematik FHIR Dire * address.state = "Hessen" * address.postalCode = "60596" * address.country = "DE" -* availabilityExceptions = "An Feiertagen geschlossen" * managingOrganization = Reference(OrganizationExample001) * position.longitude = 8.6648 * position.latitude = 50.097 Instance: PharmacyEndpointTIMExample -InstanceOf: EndpointDirectory +InstanceOf: EndpointDirectoryStrict Usage: #example Description: "Example of a Pharamacy TIM Endpoint" * meta.tag[Origin] = Origin#ldap * status = #active "Active" * connectionType = EndpointDirectoryConnectionType#tim "TI-Messenger Endpoint" * name = "Messenger" -* managingOrganization = Reference(PharmacyOrganizationExample) * payloadType = EndpointDirectoryPayloadType#tim-chat "TI-Messenger chat" * address = "matrix:u/74c1fecc710ce4c8a8bbe310fbc5954c2a5e1e9ef5f70d651da1bfc4c9abe43f:example-domain.de" Instance: PharmacyEndpointErpReservationExample -InstanceOf: EndpointDirectory +InstanceOf: EndpointDirectoryStrict Usage: #example Description: "Example of a Pharamacy eRP Endpoint" * meta.tag[Origin] = Origin#ldap * status = #active "Active" * connectionType = EndpointDirectoryConnectionType#eRP-onPremise "Reservierung" * name = "ERP Reservierung" -* managingOrganization = Reference(PharmacyOrganizationExample) * address = "https://be-305314293.adv-erezept.de/gematik/onPremise//" * payloadType = DataAbsentReason#not-applicable Instance: PharmacyEndpointOnlineAppointmentBookingExample -InstanceOf: EndpointDirectory +InstanceOf: EndpointDirectoryStrict Usage: #example Description: "Example of a Pharamacy online appointment booking Endpoint" * meta.tag[Origin] = Origin#ldap * status = #active "Active" * connectionType = EndpointDirectoryConnectionType#terminbuchung-online "Online Terminbuchung" * name = "Online Terminbuchung" -* managingOrganization = Reference(PharmacyOrganizationExample) * address = "https://rathausapotheke.de/terminbuchung" * payloadType = DataAbsentReason#not-applicable \ No newline at end of file diff --git a/src/fhir/input/fsh/examples/PractitionerExample001.fsh b/src/fhir/input/fsh/examples/PractitionerExample001.fsh index 5b857d97..f5122413 100644 --- a/src/fhir/input/fsh/examples/PractitionerExample001.fsh +++ b/src/fhir/input/fsh/examples/PractitionerExample001.fsh @@ -1,9 +1,8 @@ Instance: PractitionerExample001 -InstanceOf: PractitionerDirectory +InstanceOf: PractitionerDirectoryStrict Usage: #example Description: "Example of a Practitioner as to be found in gematik FHIR Directory" * meta.tag[Origin] = Origin#ldap -* active = true * id = "TIPractitionerExample001" * identifier[TelematikID].value = "1-1.58.00000040" * identifier[LANR].value = "123456789" diff --git a/src/fhir/input/fsh/profiles/EndpointDirectory.fsh b/src/fhir/input/fsh/profiles/EndpointDirectory.fsh index 1ff844f5..42083b06 100644 --- a/src/fhir/input/fsh/profiles/EndpointDirectory.fsh +++ b/src/fhir/input/fsh/profiles/EndpointDirectory.fsh @@ -18,8 +18,21 @@ Description: "Endpoints for applications in the gematik Directory" * code MS * code from EndpointConnectionTypeVS * system MS -* name 1..1 MS // identical to address; because search is possible in element name and not in element address -* managingOrganization +* name 1..1 MS * payloadType MS * payloadType from EndpointPayloadTypeVS -* address 1..1 MS \ No newline at end of file +* address 1..1 MS + +Profile: EndpointDirectoryStrict +Parent: EndpointDirectory +Id: endpoint-directory-Strict +Title: "EndpointDirectory-Strict" +Description: "Endpoint in gematik Directory with strict constraints" +* meta.tag + * ^slicing.rules = #closed +* identifier 0..0 +* managingOrganization 0..0 +* contact 0..0 +* period 0..0 +* payloadMimeType 0..0 +* header 0..0 diff --git a/src/fhir/input/fsh/profiles/Extension.fsh b/src/fhir/input/fsh/profiles/Extension.fsh index 44678fc8..402f714d 100644 --- a/src/fhir/input/fsh/profiles/Extension.fsh +++ b/src/fhir/input/fsh/profiles/Extension.fsh @@ -106,4 +106,17 @@ Description: "Additional FreeText for HealthCare characteristics" Context: HealthcareService.characteristic * insert Meta * value[x] only string -* valueString 1.. MS \ No newline at end of file +* valueString 1.. MS + +Extension: NCPeHCountryEx +Id: ncpeh-country-ex +Title: "National Contact Point of Health (NCPeH) Country Extension" +Description: "The country extension for National Contact Point of Health (NCPeH) Organizations, representing the country in which the NCPeH is located." +Context: Organization +* insert Meta +* value[x] 1.. MS +* value[x] only Coding +* valueCoding 1.. MS +* valueCoding from Iso3166-1-2 + * system 1.. MS + * code 1.. MS \ No newline at end of file diff --git a/src/fhir/input/fsh/profiles/HealthcareServiceDirectory.fsh b/src/fhir/input/fsh/profiles/HealthcareServiceDirectory.fsh index e34ba7fc..36df37fe 100644 --- a/src/fhir/input/fsh/profiles/HealthcareServiceDirectory.fsh +++ b/src/fhir/input/fsh/profiles/HealthcareServiceDirectory.fsh @@ -42,6 +42,8 @@ organisations specific for german Healthcare and Telematics Infrastructure. * availableStartTime MS * availableEndTime MS * notAvailable MS + * description MS + * during MS * availabilityExceptions MS * endpoint MS * characteristic MS @@ -62,4 +64,32 @@ organisations specific for german Healthcare and Telematics Infrastructure. * extension MS * extension contains ServiceCoverageArea named serviceCoverageArea ..1 MS and - ServiceCoveragePostalCode named serviceCoveragePostalCode ..* MS \ No newline at end of file + ServiceCoveragePostalCode named serviceCoveragePostalCode ..* MS + +Profile: HealthcareServiceDirectoryStrict +Parent: HealthcareServiceDirectory +Id: HealthcareServiceDirectoryStrict +Title: "HealthcareServiceDirectoryStrict" +Description: "HealthcareService in gematik Directory with strict constraints" +* meta.tag + * ^slicing.rules = #closed +* identifier + ^slicing.rules = #closed +* active 0..0 +* comment 0..0 +* extraDetails 0..0 +* photo 0..0 +* telecom + * rank 0..0 + * period 0..0 +* coverageArea + * reference 0..0 + * type 0..0 + * identifier 0..0 + * display 0..0 +* serviceProvisionCode 0..0 +* eligibility 0..0 +* program 0..0 +* characteristic + * ^slicing.rules = #closed +* referralMethod 0..0 \ No newline at end of file diff --git a/src/fhir/input/fsh/profiles/LocationDirectory.fsh b/src/fhir/input/fsh/profiles/LocationDirectory.fsh index c27bea0d..486e386e 100644 --- a/src/fhir/input/fsh/profiles/LocationDirectory.fsh +++ b/src/fhir/input/fsh/profiles/LocationDirectory.fsh @@ -30,4 +30,23 @@ organisations specific for german Healthcare and Telematics Infrastructure. * latitude MS * altitude MS * partOf MS -* managingOrganization MS \ No newline at end of file +* managingOrganization MS + +Profile: LocationDirectoryStrict +Parent: LocationDirectory +Id: LocationDirectoryStrict +Title: "LocationDirectoryStrict" +Description: "Location in gematik Directory with strict constraints" +* meta.tag + * ^slicing.rules = #closed +* identifier 0..0 +* status 0..0 +* operationalStatus 0..0 +* alias 0..0 +* mode 0..0 +* type 0..0 +* telecom 0..0 +* physicalType 0..0 +* hoursOfOperation 0..0 +* availabilityExceptions 0..0 +* endpoint 0..0 \ No newline at end of file diff --git a/src/fhir/input/fsh/profiles/OrganizationDirectory.fsh b/src/fhir/input/fsh/profiles/OrganizationDirectory.fsh index 9de5e536..3e03adc4 100644 --- a/src/fhir/input/fsh/profiles/OrganizationDirectory.fsh +++ b/src/fhir/input/fsh/profiles/OrganizationDirectory.fsh @@ -50,15 +50,16 @@ organisations specific for german Healthcare and Telematics Infrastructure. * country MS * partOf MS -Extension: NCPeHCountryEx -Id: ncpeh-country-ex -Title: "National Contact Point of Health (NCPeH) Country Extension" -Description: "The country extension for National Contact Point of Health (NCPeH) Organizations, representing the country in which the NCPeH is located." -Context: Organization -* value[x] 1.. MS -* value[x] only CodeableConcept -* valueCodeableConcept 1.. MS -* valueCodeableConcept from Iso3166-1-2 - * coding ..1 MS - * system 1.. MS - * code 1.. MS +Profile: OrganizationDirectoryStrict +Parent: OrganizationDirectory +Id: OrganizationDirectoryStrict +Title: "OrganizationDirectoryStrict" +Description: "Organization in gematik Directory with strict constraints" +* meta.tag + * ^slicing.rules = #closed +* identifier + ^slicing.rules = #closed +* type + ^slicing.rules = #closed +* telecom 0..0 +* endpoint 0..0 \ No newline at end of file diff --git a/src/fhir/input/fsh/profiles/PractitionerDirectory.fsh b/src/fhir/input/fsh/profiles/PractitionerDirectory.fsh index c7aadf3d..c2290eeb 100644 --- a/src/fhir/input/fsh/profiles/PractitionerDirectory.fsh +++ b/src/fhir/input/fsh/profiles/PractitionerDirectory.fsh @@ -37,3 +37,15 @@ Title: "Practitioner in gematik Directory" * code MS * code from PractitionerQualificationVS * communication MS + +Profile: PractitionerDirectoryStrict +Parent: PractitionerDirectory +Id: PractitionerDirectoryStrict +Title: "PractitionerDirectoryStrict" +Description: "Practitioner in gematik Directory with strict constraints" +* meta.tag + * ^slicing.rules = #closed +* identifier + ^slicing.rules = #closed +* active 0..0 +* address 0..0 \ No newline at end of file diff --git a/src/fhir/input/fsh/profiles/PractitionerRoleDirectory.fsh b/src/fhir/input/fsh/profiles/PractitionerRoleDirectory.fsh index 4c277193..31cd6be3 100644 --- a/src/fhir/input/fsh/profiles/PractitionerRoleDirectory.fsh +++ b/src/fhir/input/fsh/profiles/PractitionerRoleDirectory.fsh @@ -15,3 +15,20 @@ Title: "PractitionerRole in gematik Directory" * endpoint MS * healthcareService MS * organization MS + +Profile: PractitionerRoleDirectoryStrict +Parent: PractitionerRoleDirectory +Id: PractitionerRoleDirectoryStrict +Title: "PractitionerRoleDirectoryStrict" +Description: "PractitionerRole in gematik Directory with strict constraints" +* meta.tag + * ^slicing.rules = #closed +* identifier 0..0 +* active 0..0 +* period 0..0 +* code 0..0 +* specialty 0..0 +* telecom 0..0 +* availableTime 0..0 +* notAvailable 0..0 +* availabilityExceptions 0..0 \ No newline at end of file diff --git a/src/fhir/input/fsh/ruleset.fsh b/src/fhir/input/fsh/ruleset.fsh index c8162d46..d1027631 100644 --- a/src/fhir/input/fsh/ruleset.fsh +++ b/src/fhir/input/fsh/ruleset.fsh @@ -1,4 +1,4 @@ -Alias: $version = 0.11.21 +Alias: $version = 0.11.22 RuleSet: Meta * ^status = #active @@ -13,3 +13,10 @@ RuleSet: MetaInstance * experimental = false * publisher = "gematik GmbH" * date = "2024-10-29" + +RuleSet: refChain(code) +* extension[+] + * url = $refChainEx + * extension + * url = "code" + * valueCode = #{code} \ No newline at end of file diff --git a/src/fhir/input/fsh/searchParameter.fsh b/src/fhir/input/fsh/searchParameter.fsh index 799e8dc2..4deabfb5 100644 --- a/src/fhir/input/fsh/searchParameter.fsh +++ b/src/fhir/input/fsh/searchParameter.fsh @@ -63,4 +63,26 @@ Usage: #definition * code = #coverageAreaPostalCode * base = #HealthcareService * type = #string -* expression = "HealthcareService.coverageArea.extension.where(url = 'https://gematik.de/fhir/directory/StructureDefinition/ServiceCoveragePostalCode').value.ofType(string)" \ No newline at end of file +* expression = "HealthcareService.coverageArea.extension.where(url = 'https://gematik.de/fhir/directory/StructureDefinition/ServiceCoveragePostalCode').value.ofType(string)" + +Instance: OrganizationNCPeHCountrySP +InstanceOf: SearchParameter +Usage: #definition +* insert MetaInstance +* name = "ncpeh-country" +* description = "Search on Organization.extension(https://gematik.de/fhir/directory/StructureDefinition/NCPeHCountry)" +* code = #ncpeh-country +* base = #Organization +* type = #token +* expression = "Organization.extension.where(url = 'https://gematik.de/fhir/directoryNCPeHCountry/StructureDefinition').value.ofType(Coding)" + +Instance: OrganizationAliasSP +InstanceOf: SearchParameter +Usage: #definition +* insert MetaInstance +* name = "alias" +* description = "Search on Organization.alias" +* code = #alias +* base = #Organization +* type = #string +* expression = "Organization.alias" \ No newline at end of file diff --git a/src/fhir/sushi-config.yaml b/src/fhir/sushi-config.yaml index dba2c0fa..fcc07825 100644 --- a/src/fhir/sushi-config.yaml +++ b/src/fhir/sushi-config.yaml @@ -1,5 +1,5 @@ canonical: https://gematik.de/fhir/directory -version: 0.11.21 +version: 0.11.22 fhirVersion: 4.0.1 dependencies: de.basisprofil.r4: 1.5.0