From f3727fff543540c190c536d97feb2f22f1c2b297 Mon Sep 17 00:00:00 2001 From: patrick-werner Date: Tue, 6 Feb 2024 18:20:11 +0100 Subject: [PATCH 01/16] refactoring finished, DELEGATOR not implemented yet --- .devcontainer/Dockerfile | 2 +- fhirpkg.lock.json | 2 +- src/fhir/fsh-generated/fsh-index.json | 282 ++++++++++++++++++ src/fhir/fsh-generated/fsh-index.txt | 36 +++ ...ystem-EndpointDirectoryConnectionType.json | 1 - ...deSystem-EndpointDirectoryPayloadType.json | 1 - .../resources/CodeSystem-HolderCS.json | 1 - .../CodeSystem-OrganizationProfessionOID.json | 1 - .../CodeSystem-OrganizationProviderType.json | 1 - .../resources/CodeSystem-Origin.json | 1 - ...ystem-PharmacyHealthcareSpecialityCS.json} | 11 +- .../resources/CodeSystem-PharmacyTypeCS.json | 16 +- .../CodeSystem-PractitionerProfessionOID.json | 1 - .../resources/CodeSystem-Region.json | 1 - .../Organization-OrganizationExample001.json | 31 +- ...StructureDefinition-EndpointDirectory.json | 17 +- ...Definition-HealthcareServiceDirectory.json | 38 ++- ...StructureDefinition-LocationDirectory.json | 65 ++-- ...ctureDefinition-OrganizationDirectory.json | 106 +++++-- ...ctureDefinition-PractitionerDirectory.json | 20 +- ...eDefinition-PractitionerRoleDirectory.json | 11 - ...et-1.2.276.0.76.11.58--20211114161028.json | 190 ++++++++++++ .../resources/ValueSet-AddressStateVS.json | 1 - .../ValueSet-EndpointConnectionTypeVS.json | 1 - .../ValueSet-EndpointPayloadTypeVS.json | 1 - ... => ValueSet-HealthcareServiceTypeVS.json} | 12 +- .../ValueSet-HealthcareSpecialityTypeVS.json | 20 ++ ...eSet-OrganizationProfessionOIDTypeVS.json} | 10 +- .../ValueSet-OrganizationProviderTypeVS.json | 16 + .../resources/ValueSet-OriginVS.json | 1 - ...ueSet-PharmacyHealthcareServiceTypeVS.json | 21 -- .../resources/ValueSet-PharmacyTypeVS.json | 18 -- .../ValueSet-PractitionerQualificationVS.json | 1 - src/fhir/input/fsh/alias.fsh | 3 +- .../EndpointDirectoryConnectionType.fsh | 1 + .../PharmacyHealthcareServiceSpecialityCS.fsh | 12 + .../PharmacyHealthcareServiceTypeCS.fsh | 14 - .../input/fsh/codesystems/PharmacyTypeCS.fsh | 8 +- .../fsh/examples/OrganizationExample001.fsh | 2 +- .../input/fsh/profiles/EndpointDirectory.fsh | 6 +- .../profiles/HealthcareServiceDirectory.fsh | 7 +- .../input/fsh/profiles/LocationDirectory.fsh | 11 +- .../fsh/profiles/OrganizationDirectory.fsh | 18 +- .../fsh/profiles/PractitionerDirectory.fsh | 4 +- .../valuesets/HealthCareServiceCategory.fsh | 62 ++++ .../HealthcareServiceSpecialityVS.fsh | 7 + ...altyVS.fsh => HealthcareServiceTypeVS.fsh} | 7 +- .../OrganizationProfessionOIDTypeVS.fsh | 4 + ...eVS.fsh => OrganizationProviderTypeVS.fsh} | 3 +- .../PharmacyHealthcareServiceTypeVS.fsh | 8 - .../input/fsh/valuesets/PharmacyTypeVS.fsh | 7 - 51 files changed, 881 insertions(+), 240 deletions(-) create mode 100644 src/fhir/fsh-generated/fsh-index.json create mode 100644 src/fhir/fsh-generated/fsh-index.txt rename src/fhir/fsh-generated/resources/{CodeSystem-PharmacyHealthcareServiceTypeCS.json => CodeSystem-PharmacyHealthcareSpecialityCS.json} (71%) create mode 100644 src/fhir/fsh-generated/resources/ValueSet-1.2.276.0.76.11.58--20211114161028.json rename src/fhir/fsh-generated/resources/{ValueSet-HealthcareServiceSpecialtyVS.json => ValueSet-HealthcareServiceTypeVS.json} (97%) create mode 100644 src/fhir/fsh-generated/resources/ValueSet-HealthcareSpecialityTypeVS.json rename src/fhir/fsh-generated/resources/{ValueSet-OrganizationTypeVS.json => ValueSet-OrganizationProfessionOIDTypeVS.json} (63%) create mode 100644 src/fhir/fsh-generated/resources/ValueSet-OrganizationProviderTypeVS.json delete mode 100644 src/fhir/fsh-generated/resources/ValueSet-PharmacyHealthcareServiceTypeVS.json delete mode 100644 src/fhir/fsh-generated/resources/ValueSet-PharmacyTypeVS.json create mode 100644 src/fhir/input/fsh/codesystems/PharmacyHealthcareServiceSpecialityCS.fsh delete mode 100644 src/fhir/input/fsh/codesystems/PharmacyHealthcareServiceTypeCS.fsh create mode 100644 src/fhir/input/fsh/valuesets/HealthCareServiceCategory.fsh create mode 100644 src/fhir/input/fsh/valuesets/HealthcareServiceSpecialityVS.fsh rename src/fhir/input/fsh/valuesets/{HealthcareServiceSpecialtyVS.fsh => HealthcareServiceTypeVS.fsh} (97%) create mode 100644 src/fhir/input/fsh/valuesets/OrganizationProfessionOIDTypeVS.fsh rename src/fhir/input/fsh/valuesets/{OrganizationTypeVS.fsh => OrganizationProviderTypeVS.fsh} (58%) delete mode 100644 src/fhir/input/fsh/valuesets/PharmacyHealthcareServiceTypeVS.fsh delete mode 100644 src/fhir/input/fsh/valuesets/PharmacyTypeVS.fsh diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 88aefe34..30045fe0 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -3,7 +3,7 @@ FROM mcr.microsoft.com/devcontainers/base:alpine-3.18 # Setzen der Umgebungsvariablen ENV FIRELY_TERMINAL_VERSION=3.1.0 ENV JAVA_VALIDATOR_VERSION=6.0.11 -ENV SUSHI_VERSION=3.5.0 +ENV SUSHI_VERSION=3.6.1 # Installieren der notwendige Tools # Add Microsoft's .NET SDK repository and install .NET SDK diff --git a/fhirpkg.lock.json b/fhirpkg.lock.json index 4b9dde56..245b6994 100644 --- a/fhirpkg.lock.json +++ b/fhirpkg.lock.json @@ -1,5 +1,5 @@ { - "updated": "2023-04-14T09:11:05.200205+02:00", + "updated": "2024-02-06T07:49:15.7290992+00:00", "dependencies": { "de.basisprofil.r4": "1.4.0", "hl7.fhir.r4.core": "4.0.1" diff --git a/src/fhir/fsh-generated/fsh-index.json b/src/fhir/fsh-generated/fsh-index.json new file mode 100644 index 00000000..15aea4eb --- /dev/null +++ b/src/fhir/fsh-generated/fsh-index.json @@ -0,0 +1,282 @@ +[ + { + "outputFile": "CodeSystem-EndpointDirectoryConnectionType.json", + "fshName": "EndpointDirectoryConnectionType", + "fshType": "CodeSystem", + "fshFile": "codesystems/EndpointDirectoryConnectionType.fsh", + "startLine": 1, + "endLine": 13 + }, + { + "outputFile": "CodeSystem-EndpointDirectoryPayloadType.json", + "fshName": "EndpointDirectoryPayloadType", + "fshType": "CodeSystem", + "fshFile": "codesystems/EndpointDirectoryPayloadType.fsh", + "startLine": 1, + "endLine": 12 + }, + { + "outputFile": "CodeSystem-HolderCS.json", + "fshName": "HolderCS", + "fshType": "CodeSystem", + "fshFile": "codesystems/HolderCS.fsh", + "startLine": 1, + "endLine": 125 + }, + { + "outputFile": "CodeSystem-OrganizationProfessionOID.json", + "fshName": "OrganizationProfessionOID", + "fshType": "CodeSystem", + "fshFile": "codesystems/OrganizationProfessionOID.fsh", + "startLine": 1, + "endLine": 66 + }, + { + "outputFile": "CodeSystem-OrganizationProviderType.json", + "fshName": "OrganizationProviderType", + "fshType": "CodeSystem", + "fshFile": "codesystems/OrganizationProviderType.fsh", + "startLine": 1, + "endLine": 11 + }, + { + "outputFile": "CodeSystem-Origin.json", + "fshName": "Origin", + "fshType": "CodeSystem", + "fshFile": "codesystems/Origin.fsh", + "startLine": 1, + "endLine": 7 + }, + { + "outputFile": "CodeSystem-PharmacyHealthcareSpecialityCS.json", + "fshName": "PharmacyHealthcareSpecialityCS", + "fshType": "CodeSystem", + "fshFile": "codesystems/PharmacyHealthcareServiceSpecialityCS.fsh", + "startLine": 1, + "endLine": 12 + }, + { + "outputFile": "CodeSystem-PharmacyTypeCS.json", + "fshName": "PharmacyTypeCS", + "fshType": "CodeSystem", + "fshFile": "codesystems/PharmacyTypeCS.fsh", + "startLine": 1, + "endLine": 11 + }, + { + "outputFile": "CodeSystem-PractitionerProfessionOID.json", + "fshName": "PractitionerProfessionOID", + "fshType": "CodeSystem", + "fshFile": "codesystems/PractitionerProfessionOID.fsh", + "startLine": 1, + "endLine": 43 + }, + { + "outputFile": "CodeSystem-Region.json", + "fshName": "Region", + "fshType": "CodeSystem", + "fshFile": "codesystems/Region.fsh", + "startLine": 1, + "endLine": 27 + }, + { + "outputFile": "Endpoint-EndpointExample.json", + "fshName": "EndpointExample", + "fshType": "Instance", + "fshFile": "examples/Examples001.fsh", + "startLine": 1, + "endLine": 11 + }, + { + "outputFile": "Endpoint-OrganizationExample001-Endpoint-TIM.json", + "fshName": "OrganizationExample001-Endpoint-TIM", + "fshType": "Instance", + "fshFile": "examples/OrganizationExample001.fsh", + "startLine": 1, + "endLine": 12 + }, + { + "outputFile": "HealthcareService-HealthcareServiceExample.json", + "fshName": "HealthcareServiceExample", + "fshType": "Instance", + "fshFile": "examples/Examples001.fsh", + "startLine": 75, + "endLine": 100 + }, + { + "outputFile": "Location-LocationExample.json", + "fshName": "LocationExample", + "fshType": "Instance", + "fshFile": "examples/Examples001.fsh", + "startLine": 53, + "endLine": 73 + }, + { + "outputFile": "Organization-OrganizationExample.json", + "fshName": "OrganizationExample", + "fshType": "Instance", + "fshFile": "examples/Examples001.fsh", + "startLine": 38, + "endLine": 51 + }, + { + "outputFile": "Organization-OrganizationExample001.json", + "fshName": "OrganizationExample001", + "fshType": "Instance", + "fshFile": "examples/OrganizationExample001.fsh", + "startLine": 14, + "endLine": 39 + }, + { + "outputFile": "Practitioner-TIPractitionerExample001.json", + "fshName": "PractitionerExample001", + "fshType": "Instance", + "fshFile": "examples/PractitionerExample001.fsh", + "startLine": 1, + "endLine": 18 + }, + { + "outputFile": "Practitioner-TIPractitionerExampleDentist.json", + "fshName": "PractitionerExampleDentist", + "fshType": "Instance", + "fshFile": "examples/Examples001.fsh", + "startLine": 13, + "endLine": 26 + }, + { + "outputFile": "PractitionerRole-PractitionerRoleExample.json", + "fshName": "PractitionerRoleExample", + "fshType": "Instance", + "fshFile": "examples/Examples001.fsh", + "startLine": 28, + "endLine": 35 + }, + { + "outputFile": "StructureDefinition-EndpointDirectory.json", + "fshName": "EndpointDirectory", + "fshType": "Profile", + "fshFile": "profiles/EndpointDirectory.fsh", + "startLine": 1, + "endLine": 23 + }, + { + "outputFile": "StructureDefinition-HealthcareServiceDirectory.json", + "fshName": "HealthcareServiceDirectory", + "fshType": "Profile", + "fshFile": "profiles/HealthcareServiceDirectory.fsh", + "startLine": 1, + "endLine": 35 + }, + { + "outputFile": "StructureDefinition-LocationDirectory.json", + "fshName": "LocationDirectory", + "fshType": "Profile", + "fshFile": "profiles/LocationDirectory.fsh", + "startLine": 1, + "endLine": 44 + }, + { + "outputFile": "StructureDefinition-OrganizationDirectory.json", + "fshName": "OrganizationDirectory", + "fshType": "Profile", + "fshFile": "profiles/OrganizationDirectory.fsh", + "startLine": 1, + "endLine": 45 + }, + { + "outputFile": "StructureDefinition-PractitionerDirectory.json", + "fshName": "PractitionerDirectory", + "fshType": "Profile", + "fshFile": "profiles/PractitionerDirectory.fsh", + "startLine": 1, + "endLine": 40 + }, + { + "outputFile": "StructureDefinition-PractitionerRoleDirectory.json", + "fshName": "PractitionerRoleDirectory", + "fshType": "Profile", + "fshFile": "profiles/PractitionerRoleDirectory.fsh", + "startLine": 1, + "endLine": 15 + }, + { + "outputFile": "ValueSet-1.2.276.0.76.11.58--20211114161028.json", + "fshName": "IHEXDShealthcareFacilityTypeCodePatientRelatedHealthcare", + "fshType": "ValueSet", + "fshFile": "valuesets/HealthCareServiceCategory.fsh", + "startLine": 3, + "endLine": 62 + }, + { + "outputFile": "ValueSet-AddressStateVS.json", + "fshName": "AddressStateVS", + "fshType": "ValueSet", + "fshFile": "valuesets/AddressStateVS.fsh", + "startLine": 1, + "endLine": 4 + }, + { + "outputFile": "ValueSet-EndpointConnectionTypeVS.json", + "fshName": "EndpointConnectionTypeVS", + "fshType": "ValueSet", + "fshFile": "valuesets/EndpointConnectionTypeVS.fsh", + "startLine": 1, + "endLine": 5 + }, + { + "outputFile": "ValueSet-EndpointPayloadTypeVS.json", + "fshName": "EndpointPayloadTypeVS", + "fshType": "ValueSet", + "fshFile": "valuesets/EndpointPayloadTypeVS.fsh", + "startLine": 1, + "endLine": 4 + }, + { + "outputFile": "ValueSet-HealthcareServiceTypeVS.json", + "fshName": "HealthcareServiceTypeVS", + "fshType": "ValueSet", + "fshFile": "valuesets/HealthcareServiceTypeVS.fsh", + "startLine": 1, + "endLine": 102 + }, + { + "outputFile": "ValueSet-HealthcareSpecialityTypeVS.json", + "fshName": "HealthcareServiceSpecialityVS", + "fshType": "ValueSet", + "fshFile": "valuesets/HealthcareServiceSpecialityVS.fsh", + "startLine": 1, + "endLine": 7 + }, + { + "outputFile": "ValueSet-OrganizationProfessionOIDTypeVS.json", + "fshName": "OrganizationProfessionOIDTypeVS", + "fshType": "ValueSet", + "fshFile": "valuesets/OrganizationProfessionOIDTypeVS.fsh", + "startLine": 1, + "endLine": 4 + }, + { + "outputFile": "ValueSet-OrganizationProviderTypeVS.json", + "fshName": "OrganizationProviderTypeVS", + "fshType": "ValueSet", + "fshFile": "valuesets/OrganizationProviderTypeVS.fsh", + "startLine": 1, + "endLine": 4 + }, + { + "outputFile": "ValueSet-OriginVS.json", + "fshName": "OriginVS", + "fshType": "ValueSet", + "fshFile": "valuesets/OriginVS.fsh", + "startLine": 1, + "endLine": 4 + }, + { + "outputFile": "ValueSet-PractitionerQualificationVS.json", + "fshName": "PractitionerQualificationVS", + "fshType": "ValueSet", + "fshFile": "valuesets/PractitionerQualificationVS.fsh", + "startLine": 1, + "endLine": 457 + } +] diff --git a/src/fhir/fsh-generated/fsh-index.txt b/src/fhir/fsh-generated/fsh-index.txt new file mode 100644 index 00000000..07edc3cd --- /dev/null +++ b/src/fhir/fsh-generated/fsh-index.txt @@ -0,0 +1,36 @@ +Output File Name Type FSH File Lines +CodeSystem-EndpointDirectoryConnectionType.json EndpointDirectoryConnectionType CodeSystem codesystems/EndpointDirectoryConnectionType.fsh 1 - 13 +CodeSystem-EndpointDirectoryPayloadType.json EndpointDirectoryPayloadType CodeSystem codesystems/EndpointDirectoryPayloadType.fsh 1 - 12 +CodeSystem-HolderCS.json HolderCS CodeSystem codesystems/HolderCS.fsh 1 - 125 +CodeSystem-OrganizationProfessionOID.json OrganizationProfessionOID CodeSystem codesystems/OrganizationProfessionOID.fsh 1 - 66 +CodeSystem-OrganizationProviderType.json OrganizationProviderType CodeSystem codesystems/OrganizationProviderType.fsh 1 - 11 +CodeSystem-Origin.json Origin CodeSystem codesystems/Origin.fsh 1 - 7 +CodeSystem-PharmacyHealthcareSpecialityCS.json PharmacyHealthcareSpecialityCS CodeSystem codesystems/PharmacyHealthcareServiceSpecialityCS.fsh 1 - 12 +CodeSystem-PharmacyTypeCS.json PharmacyTypeCS CodeSystem codesystems/PharmacyTypeCS.fsh 1 - 11 +CodeSystem-PractitionerProfessionOID.json PractitionerProfessionOID CodeSystem codesystems/PractitionerProfessionOID.fsh 1 - 43 +CodeSystem-Region.json Region CodeSystem codesystems/Region.fsh 1 - 27 +Endpoint-EndpointExample.json EndpointExample Instance examples/Examples001.fsh 1 - 11 +Endpoint-OrganizationExample001-Endpoint-TIM.json OrganizationExample001-Endpoint-TIM Instance examples/OrganizationExample001.fsh 1 - 12 +HealthcareService-HealthcareServiceExample.json HealthcareServiceExample Instance examples/Examples001.fsh 75 - 100 +Location-LocationExample.json LocationExample Instance examples/Examples001.fsh 53 - 73 +Organization-OrganizationExample.json OrganizationExample Instance examples/Examples001.fsh 38 - 51 +Organization-OrganizationExample001.json OrganizationExample001 Instance examples/OrganizationExample001.fsh 14 - 39 +Practitioner-TIPractitionerExample001.json PractitionerExample001 Instance examples/PractitionerExample001.fsh 1 - 18 +Practitioner-TIPractitionerExampleDentist.json PractitionerExampleDentist Instance examples/Examples001.fsh 13 - 26 +PractitionerRole-PractitionerRoleExample.json PractitionerRoleExample Instance examples/Examples001.fsh 28 - 35 +StructureDefinition-EndpointDirectory.json EndpointDirectory Profile profiles/EndpointDirectory.fsh 1 - 23 +StructureDefinition-HealthcareServiceDirectory.json HealthcareServiceDirectory Profile profiles/HealthcareServiceDirectory.fsh 1 - 35 +StructureDefinition-LocationDirectory.json LocationDirectory Profile profiles/LocationDirectory.fsh 1 - 44 +StructureDefinition-OrganizationDirectory.json OrganizationDirectory Profile profiles/OrganizationDirectory.fsh 1 - 45 +StructureDefinition-PractitionerDirectory.json PractitionerDirectory Profile profiles/PractitionerDirectory.fsh 1 - 40 +StructureDefinition-PractitionerRoleDirectory.json PractitionerRoleDirectory Profile profiles/PractitionerRoleDirectory.fsh 1 - 15 +ValueSet-1.2.276.0.76.11.58--20211114161028.json IHEXDShealthcareFacilityTypeCodePatientRelatedHealthcare ValueSet valuesets/HealthCareServiceCategory.fsh 3 - 62 +ValueSet-AddressStateVS.json AddressStateVS ValueSet valuesets/AddressStateVS.fsh 1 - 4 +ValueSet-EndpointConnectionTypeVS.json EndpointConnectionTypeVS ValueSet valuesets/EndpointConnectionTypeVS.fsh 1 - 5 +ValueSet-EndpointPayloadTypeVS.json EndpointPayloadTypeVS ValueSet valuesets/EndpointPayloadTypeVS.fsh 1 - 4 +ValueSet-HealthcareServiceTypeVS.json HealthcareServiceTypeVS ValueSet valuesets/HealthcareServiceTypeVS.fsh 1 - 102 +ValueSet-HealthcareSpecialityTypeVS.json HealthcareServiceSpecialityVS ValueSet valuesets/HealthcareServiceSpecialityVS.fsh 1 - 7 +ValueSet-OrganizationProfessionOIDTypeVS.json OrganizationProfessionOIDTypeVS ValueSet valuesets/OrganizationProfessionOIDTypeVS.fsh 1 - 4 +ValueSet-OrganizationProviderTypeVS.json OrganizationProviderTypeVS ValueSet valuesets/OrganizationProviderTypeVS.fsh 1 - 4 +ValueSet-OriginVS.json OriginVS ValueSet valuesets/OriginVS.fsh 1 - 4 +ValueSet-PractitionerQualificationVS.json PractitionerQualificationVS ValueSet valuesets/PractitionerQualificationVS.fsh 1 - 457 \ No newline at end of file diff --git a/src/fhir/fsh-generated/resources/CodeSystem-EndpointDirectoryConnectionType.json b/src/fhir/fsh-generated/resources/CodeSystem-EndpointDirectoryConnectionType.json index d483564b..e851af90 100644 --- a/src/fhir/fsh-generated/resources/CodeSystem-EndpointDirectoryConnectionType.json +++ b/src/fhir/fsh-generated/resources/CodeSystem-EndpointDirectoryConnectionType.json @@ -6,7 +6,6 @@ "id": "EndpointDirectoryConnectionType", "title": "Codes for Endpoint.connectionType", "description": "CodeSystem TI specific connection types assigned to the Endpoints", - "version": "0.10.2", "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 ad784b85..a9db6e24 100644 --- a/src/fhir/fsh-generated/resources/CodeSystem-EndpointDirectoryPayloadType.json +++ b/src/fhir/fsh-generated/resources/CodeSystem-EndpointDirectoryPayloadType.json @@ -6,7 +6,6 @@ "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.10.2", "url": "https://gematik.de/fhir/directory/CodeSystem/EndpointDirectoryPayloadType", "concept": [ { diff --git a/src/fhir/fsh-generated/resources/CodeSystem-HolderCS.json b/src/fhir/fsh-generated/resources/CodeSystem-HolderCS.json index f22b7715..776fc978 100644 --- a/src/fhir/fsh-generated/resources/CodeSystem-HolderCS.json +++ b/src/fhir/fsh-generated/resources/CodeSystem-HolderCS.json @@ -6,7 +6,6 @@ "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.10.2", "url": "https://gematik.de/fhir/directory/CodeSystem/HolderCS", "concept": [ { diff --git a/src/fhir/fsh-generated/resources/CodeSystem-OrganizationProfessionOID.json b/src/fhir/fsh-generated/resources/CodeSystem-OrganizationProfessionOID.json index 28c8d3d5..e8d63534 100644 --- a/src/fhir/fsh-generated/resources/CodeSystem-OrganizationProfessionOID.json +++ b/src/fhir/fsh-generated/resources/CodeSystem-OrganizationProfessionOID.json @@ -6,7 +6,6 @@ "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.10.2", "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 c9a13c7a..f9eaaea1 100644 --- a/src/fhir/fsh-generated/resources/CodeSystem-OrganizationProviderType.json +++ b/src/fhir/fsh-generated/resources/CodeSystem-OrganizationProviderType.json @@ -5,7 +5,6 @@ "name": "OrganizationProviderType", "id": "OrganizationProviderType", "description": "CodeSystem of TI Service Provider types as to be found in the gematik Directory", - "version": "0.10.2", "url": "https://gematik.de/fhir/directory/CodeSystem/OrganizationProviderType", "concept": [ { diff --git a/src/fhir/fsh-generated/resources/CodeSystem-Origin.json b/src/fhir/fsh-generated/resources/CodeSystem-Origin.json index 847a0199..90bfa22a 100644 --- a/src/fhir/fsh-generated/resources/CodeSystem-Origin.json +++ b/src/fhir/fsh-generated/resources/CodeSystem-Origin.json @@ -5,7 +5,6 @@ "name": "Origin", "id": "Origin", "description": "CodeSystem which identifies the origin of a resource in the FHIR Directory", - "version": "0.10.2", "url": "https://gematik.de/fhir/directory/CodeSystem/Origin", "concept": [ { diff --git a/src/fhir/fsh-generated/resources/CodeSystem-PharmacyHealthcareServiceTypeCS.json b/src/fhir/fsh-generated/resources/CodeSystem-PharmacyHealthcareSpecialityCS.json similarity index 71% rename from src/fhir/fsh-generated/resources/CodeSystem-PharmacyHealthcareServiceTypeCS.json rename to src/fhir/fsh-generated/resources/CodeSystem-PharmacyHealthcareSpecialityCS.json index 3b878540..33e6aea4 100644 --- a/src/fhir/fsh-generated/resources/CodeSystem-PharmacyHealthcareServiceTypeCS.json +++ b/src/fhir/fsh-generated/resources/CodeSystem-PharmacyHealthcareSpecialityCS.json @@ -2,12 +2,11 @@ "resourceType": "CodeSystem", "status": "active", "content": "complete", - "name": "PharmacyHealthcareServiceTypeCS", - "id": "PharmacyHealthcareServiceTypeCS", - "title": "HealthcareService Type", - "description": "Type codes of HealthcareServices", - "version": "1.0", - "url": "https://gematik.de/fhir/directory/CodeSystem/PharmacyHealthcareServiceTypeCS", + "name": "PharmacyHealthcareSpecialityCS", + "id": "PharmacyHealthcareSpecialityCS", + "title": "HealthcareService Speciality", + "description": "Speciality codes of HealthcareServices", + "url": "https://gematik.de/fhir/directory/CodeSystem/PharmacyHealthcareSpecialityCS", "concept": [ { "code": "10", diff --git a/src/fhir/fsh-generated/resources/CodeSystem-PharmacyTypeCS.json b/src/fhir/fsh-generated/resources/CodeSystem-PharmacyTypeCS.json index 4834f6c5..ab9da57e 100644 --- a/src/fhir/fsh-generated/resources/CodeSystem-PharmacyTypeCS.json +++ b/src/fhir/fsh-generated/resources/CodeSystem-PharmacyTypeCS.json @@ -6,27 +6,23 @@ "id": "PharmacyTypeCS", "title": "Pharmacy type", "description": "Pharmacy type codes of accessability for patients", - "version": "1.0", "url": "https://gematik.de/fhir/directory/CodeSystem/PharmacyTypeCS", "concept": [ { - "code": "10", + "code": "offizin-apotheke\"", "display": "Offizin-Apotheke" }, { - "code": "20", + "code": "krankenhausversorgende-apotheke", "display": "Krankenhausversorgende Apotheke" }, { - "code": "30", - "display": "Heimversorgende Apotheke" - }, - { - "code": "40", - "display": "Versandapotheke" + "code": "bundeswehrapotheke", + "display": "Bundeswehrapotheke" } ], "publisher": "gematik GmbH", + "version": "1.0", "caseSensitive": true, - "count": 4 + "count": 3 } diff --git a/src/fhir/fsh-generated/resources/CodeSystem-PractitionerProfessionOID.json b/src/fhir/fsh-generated/resources/CodeSystem-PractitionerProfessionOID.json index 9662daac..51d6fb4b 100644 --- a/src/fhir/fsh-generated/resources/CodeSystem-PractitionerProfessionOID.json +++ b/src/fhir/fsh-generated/resources/CodeSystem-PractitionerProfessionOID.json @@ -6,7 +6,6 @@ "id": "PractitionerProfessionOID", "title": "CodeSystem for Practitioner's ProfessioiOID", "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.10.2", "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 80d9caf2..c17116a7 100644 --- a/src/fhir/fsh-generated/resources/CodeSystem-Region.json +++ b/src/fhir/fsh-generated/resources/CodeSystem-Region.json @@ -6,7 +6,6 @@ "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.10.2", "url": "https://gematik.de/fhir/directory/CodeSystem/Region", "concept": [ { diff --git a/src/fhir/fsh-generated/resources/Organization-OrganizationExample001.json b/src/fhir/fsh-generated/resources/Organization-OrganizationExample001.json index 7fe6cc2f..546fc318 100644 --- a/src/fhir/fsh-generated/resources/Organization-OrganizationExample001.json +++ b/src/fhir/fsh-generated/resources/Organization-OrganizationExample001.json @@ -18,6 +18,24 @@ "value": "9-2.58.00000040" } ], + "address": [ + { + "extension": [ + { + "url": "http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-precinct", + "valueString": "Mitte" + } + ], + "text": "gematik GmbH\nFriedrichstr. 136, \n10117 Berlin", + "line": [ + "Friedrichstr. 136" + ], + "city": "Berlin", + "state": "Berlin", + "postalCode": "10117", + "country": "DE" + } + ], "active": true, "type": [ { @@ -33,19 +51,6 @@ "alias": [ "gematik" ], - "address": [ - { - "text": "gematik GmbH\nFriedrichstr. 136, \n10117 Berlin", - "line": [ - "Friedrichstr. 136" - ], - "city": "Berlin", - "district": "Mitte", - "state": "Berlin", - "postalCode": "10117", - "country": "DE" - } - ], "contact": [ { "purpose": { diff --git a/src/fhir/fsh-generated/resources/StructureDefinition-EndpointDirectory.json b/src/fhir/fsh-generated/resources/StructureDefinition-EndpointDirectory.json index b2e7cfba..0ce8652c 100644 --- a/src/fhir/fsh-generated/resources/StructureDefinition-EndpointDirectory.json +++ b/src/fhir/fsh-generated/resources/StructureDefinition-EndpointDirectory.json @@ -1,18 +1,7 @@ { "resourceType": "StructureDefinition", "id": "EndpointDirectory", - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-category", - "valueString": "Base.Entities" - }, - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-security-category", - "valueCode": "business" - } - ], "url": "https://gematik.de/fhir/directory/StructureDefinition/EndpointDirectory", - "version": "0.10.2", "name": "EndpointDirectory", "title": "Endpoint in gematik Directory", "status": "active", @@ -81,9 +70,15 @@ "path": "Endpoint.connectionType", "mustSupport": true }, + { + "id": "Endpoint.connectionType.system", + "path": "Endpoint.connectionType.system", + "mustSupport": true + }, { "id": "Endpoint.connectionType.code", "path": "Endpoint.connectionType.code", + "mustSupport": true, "binding": { "strength": "extensible", "valueSet": "https://gematik.de/fhir/directory/ValueSet/EndpointConnectionTypeVS" diff --git a/src/fhir/fsh-generated/resources/StructureDefinition-HealthcareServiceDirectory.json b/src/fhir/fsh-generated/resources/StructureDefinition-HealthcareServiceDirectory.json index d715c2fa..0c5854f9 100644 --- a/src/fhir/fsh-generated/resources/StructureDefinition-HealthcareServiceDirectory.json +++ b/src/fhir/fsh-generated/resources/StructureDefinition-HealthcareServiceDirectory.json @@ -1,18 +1,7 @@ { "resourceType": "StructureDefinition", "id": "HealthcareServiceDirectory", - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-category", - "valueString": "Base.Entities" - }, - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-security-category", - "valueCode": "business" - } - ], "url": "https://gematik.de/fhir/directory/StructureDefinition/HealthcareServiceDirectory", - "version": "0.10.2", "name": "HealthcareServiceDirectory", "title": "HealthcareService in gematik Directory", "status": "active", @@ -82,13 +71,31 @@ "min": 1, "mustSupport": true }, + { + "id": "HealthcareService.category", + "path": "HealthcareService.category", + "mustSupport": true, + "binding": { + "strength": "required", + "valueSet": "http://ihe-d.de/ValueSets/IHEXDShealthcareFacilityTypeCodePatientRelatedHealthcare" + } + }, + { + "id": "HealthcareService.type", + "path": "HealthcareService.type", + "mustSupport": true, + "binding": { + "strength": "extensible", + "valueSet": "https://gematik.de/fhir/directory/ValueSet/HealthcareServiceTypeVS" + } + }, { "id": "HealthcareService.specialty", "path": "HealthcareService.specialty", "mustSupport": true, "binding": { - "strength": "extensible", - "valueSet": "https://gematik.de/fhir/directory/ValueSet/HealthcareServiceSpecialtyVS" + "strength": "required", + "valueSet": "https://gematik.de/fhir/directory/ValueSet/HealthcareSpecialityTypeVS" } }, { @@ -126,6 +133,11 @@ "path": "HealthcareService.serviceProvisionCode", "mustSupport": true }, + { + "id": "HealthcareService.characteristic", + "path": "HealthcareService.characteristic", + "mustSupport": true + }, { "id": "HealthcareService.communication", "path": "HealthcareService.communication", diff --git a/src/fhir/fsh-generated/resources/StructureDefinition-LocationDirectory.json b/src/fhir/fsh-generated/resources/StructureDefinition-LocationDirectory.json index 20428597..4716fd61 100644 --- a/src/fhir/fsh-generated/resources/StructureDefinition-LocationDirectory.json +++ b/src/fhir/fsh-generated/resources/StructureDefinition-LocationDirectory.json @@ -1,18 +1,7 @@ { "resourceType": "StructureDefinition", "id": "LocationDirectory", - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-category", - "valueString": "Base.Entities" - }, - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-security-category", - "valueCode": "business" - } - ], "url": "https://gematik.de/fhir/directory/StructureDefinition/LocationDirectory", - "version": "0.10.2", "name": "LocationDirectory", "title": "Location in gematik Directory", "status": "active", @@ -76,6 +65,36 @@ "min": 1, "patternUri": "https://gematik.de/fhir/directory/CodeSystem/Origin" }, + { + "id": "Location.identifier", + "path": "Location.identifier", + "slicing": { + "discriminator": [ + { + "type": "value", + "path": "system" + } + ], + "rules": "open" + }, + "mustSupport": true + }, + { + "id": "Location.identifier:BSNR", + "path": "Location.identifier", + "sliceName": "BSNR", + "min": 0, + "max": "1", + "type": [ + { + "code": "Identifier", + "profile": [ + "http://fhir.de/StructureDefinition/identifier-bsnr" + ] + } + ], + "mustSupport": true + }, { "id": "Location.name", "path": "Location.name", @@ -89,6 +108,14 @@ { "id": "Location.address", "path": "Location.address", + "type": [ + { + "code": "Address", + "profile": [ + "http://fhir.de/StructureDefinition/address-de-basis" + ] + } + ], "mustSupport": true }, { @@ -111,19 +138,10 @@ "path": "Location.address.city", "mustSupport": true }, - { - "id": "Location.address.district", - "path": "Location.address.district", - "mustSupport": true - }, { "id": "Location.address.state", "path": "Location.address.state", - "mustSupport": true, - "binding": { - "strength": "extensible", - "valueSet": "https://gematik.de/fhir/directory/ValueSet/AddressStateVS" - } + "mustSupport": true }, { "id": "Location.address.postalCode", @@ -155,6 +173,11 @@ "path": "Location.position.altitude", "mustSupport": true }, + { + "id": "Location.managingOrganization", + "path": "Location.managingOrganization", + "mustSupport": true + }, { "id": "Location.hoursOfOperation", "path": "Location.hoursOfOperation", diff --git a/src/fhir/fsh-generated/resources/StructureDefinition-OrganizationDirectory.json b/src/fhir/fsh-generated/resources/StructureDefinition-OrganizationDirectory.json index 594d1a44..061d51c8 100644 --- a/src/fhir/fsh-generated/resources/StructureDefinition-OrganizationDirectory.json +++ b/src/fhir/fsh-generated/resources/StructureDefinition-OrganizationDirectory.json @@ -1,18 +1,7 @@ { "resourceType": "StructureDefinition", "id": "OrganizationDirectory", - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-category", - "valueString": "Base.Entities" - }, - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-security-category", - "valueCode": "business" - } - ], "url": "https://gematik.de/fhir/directory/StructureDefinition/OrganizationDirectory", - "version": "0.10.2", "name": "OrganizationDirectory", "title": "Organization in gematik Directory", "status": "active", @@ -117,22 +106,6 @@ ], "mustSupport": true }, - { - "id": "Organization.identifier:BSNR", - "path": "Organization.identifier", - "sliceName": "BSNR", - "min": 0, - "max": "1", - "type": [ - { - "code": "Identifier", - "profile": [ - "http://fhir.de/StructureDefinition/identifier-bsnr" - ] - } - ], - "mustSupport": true - }, { "id": "Organization.identifier:KZVA", "path": "Organization.identifier", @@ -168,11 +141,40 @@ { "id": "Organization.type", "path": "Organization.type", + "slicing": { + "discriminator": [ + { + "type": "pattern", + "path": "$this" + } + ], + "rules": "open" + }, "min": 1, + "mustSupport": true + }, + { + "id": "Organization.type:providerType", + "path": "Organization.type", + "sliceName": "providerType", + "min": 0, + "max": "*", + "mustSupport": true, + "binding": { + "strength": "required", + "valueSet": "https://gematik.de/fhir/directory/ValueSet/OrganizationProviderTypeVS" + } + }, + { + "id": "Organization.type:profession", + "path": "Organization.type", + "sliceName": "profession", + "min": 0, + "max": "*", "mustSupport": true, "binding": { "strength": "required", - "valueSet": "https://gematik.de/fhir/directory/ValueSet/OrganizationTypeVS" + "valueSet": "https://gematik.de/fhir/directory/ValueSet/OrganizationProfessionOIDTypeVS" } }, { @@ -186,6 +188,54 @@ "path": "Organization.alias", "mustSupport": true }, + { + "id": "Organization.address", + "path": "Organization.address", + "type": [ + { + "code": "Address", + "profile": [ + "http://fhir.de/StructureDefinition/address-de-basis" + ] + } + ], + "mustSupport": true + }, + { + "id": "Organization.address.use", + "path": "Organization.address.use", + "mustSupport": true + }, + { + "id": "Organization.address.text", + "path": "Organization.address.text", + "mustSupport": true + }, + { + "id": "Organization.address.line", + "path": "Organization.address.line", + "mustSupport": true + }, + { + "id": "Organization.address.city", + "path": "Organization.address.city", + "mustSupport": true + }, + { + "id": "Organization.address.state", + "path": "Organization.address.state", + "mustSupport": true + }, + { + "id": "Organization.address.postalCode", + "path": "Organization.address.postalCode", + "mustSupport": true + }, + { + "id": "Organization.address.country", + "path": "Organization.address.country", + "mustSupport": true + }, { "id": "Organization.contact", "path": "Organization.contact", diff --git a/src/fhir/fsh-generated/resources/StructureDefinition-PractitionerDirectory.json b/src/fhir/fsh-generated/resources/StructureDefinition-PractitionerDirectory.json index 2d3e9cf7..4ea4e552 100644 --- a/src/fhir/fsh-generated/resources/StructureDefinition-PractitionerDirectory.json +++ b/src/fhir/fsh-generated/resources/StructureDefinition-PractitionerDirectory.json @@ -1,18 +1,7 @@ { "resourceType": "StructureDefinition", "id": "PractitionerDirectory", - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-category", - "valueString": "Base.Individuals" - }, - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-security-category", - "valueCode": "individual" - } - ], "url": "https://gematik.de/fhir/directory/StructureDefinition/PractitionerDirectory", - "version": "0.10.2", "name": "PractitionerDirectory", "title": "Practitioner in gematik Directory", "status": "active", @@ -153,6 +142,14 @@ "path": "Practitioner.name", "min": 1, "max": "1", + "type": [ + { + "code": "HumanName", + "profile": [ + "http://fhir.de/StructureDefinition/humanname-de-basis" + ] + } + ], "mustSupport": true }, { @@ -226,6 +223,7 @@ { "id": "Practitioner.qualification.code", "path": "Practitioner.qualification.code", + "mustSupport": true, "binding": { "strength": "extensible", "valueSet": "https://gematik.de/fhir/directory/ValueSet/PractitionerQualificationVS" diff --git a/src/fhir/fsh-generated/resources/StructureDefinition-PractitionerRoleDirectory.json b/src/fhir/fsh-generated/resources/StructureDefinition-PractitionerRoleDirectory.json index ece1007e..ca73a0fa 100644 --- a/src/fhir/fsh-generated/resources/StructureDefinition-PractitionerRoleDirectory.json +++ b/src/fhir/fsh-generated/resources/StructureDefinition-PractitionerRoleDirectory.json @@ -1,18 +1,7 @@ { "resourceType": "StructureDefinition", "id": "PractitionerRoleDirectory", - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-category", - "valueString": "Base.Individuals" - }, - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-security-category", - "valueCode": "individual" - } - ], "url": "https://gematik.de/fhir/directory/StructureDefinition/PractitionerRoleDirectory", - "version": "0.10.2", "name": "PractitionerRoleDirectory", "title": "PractitionerRole in gematik Directory", "status": "active", diff --git a/src/fhir/fsh-generated/resources/ValueSet-1.2.276.0.76.11.58--20211114161028.json b/src/fhir/fsh-generated/resources/ValueSet-1.2.276.0.76.11.58--20211114161028.json new file mode 100644 index 00000000..a35ce7ad --- /dev/null +++ b/src/fhir/fsh-generated/resources/ValueSet-1.2.276.0.76.11.58--20211114161028.json @@ -0,0 +1,190 @@ +{ + "resourceType": "ValueSet", + "status": "active", + "name": "IHEXDShealthcareFacilityTypeCodePatientRelatedHealthcare", + "id": "1.2.276.0.76.11.58--20211114161028", + "title": "IHE XDS healthcareFacilityTypeCode Patient Related Healthcare", + "description": "**healthcareFacilityTypeCode (XDSDocumentEntry)**\n This code for an XDS Document represents the type of organizational setting of the clinical encounter during which the documented act occurred.", + "url": "http://ihe-d.de/ValueSets/IHEXDShealthcareFacilityTypeCodePatientRelatedHealthcare", + "publisher": "IHE Deutschland e.V.", + "experimental": false, + "compose": { + "include": [ + { + "system": "http://ihe-d.de/CodeSystems/PatientBezogenenGesundheitsversorgung", + "concept": [ + { + "code": "APD", + "display": "Ambulanter Pflegedienst", + "extension": [ + { + "url": "http://hl7.org/fhir/StructureDefinition/valueset-concept-comments", + "valueString": "Sozialstationen und gewerblich betriebene ambulante Pflegedienste, die Patienten in der eigenen häuslichen Umgebung betreuen, aber keine ärztlichen Tätigkeiten durchführen." + } + ] + }, + { + "code": "APO", + "display": "Apotheke", + "extension": [ + { + "url": "http://hl7.org/fhir/StructureDefinition/valueset-concept-comments", + "valueString": "Eine Einrichtung zur Abgabe und ggf. Lagerung oder Herstellung von Arzneimitteln. Dieser Wert sollte nicht zur Kennzeichnung von Daten aus Krankenhausapotheken verwendet werden." + } + ] + }, + { + "code": "BER", + "display": "Ärztlicher Bereitschaftsdienst", + "extension": [ + { + "url": "http://hl7.org/fhir/StructureDefinition/valueset-concept-comments", + "valueString": "Der ärztliche Bereitschaftsdienst wird auch als Kassenärztlicher Notdienst bezeichnet. Er wird häufig durch Niedergelassene Ärzte durchgeführt und von der Kassenärztlichen Vereinigungen organisiert, da diese die Verantwortung für die Sicherstellung der medizinischen Versorgung auch außerhalb der üblichen Öffnungszeiten hat. Der Dienst ist vom\n Rettungsdienst zu unterscheiden, der auf speziell ausgebildete Notärzte zurückgreift." + } + ] + }, + { + "code": "PRA", + "display": "Arztpraxis", + "extension": [ + { + "url": "http://hl7.org/fhir/StructureDefinition/valueset-concept-comments", + "valueString": "Arbeitsplatz einer oder mehrerer niedergelassenen Ärztinnen oder Zahnärztinnen. Umfasst sowohl den klassischen \"Einzelsitz\", wie auch die Gemeinschaftspraxis oder die Praxisgemeinschaft. Auch mobile Arztpraxen, die ambulante Zentrumsdialyse (https://www.gbe-bund.de/glossar/Dialyseversorgungsarten.html) und Zahnarztpraxen werden durch diesen Wert\n abgedeckt. Ebenso werden niedergelassene Laborarztpraxen und von ärztlichen Psychotherapeuten geführte Arztpraxen über diesen Wert abgedeckt. Arztpraxen die Teil eines MVZ sind werden über das Konzept MVZ (\"Medizinisches Versorgungszentrum\")\n abgebildet." + } + ] + }, + { + "code": "BAA", + "display": "Betriebsärztliche Abteilung", + "extension": [ + { + "url": "http://hl7.org/fhir/StructureDefinition/valueset-concept-comments", + "valueString": "Betriebsärztliche Abteilung in einer nicht-medizinischen Organisation (z.B. große Firmen die selbst Ärzte anstellen) die eine medizinische Betreuung für Mitarbeiter anbietet. Betriebsärztliche Tätigkeiten einer Ärztin mit eigener Praxis oder eines Diensts eines Krankenhauses fallen nicht unter dieses Konzept, sondern werden mit dem Konzept PRA\n (\"Arztpraxis\"), bzw. KHS (\"Krankenhaus\") abgebildet." + } + ] + }, + { + "code": "BHR", + "display": "Gesundheitsbehörde", + "extension": [ + { + "url": "http://hl7.org/fhir/StructureDefinition/valueset-concept-comments", + "valueString": "Staatliche oder kommunale Gesundheitsbehörde." + } + ] + }, + { + "code": "HEB", + "display": "Hebamme/Geburtshaus", + "extension": [ + { + "url": "http://hl7.org/fhir/StructureDefinition/valueset-concept-comments", + "valueString": "Eine freiberuflich tätige Hebamme; bzw. eine in Kooperation mit anderen Hebammen tätige Hebamme. Dieser Wert deckt auch Geburtshäuser ab, d.h. üblicherweise von Hebammen betriebene außerklinische Einrichtungen." + } + ] + }, + { + "code": "HOS", + "display": "Hospiz", + "extension": [ + { + "url": "http://hl7.org/fhir/StructureDefinition/valueset-concept-comments", + "valueString": "Eine stationäre oder ambulante Einrichtung der Sterbebegleitung. Dies umfasst sowohl Pflegeheim-ähnliche Einrichtungen, wie auch Einrichtungen die den Patienten in der eigenen häuslichen Umgebung betreuen. Sowohl Einrichtungen unter ärztlicher Leitung, wie auch unter pflegerischer Leitung werden hier zusammengefasst." + } + ] + }, + { + "code": "KHS", + "display": "Krankenhaus", + "extension": [ + { + "url": "http://hl7.org/fhir/StructureDefinition/valueset-concept-comments", + "valueString": "Eine Einrichtung die als Krankenhaus nach dem Krankenhausfinanzierungsgesetz (KHG) zu verstehen ist, mit Ausnahme von Reha-Kliniken. Zu den Krankenhäusern gehören hierbei auch Zahnkliniken. Zusätzlich fallen unter diesen Wert auch Krankenhäuser auf die das KHG keine Anwendung findet (siehe §3, z.B. im Straf- oder Maßregelvollzug, Polizeikrankenhäuser,\n Bundeswehrkrankenhäuser...), solange es sich nicht um Einrichtungen der medizinischen Rehabilitation handelt. Für Dokumente aus der Abteilung Krankenhausapotheke oder aus Krankenhausambulanzen sollte immer das Konzept KHS \"Krankenhaus\" verwendet werden. Auch bei vornehmlich telemedizinisch erbrachten Leistungen eines Krankenhauses (z.B. Teleradiologie)\n sollte das Konzept KHS \"Krankenhaus\"\" verwendet werden. Für angeschlossene, aber selbständige Einrichtungen, wie z.B. ein zum Krankenhaus gehöriges MVZ oder Hospiz, sollte dieses Konzept (KHS \"Krankenhaus\"), sondern ein spezifischeres Konzept für den Einrichtungstyp verwendet werden. Dazu zählen auch ausgegründete Labore, die als Arztpraxis abgebildet\n werden, da sie eine entsprechende KV-Zulassung benötigen. Psychotherapeutische, psychiatrische und psychosomatische Abteilungen von Krankenhäusern und eigenständige Fachkliniken aus diesem Bereich werden auch mit diesem Wert abgedeckt, unabhängig davon ob die Dienste stationär, als Tagesklinik oder ambulant angeboten werden." + } + ] + }, + { + "code": "MVZ", + "display": "Medizinisches Versorgungszentrum", + "extension": [ + { + "url": "http://hl7.org/fhir/StructureDefinition/valueset-concept-comments", + "valueString": "Einrichtung zur ambulanten medizinischen Versorgung nach §95 SGB V; dieses Konzept sollte für ein MVZ unabhängig von der Besitzerstruktur gewählt werden, d.h. auch MVZ die einem Krankenhaus gehören, sollten als MVZ gekennzeichnet werden." + } + ] + }, + { + "code": "HAN", + "display": "Medizinisch-technisches Handwerk", + "extension": [ + { + "url": "http://hl7.org/fhir/StructureDefinition/valueset-concept-comments", + "valueString": "Eine Einrichtung des medizinisch-technischen Handwerks, wie Augenoptiker, Hörakustiker-Fachgeschäft, Diätkoch, Orthopädische Schuhmacher, sowie Orthopädische Fachgeschäfte und Sanitätshäuser." + } + ] + }, + { + "code": "REH", + "display": "Medizinische Rehabilitation", + "extension": [ + { + "url": "http://hl7.org/fhir/StructureDefinition/valueset-concept-comments", + "valueString": "Eine ambulante, teilstationäre oder stationäre Einrichtung der medizinischen Rehabilitation unter ärztlicher Leitung. Darunter fallen sowohl Kur-Einrichtungen und Reha-Kliniken als auch dezentrale Organisationsformen aus dem ambulanten Sektor." + } + ] + }, + { + "code": "HEI", + "display": "Nicht-ärztliche Heilberufs-Praxis", + "extension": [ + { + "url": "http://hl7.org/fhir/StructureDefinition/valueset-concept-comments", + "valueString": "Von nicht-ärztlichen Heilberuflern betriebene Einrichtungen zur Beratung, Therapie oder Betreuung. Darunter fallen Praxen von Heilpraktikerinnen, Physiotherapeutinnen, Ergotherapeutinnen, Podologinnen, Masseurinnen, Logopädinnen, Sprachtherapeutinnen, Diätassistentinnen, sowie human-medizinische Beratungsstellen. Auch nicht-ärztliche psychotherapeutische\n Praxen, z.B. von Diplom oder Master-Psychologen, gehören dazu. Dokumente von freiberuflichen Hebammen fallen nicht in diese Gruppe, sondern sind mit dem Konzept für HEB \"Hebamme/Geburtshaus\" zu kennzeichnen. Dokumente von Pflegediensten oder freiberuflichen Pflegekräften fallen nicht in diese Gruppe sondern sind mit dem Konzept APD\n  \"Ambulante Pflegedienste\" zu kennzeichnen." + } + ] + }, + { + "code": "PFL", + "display": "Pflegeheim", + "extension": [ + { + "url": "http://hl7.org/fhir/StructureDefinition/valueset-concept-comments", + "valueString": "Eine Einrichtung zur Unterbringung und Versorgung pflegebedürftiger Menschen. Umfasst Altenpflegeheime und Pflegeheime für Menschen mit Behinderung. Die Einrichtungen versorgen Menschen üblicherweise langfristig, aber auch Kurzzeitpflege der genannten Personengruppen ist durch dieses Konzept abgedeckt." + } + ] + }, + { + "code": "RTN", + "display": "Rettungsdienst", + "extension": [ + { + "url": "http://hl7.org/fhir/StructureDefinition/valueset-concept-comments", + "valueString": "Einrichtungen des zivilen Rettungsdienst, wie z.B. Rettungswachen, Wasserrettung, etc." + } + ] + }, + { + "code": "SEL", + "display": "Selbsthilfe", + "extension": [ + { + "url": "http://hl7.org/fhir/StructureDefinition/valueset-concept-comments", + "valueString": "Einrichtungen zur Information und Beratung zur Selbsthilfe sowie Selbsthilfegruppen, z.B. Suchtberatung, AIDS-Hilfe, etc." + } + ] + }, + { + "code": "TMZ", + "display": "Telemedizinisches Zentrum", + "extension": [ + { + "url": "http://hl7.org/fhir/StructureDefinition/valueset-concept-comments", + "valueString": "Eine dedizierte Einrichtung die ausschließlich auf die telemedizinische Betreuung von Patienten abzielt. Dies umfasst sowohl dedizierte Care Management Organisationen, wie auch Telemonitoring-Zentren. Dokumente die im Rahmen von telemedizinischen Dienstleistungen von Krankenhäusern oder niedergelassenen Ärzten erbracht werden, sollten nicht mit diesem\n Konzept gekennzeichnet werden, sondern mit dem Konzept für KHS \"Krankenhaus\" bzw. PRA \"Arztpraxis\"." + } + ] + } + ] + } + ] + } +} diff --git a/src/fhir/fsh-generated/resources/ValueSet-AddressStateVS.json b/src/fhir/fsh-generated/resources/ValueSet-AddressStateVS.json index e92d3291..ce8cb10d 100644 --- a/src/fhir/fsh-generated/resources/ValueSet-AddressStateVS.json +++ b/src/fhir/fsh-generated/resources/ValueSet-AddressStateVS.json @@ -4,7 +4,6 @@ "name": "AddressStateVS", "id": "AddressStateVS", "description": "ValueSet for `Address.state`", - "version": "0.10.2", "url": "https://gematik.de/fhir/directory/ValueSet/AddressStateVS", "publisher": "gematik GmbH", "compose": { diff --git a/src/fhir/fsh-generated/resources/ValueSet-EndpointConnectionTypeVS.json b/src/fhir/fsh-generated/resources/ValueSet-EndpointConnectionTypeVS.json index df028570..5fa24b64 100644 --- a/src/fhir/fsh-generated/resources/ValueSet-EndpointConnectionTypeVS.json +++ b/src/fhir/fsh-generated/resources/ValueSet-EndpointConnectionTypeVS.json @@ -4,7 +4,6 @@ "name": "EndpointConnectionTypeVS", "id": "EndpointConnectionTypeVS", "description": "ValueSet for `Endpoint.connectionType`", - "version": "0.10.2", "url": "https://gematik.de/fhir/directory/ValueSet/EndpointConnectionTypeVS", "publisher": "gematik GmbH", "compose": { diff --git a/src/fhir/fsh-generated/resources/ValueSet-EndpointPayloadTypeVS.json b/src/fhir/fsh-generated/resources/ValueSet-EndpointPayloadTypeVS.json index 107f238d..f596a0d6 100644 --- a/src/fhir/fsh-generated/resources/ValueSet-EndpointPayloadTypeVS.json +++ b/src/fhir/fsh-generated/resources/ValueSet-EndpointPayloadTypeVS.json @@ -4,7 +4,6 @@ "name": "EndpointPayloadTypeVS", "id": "EndpointPayloadTypeVS", "description": "ValueSet for `Endpoint.payloadType`", - "version": "0.10.2", "url": "https://gematik.de/fhir/directory/ValueSet/EndpointPayloadTypeVS", "publisher": "gematik GmbH", "compose": { diff --git a/src/fhir/fsh-generated/resources/ValueSet-HealthcareServiceSpecialtyVS.json b/src/fhir/fsh-generated/resources/ValueSet-HealthcareServiceTypeVS.json similarity index 97% rename from src/fhir/fsh-generated/resources/ValueSet-HealthcareServiceSpecialtyVS.json rename to src/fhir/fsh-generated/resources/ValueSet-HealthcareServiceTypeVS.json index 647a61f1..8057cd97 100644 --- a/src/fhir/fsh-generated/resources/ValueSet-HealthcareServiceSpecialtyVS.json +++ b/src/fhir/fsh-generated/resources/ValueSet-HealthcareServiceTypeVS.json @@ -1,11 +1,10 @@ { "resourceType": "ValueSet", "status": "active", - "name": "HealthcareServiceSpecialtyVS", - "id": "HealthcareServiceSpecialtyVS", - "description": "ValueSet for `HealthcareService.specialty`", - "version": "0.10.2", - "url": "https://gematik.de/fhir/directory/ValueSet/HealthcareServiceSpecialtyVS", + "name": "HealthcareServiceTypeVS", + "id": "HealthcareServiceTypeVS", + "description": "ValueSet for `HealthcareService.type`", + "url": "https://gematik.de/fhir/directory/ValueSet/HealthcareServiceTypeVS", "publisher": "gematik GmbH", "compose": { "include": [ @@ -403,6 +402,9 @@ "display": "Psychotherapie" } ] + }, + { + "system": "https://gematik.de/fhir/directory/CodeSystem/PharmacyTypeCS" } ] } diff --git a/src/fhir/fsh-generated/resources/ValueSet-HealthcareSpecialityTypeVS.json b/src/fhir/fsh-generated/resources/ValueSet-HealthcareSpecialityTypeVS.json new file mode 100644 index 00000000..946f5262 --- /dev/null +++ b/src/fhir/fsh-generated/resources/ValueSet-HealthcareSpecialityTypeVS.json @@ -0,0 +1,20 @@ +{ + "resourceType": "ValueSet", + "status": "active", + "name": "HealthcareServiceSpecialityVS", + "id": "HealthcareSpecialityTypeVS", + "title": "ValueSet of HealthcareService specialities", + "description": "HealthcareService specialities", + "url": "https://gematik.de/fhir/directory/ValueSet/HealthcareSpecialityTypeVS", + "publisher": "gematik GmbH", + "compose": { + "include": [ + { + "system": "https://gematik.de/fhir/directory/CodeSystem/PharmacyHealthcareSpecialityCS" + }, + { + "system": "http://terminology.hl7.org/CodeSystem/service-type" + } + ] + } +} diff --git a/src/fhir/fsh-generated/resources/ValueSet-OrganizationTypeVS.json b/src/fhir/fsh-generated/resources/ValueSet-OrganizationProfessionOIDTypeVS.json similarity index 63% rename from src/fhir/fsh-generated/resources/ValueSet-OrganizationTypeVS.json rename to src/fhir/fsh-generated/resources/ValueSet-OrganizationProfessionOIDTypeVS.json index a56db1bb..85862cd5 100644 --- a/src/fhir/fsh-generated/resources/ValueSet-OrganizationTypeVS.json +++ b/src/fhir/fsh-generated/resources/ValueSet-OrganizationProfessionOIDTypeVS.json @@ -1,19 +1,15 @@ { "resourceType": "ValueSet", "status": "active", - "name": "OrganizationTypeVS", - "id": "OrganizationTypeVS", + "name": "OrganizationProfessionOIDTypeVS", + "id": "OrganizationProfessionOIDTypeVS", "description": "ValueSet for `Organization.type`", - "version": "0.10.2", - "url": "https://gematik.de/fhir/directory/ValueSet/OrganizationTypeVS", + "url": "https://gematik.de/fhir/directory/ValueSet/OrganizationProfessionOIDTypeVS", "publisher": "gematik GmbH", "compose": { "include": [ { "system": "https://gematik.de/fhir/directory/CodeSystem/OrganizationProfessionOID" - }, - { - "system": "https://gematik.de/fhir/directory/CodeSystem/OrganizationProviderType" } ] } diff --git a/src/fhir/fsh-generated/resources/ValueSet-OrganizationProviderTypeVS.json b/src/fhir/fsh-generated/resources/ValueSet-OrganizationProviderTypeVS.json new file mode 100644 index 00000000..6ad1dbca --- /dev/null +++ b/src/fhir/fsh-generated/resources/ValueSet-OrganizationProviderTypeVS.json @@ -0,0 +1,16 @@ +{ + "resourceType": "ValueSet", + "status": "active", + "name": "OrganizationProviderTypeVS", + "id": "OrganizationProviderTypeVS", + "description": "ValueSet for `Organization.type`", + "url": "https://gematik.de/fhir/directory/ValueSet/OrganizationProviderTypeVS", + "publisher": "gematik GmbH", + "compose": { + "include": [ + { + "system": "https://gematik.de/fhir/directory/CodeSystem/OrganizationProviderType" + } + ] + } +} diff --git a/src/fhir/fsh-generated/resources/ValueSet-OriginVS.json b/src/fhir/fsh-generated/resources/ValueSet-OriginVS.json index b1f0c002..b2996813 100644 --- a/src/fhir/fsh-generated/resources/ValueSet-OriginVS.json +++ b/src/fhir/fsh-generated/resources/ValueSet-OriginVS.json @@ -4,7 +4,6 @@ "name": "OriginVS", "id": "OriginVS", "description": "ValueSet for `meta.tag[Origin]`", - "version": "0.10.2", "url": "https://gematik.de/fhir/directory/ValueSet/OriginVS", "publisher": "gematik GmbH", "compose": { diff --git a/src/fhir/fsh-generated/resources/ValueSet-PharmacyHealthcareServiceTypeVS.json b/src/fhir/fsh-generated/resources/ValueSet-PharmacyHealthcareServiceTypeVS.json deleted file mode 100644 index 9bb97b6e..00000000 --- a/src/fhir/fsh-generated/resources/ValueSet-PharmacyHealthcareServiceTypeVS.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "resourceType": "ValueSet", - "status": "active", - "name": "PharmacyHealthcareServiceTypeVS", - "id": "PharmacyHealthcareServiceTypeVS", - "title": "ValueSet of HealthcareService types", - "description": "Types of accessibilities available", - "version": "1.0", - "url": "https://gematik.de/fhir/directory/ValueSet/PharmacyHealthcareServiceTypeVS", - "publisher": "gematik GmbH", - "compose": { - "include": [ - { - "system": "https://gematik.de/fhir/directory/CodeSystem/PharmacyHealthcareServiceTypeCS" - }, - { - "system": "http://terminology.hl7.org/CodeSystem/service-type" - } - ] - } -} diff --git a/src/fhir/fsh-generated/resources/ValueSet-PharmacyTypeVS.json b/src/fhir/fsh-generated/resources/ValueSet-PharmacyTypeVS.json deleted file mode 100644 index 0c1184fb..00000000 --- a/src/fhir/fsh-generated/resources/ValueSet-PharmacyTypeVS.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "resourceType": "ValueSet", - "status": "active", - "name": "PharmacyTypeVS", - "id": "PharmacyTypeVS", - "title": "ValueSet of Pharmacy types", - "description": "Types of accessibilities available", - "version": "1.0", - "url": "https://gematik.de/fhir/directory/ValueSet/PharmacyTypeVS", - "publisher": "gematik GmbH", - "compose": { - "include": [ - { - "system": "https://gematik.de/fhir/directory/CodeSystem/PharmacyTypeCS" - } - ] - } -} diff --git a/src/fhir/fsh-generated/resources/ValueSet-PractitionerQualificationVS.json b/src/fhir/fsh-generated/resources/ValueSet-PractitionerQualificationVS.json index 3f0dd4b7..0cd5acd2 100644 --- a/src/fhir/fsh-generated/resources/ValueSet-PractitionerQualificationVS.json +++ b/src/fhir/fsh-generated/resources/ValueSet-PractitionerQualificationVS.json @@ -4,7 +4,6 @@ "name": "PractitionerQualificationVS", "id": "PractitionerQualificationVS", "description": "ValueSet for `Practitoner.qualification`", - "version": "0.10.2", "url": "https://gematik.de/fhir/directory/ValueSet/PractitionerQualificationVS", "publisher": "gematik GmbH", "compose": { diff --git a/src/fhir/input/fsh/alias.fsh b/src/fhir/input/fsh/alias.fsh index 34832651..a85aaf96 100644 --- a/src/fhir/input/fsh/alias.fsh +++ b/src/fhir/input/fsh/alias.fsh @@ -38,4 +38,5 @@ 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: $ServiceProvisionConditions = http://terminology.hl7.org/CodeSystem/service-provision-conditions -Alias: $CommonLanguages = urn:ietf:bcp:47 \ No newline at end of file +Alias: $CommonLanguages = urn:ietf:bcp:47 +Alias: $sct = http://snomed.info/sct \ No newline at end of file diff --git a/src/fhir/input/fsh/codesystems/EndpointDirectoryConnectionType.fsh b/src/fhir/input/fsh/codesystems/EndpointDirectoryConnectionType.fsh index 349cbeca..8e4c737b 100644 --- a/src/fhir/input/fsh/codesystems/EndpointDirectoryConnectionType.fsh +++ b/src/fhir/input/fsh/codesystems/EndpointDirectoryConnectionType.fsh @@ -11,3 +11,4 @@ Description: "CodeSystem TI specific connection types assigned to the Endpoints" * #kim-2.0 "KIM 2.0 Endpoint" * #epa-supported "ePA Endpoint" * #erp-supported "eRP Endpoint" +* #ident-eingangsabruf "Ident Eingangsdatenabruf" diff --git a/src/fhir/input/fsh/codesystems/PharmacyHealthcareServiceSpecialityCS.fsh b/src/fhir/input/fsh/codesystems/PharmacyHealthcareServiceSpecialityCS.fsh new file mode 100644 index 00000000..d46af701 --- /dev/null +++ b/src/fhir/input/fsh/codesystems/PharmacyHealthcareServiceSpecialityCS.fsh @@ -0,0 +1,12 @@ +CodeSystem: PharmacyHealthcareSpecialityCS +Id: PharmacyHealthcareSpecialityCS +Title: "HealthcareService Speciality" +Description: "Speciality codes of HealthcareServices" +* insert Meta +* ^caseSensitive = false +* ^content = #complete +* #10 "Handverkauf" +* #20 "Nacht- und Notdienst" +* #30 "Botendienst" +* #40 "Versand" +* #50 "Zytostatikaherstellung" \ No newline at end of file diff --git a/src/fhir/input/fsh/codesystems/PharmacyHealthcareServiceTypeCS.fsh b/src/fhir/input/fsh/codesystems/PharmacyHealthcareServiceTypeCS.fsh deleted file mode 100644 index fe56142d..00000000 --- a/src/fhir/input/fsh/codesystems/PharmacyHealthcareServiceTypeCS.fsh +++ /dev/null @@ -1,14 +0,0 @@ -CodeSystem: PharmacyHealthcareServiceTypeCS -Id: PharmacyHealthcareServiceTypeCS -Title: "HealthcareService Type" -Description: "Type codes of HealthcareServices" -* insert Meta -* ^version = "1.0" -* ^caseSensitive = false -* ^content = #complete - -* #10 "Handverkauf" -* #20 "Nacht- und Notdienst" -* #30 "Botendienst" -* #40 "Versand" -* #50 "Zytostatikaherstellung" \ No newline at end of file diff --git a/src/fhir/input/fsh/codesystems/PharmacyTypeCS.fsh b/src/fhir/input/fsh/codesystems/PharmacyTypeCS.fsh index 21115627..1b743747 100644 --- a/src/fhir/input/fsh/codesystems/PharmacyTypeCS.fsh +++ b/src/fhir/input/fsh/codesystems/PharmacyTypeCS.fsh @@ -6,8 +6,6 @@ Description: "Pharmacy type codes of accessability for patients" * ^version = "1.0" * ^caseSensitive = true * ^content = #complete - -* #10 "Offizin-Apotheke" -* #20 "Krankenhausversorgende Apotheke" -* #30 "Heimversorgende Apotheke" -* #40 "Versandapotheke" \ No newline at end of file +* #offizin-apotheke" "Offizin-Apotheke" +* #krankenhausversorgende-apotheke "Krankenhausversorgende Apotheke" +* #bundeswehrapotheke "Bundeswehrapotheke" \ No newline at end of file diff --git a/src/fhir/input/fsh/examples/OrganizationExample001.fsh b/src/fhir/input/fsh/examples/OrganizationExample001.fsh index 02424af5..8d5d2cc3 100644 --- a/src/fhir/input/fsh/examples/OrganizationExample001.fsh +++ b/src/fhir/input/fsh/examples/OrganizationExample001.fsh @@ -27,7 +27,7 @@ Friedrichstr. 136, 10117 Berlin""" * address.line[+] = "Friedrichstr. 136" * address.city = "Berlin" -* address.district = "Mitte" +* address.extension[Stadtteil].valueString = "Mitte" * address.state = Region#Berlin * address.postalCode = "10117" * address.country = "DE" diff --git a/src/fhir/input/fsh/profiles/EndpointDirectory.fsh b/src/fhir/input/fsh/profiles/EndpointDirectory.fsh index f6fdc023..8552eadb 100644 --- a/src/fhir/input/fsh/profiles/EndpointDirectory.fsh +++ b/src/fhir/input/fsh/profiles/EndpointDirectory.fsh @@ -13,9 +13,11 @@ Description: "Endpoints for applications in the gematik Directory" * meta.tag[Origin].system = "https://gematik.de/fhir/directory/CodeSystem/Origin" * status 1..1 MS * connectionType 1..1 MS -* connectionType.code from EndpointConnectionTypeVS (extensible) + * code MS + * code from EndpointConnectionTypeVS (extensible) + * system MS * name 1..1 MS // identical to address; because search is possible in element name and not in element address -* managingOrganization 0..1 MS +* managingOrganization MS * payloadType 1..* MS * payloadType from EndpointPayloadTypeVS (extensible) * address 1..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 eac265cd..52410e01 100644 --- a/src/fhir/input/fsh/profiles/HealthcareServiceDirectory.fsh +++ b/src/fhir/input/fsh/profiles/HealthcareServiceDirectory.fsh @@ -14,8 +14,12 @@ organisations specific for german Healthcare and Telematics Infrastructure. * meta.tag[Origin].system = "https://gematik.de/fhir/directory/CodeSystem/Origin" * id ..1 MS * providedBy 1..1 MS +* category MS +* category from IHEXDShealthcareFacilityTypeCodePatientRelatedHealthcare +* type MS +* type from HealthcareServiceTypeVS (extensible) * specialty MS -* specialty from HealthcareServiceSpecialtyVS (extensible) +* specialty from HealthcareServiceSpecialityVS * location MS * name MS * telecom MS @@ -28,3 +32,4 @@ organisations specific for german Healthcare and Telematics Infrastructure. * availableTime MS * availabilityExceptions MS * endpoint MS +* characteristic MS diff --git a/src/fhir/input/fsh/profiles/LocationDirectory.fsh b/src/fhir/input/fsh/profiles/LocationDirectory.fsh index c658d88e..f87519e3 100644 --- a/src/fhir/input/fsh/profiles/LocationDirectory.fsh +++ b/src/fhir/input/fsh/profiles/LocationDirectory.fsh @@ -12,17 +12,23 @@ organisations specific for german Healthcare and Telematics Infrastructure. * meta.tag contains Origin 1..1 MS * meta.tag[Origin] from OriginVS * meta.tag[Origin].system = "https://gematik.de/fhir/directory/CodeSystem/Origin" +* identifier MS +* identifier ^slicing.discriminator.type = #value +* identifier ^slicing.discriminator.path = "system" +* identifier ^slicing.rules = #open +* identifier contains BSNR 0..1 MS +* identifier[BSNR] only $IdentifierBSNR * id 0..1 MS * name MS * description MS * address MS +* address only AddressDeBasis * use MS * text MS * line MS * city MS - * district MS * state MS - * state from AddressStateVS (extensible) +// FIXME: widerspricht dt. Basisprofilen * state from AddressStateVS (extensible) * postalCode MS * country MS * position MS @@ -35,3 +41,4 @@ organisations specific for german Healthcare and Telematics Infrastructure. * openingTime MS * closingTime MS * availabilityExceptions MS +* managingOrganization MS \ 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 6a3d1a3b..36071649 100644 --- a/src/fhir/input/fsh/profiles/OrganizationDirectory.fsh +++ b/src/fhir/input/fsh/profiles/OrganizationDirectory.fsh @@ -20,14 +20,26 @@ organisations specific for german Healthcare and Telematics Infrastructure. * identifier ^slicing.rules = #open * identifier contains TelematikID 1..1 MS * identifier[TelematikID] only $IdentifierTelematikID -* identifier contains BSNR 0..1 MS -* identifier[BSNR] only $IdentifierBSNR * identifier contains KZVA 0..1 MS * identifier[KZVA] only $IdentifierKZVA * identifier contains IKNR 0..1 MS * identifier[IKNR] only $IdentifierIKNR * type 1..* MS -* type from OrganizationTypeVS + * ^slicing.discriminator.type = #pattern + * ^slicing.discriminator.path = "$this" + * ^slicing.rules = #open +* type contains providerType 0..* MS and profession 0..* MS +* type[providerType] from OrganizationProviderTypeVS +* type[profession] from OrganizationProfessionOIDTypeVS * name 1..1 MS * alias MS * contact MS +* address MS +* address only AddressDeBasis + * use MS + * text MS + * line MS + * city MS + * state MS + * postalCode MS + * country MS \ 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 8dd8bb78..cb3bd3f9 100644 --- a/src/fhir/input/fsh/profiles/PractitionerDirectory.fsh +++ b/src/fhir/input/fsh/profiles/PractitionerDirectory.fsh @@ -20,6 +20,7 @@ Title: "Practitioner in gematik Directory" * identifier[LANR] only $IdentifierLANR * identifier contains ZANR 0.. MS * identifier[ZANR] only $IdentifierZANR +* name only HumannameDeBasis * name 1..1 MS * text 1..1 MS * family 1..1 MS @@ -34,5 +35,6 @@ Title: "Practitioner in gematik Directory" * birthDate MS * photo MS * qualification MS -* qualification.code from PractitionerQualificationVS (extensible) + * code MS + * code from PractitionerQualificationVS (extensible) * communication MS diff --git a/src/fhir/input/fsh/valuesets/HealthCareServiceCategory.fsh b/src/fhir/input/fsh/valuesets/HealthCareServiceCategory.fsh new file mode 100644 index 00000000..9c2b9021 --- /dev/null +++ b/src/fhir/input/fsh/valuesets/HealthCareServiceCategory.fsh @@ -0,0 +1,62 @@ +Alias: $PatientBezogenenGesundheitsversorgung = http://ihe-d.de/CodeSystems/PatientBezogenenGesundheitsversorgung + +ValueSet: IHEXDShealthcareFacilityTypeCodePatientRelatedHealthcare +Id: 1.2.276.0.76.11.58--20211114161028 +Title: "IHE XDS healthcareFacilityTypeCode Patient Related Healthcare" +Description: """**healthcareFacilityTypeCode (XDSDocumentEntry)** + This code for an XDS Document represents the type of organizational setting of the clinical encounter during which the documented act occurred.""" +* insert Meta +* ^publisher = "IHE Deutschland e.V." +* ^experimental = false +* ^url = "http://ihe-d.de/ValueSets/IHEXDShealthcareFacilityTypeCodePatientRelatedHealthcare" +* $PatientBezogenenGesundheitsversorgung#APD "Ambulanter Pflegedienst" +* $PatientBezogenenGesundheitsversorgung#APD ^extension.url = "http://hl7.org/fhir/StructureDefinition/valueset-concept-comments" +* $PatientBezogenenGesundheitsversorgung#APD ^extension.valueString = "Sozialstationen und gewerblich betriebene ambulante Pflegedienste, die Patienten in der eigenen häuslichen Umgebung betreuen, aber keine ärztlichen Tätigkeiten durchführen." +* $PatientBezogenenGesundheitsversorgung#APO "Apotheke" +* $PatientBezogenenGesundheitsversorgung#APO ^extension.url = "http://hl7.org/fhir/StructureDefinition/valueset-concept-comments" +* $PatientBezogenenGesundheitsversorgung#APO ^extension.valueString = "Eine Einrichtung zur Abgabe und ggf. Lagerung oder Herstellung von Arzneimitteln. Dieser Wert sollte nicht zur Kennzeichnung von Daten aus Krankenhausapotheken verwendet werden." +* $PatientBezogenenGesundheitsversorgung#BER "Ärztlicher Bereitschaftsdienst" +* $PatientBezogenenGesundheitsversorgung#BER ^extension.url = "http://hl7.org/fhir/StructureDefinition/valueset-concept-comments" +* $PatientBezogenenGesundheitsversorgung#BER ^extension.valueString = "Der ärztliche Bereitschaftsdienst wird auch als Kassenärztlicher Notdienst bezeichnet. Er wird häufig durch Niedergelassene Ärzte durchgeführt und von der Kassenärztlichen Vereinigungen organisiert, da diese die Verantwortung für die Sicherstellung der medizinischen Versorgung auch außerhalb der üblichen Öffnungszeiten hat. Der Dienst ist vom\n Rettungsdienst zu unterscheiden, der auf speziell ausgebildete Notärzte zurückgreift." +* $PatientBezogenenGesundheitsversorgung#PRA "Arztpraxis" +* $PatientBezogenenGesundheitsversorgung#PRA ^extension.url = "http://hl7.org/fhir/StructureDefinition/valueset-concept-comments" +* $PatientBezogenenGesundheitsversorgung#PRA ^extension.valueString = "Arbeitsplatz einer oder mehrerer niedergelassenen Ärztinnen oder Zahnärztinnen. Umfasst sowohl den klassischen \"Einzelsitz\", wie auch die Gemeinschaftspraxis oder die Praxisgemeinschaft. Auch mobile Arztpraxen, die ambulante Zentrumsdialyse (https://www.gbe-bund.de/glossar/Dialyseversorgungsarten.html) und Zahnarztpraxen werden durch diesen Wert\n abgedeckt. Ebenso werden niedergelassene Laborarztpraxen und von ärztlichen Psychotherapeuten geführte Arztpraxen über diesen Wert abgedeckt. Arztpraxen die Teil eines MVZ sind werden über das Konzept MVZ (\"Medizinisches Versorgungszentrum\")\n abgebildet." +* $PatientBezogenenGesundheitsversorgung#BAA "Betriebsärztliche Abteilung" +* $PatientBezogenenGesundheitsversorgung#BAA ^extension.url = "http://hl7.org/fhir/StructureDefinition/valueset-concept-comments" +* $PatientBezogenenGesundheitsversorgung#BAA ^extension.valueString = "Betriebsärztliche Abteilung in einer nicht-medizinischen Organisation (z.B. große Firmen die selbst Ärzte anstellen) die eine medizinische Betreuung für Mitarbeiter anbietet. Betriebsärztliche Tätigkeiten einer Ärztin mit eigener Praxis oder eines Diensts eines Krankenhauses fallen nicht unter dieses Konzept, sondern werden mit dem Konzept PRA\n (\"Arztpraxis\"), bzw. KHS (\"Krankenhaus\") abgebildet." +* $PatientBezogenenGesundheitsversorgung#BHR "Gesundheitsbehörde" +* $PatientBezogenenGesundheitsversorgung#BHR ^extension.url = "http://hl7.org/fhir/StructureDefinition/valueset-concept-comments" +* $PatientBezogenenGesundheitsversorgung#BHR ^extension.valueString = "Staatliche oder kommunale Gesundheitsbehörde." +* $PatientBezogenenGesundheitsversorgung#HEB "Hebamme/Geburtshaus" +* $PatientBezogenenGesundheitsversorgung#HEB ^extension.url = "http://hl7.org/fhir/StructureDefinition/valueset-concept-comments" +* $PatientBezogenenGesundheitsversorgung#HEB ^extension.valueString = "Eine freiberuflich tätige Hebamme; bzw. eine in Kooperation mit anderen Hebammen tätige Hebamme. Dieser Wert deckt auch Geburtshäuser ab, d.h. üblicherweise von Hebammen betriebene außerklinische Einrichtungen." +* $PatientBezogenenGesundheitsversorgung#HOS "Hospiz" +* $PatientBezogenenGesundheitsversorgung#HOS ^extension.url = "http://hl7.org/fhir/StructureDefinition/valueset-concept-comments" +* $PatientBezogenenGesundheitsversorgung#HOS ^extension.valueString = "Eine stationäre oder ambulante Einrichtung der Sterbebegleitung. Dies umfasst sowohl Pflegeheim-ähnliche Einrichtungen, wie auch Einrichtungen die den Patienten in der eigenen häuslichen Umgebung betreuen. Sowohl Einrichtungen unter ärztlicher Leitung, wie auch unter pflegerischer Leitung werden hier zusammengefasst." +* $PatientBezogenenGesundheitsversorgung#KHS "Krankenhaus" +* $PatientBezogenenGesundheitsversorgung#KHS ^extension.url = "http://hl7.org/fhir/StructureDefinition/valueset-concept-comments" +* $PatientBezogenenGesundheitsversorgung#KHS ^extension.valueString = "Eine Einrichtung die als Krankenhaus nach dem Krankenhausfinanzierungsgesetz (KHG) zu verstehen ist, mit Ausnahme von Reha-Kliniken. Zu den Krankenhäusern gehören hierbei auch Zahnkliniken. Zusätzlich fallen unter diesen Wert auch Krankenhäuser auf die das KHG keine Anwendung findet (siehe §3, z.B. im Straf- oder Maßregelvollzug, Polizeikrankenhäuser,\n Bundeswehrkrankenhäuser...), solange es sich nicht um Einrichtungen der medizinischen Rehabilitation handelt. Für Dokumente aus der Abteilung Krankenhausapotheke oder aus Krankenhausambulanzen sollte immer das Konzept KHS \"Krankenhaus\" verwendet werden. Auch bei vornehmlich telemedizinisch erbrachten Leistungen eines Krankenhauses (z.B. Teleradiologie)\n sollte das Konzept KHS \"Krankenhaus\"\" verwendet werden. Für angeschlossene, aber selbständige Einrichtungen, wie z.B. ein zum Krankenhaus gehöriges MVZ oder Hospiz, sollte dieses Konzept (KHS \"Krankenhaus\"), sondern ein spezifischeres Konzept für den Einrichtungstyp verwendet werden. Dazu zählen auch ausgegründete Labore, die als Arztpraxis abgebildet\n werden, da sie eine entsprechende KV-Zulassung benötigen. Psychotherapeutische, psychiatrische und psychosomatische Abteilungen von Krankenhäusern und eigenständige Fachkliniken aus diesem Bereich werden auch mit diesem Wert abgedeckt, unabhängig davon ob die Dienste stationär, als Tagesklinik oder ambulant angeboten werden." +* $PatientBezogenenGesundheitsversorgung#MVZ "Medizinisches Versorgungszentrum" +* $PatientBezogenenGesundheitsversorgung#MVZ ^extension.url = "http://hl7.org/fhir/StructureDefinition/valueset-concept-comments" +* $PatientBezogenenGesundheitsversorgung#MVZ ^extension.valueString = "Einrichtung zur ambulanten medizinischen Versorgung nach §95 SGB V; dieses Konzept sollte für ein MVZ unabhängig von der Besitzerstruktur gewählt werden, d.h. auch MVZ die einem Krankenhaus gehören, sollten als MVZ gekennzeichnet werden." +* $PatientBezogenenGesundheitsversorgung#HAN "Medizinisch-technisches Handwerk" +* $PatientBezogenenGesundheitsversorgung#HAN ^extension.url = "http://hl7.org/fhir/StructureDefinition/valueset-concept-comments" +* $PatientBezogenenGesundheitsversorgung#HAN ^extension.valueString = "Eine Einrichtung des medizinisch-technischen Handwerks, wie Augenoptiker, Hörakustiker-Fachgeschäft, Diätkoch, Orthopädische Schuhmacher, sowie Orthopädische Fachgeschäfte und Sanitätshäuser." +* $PatientBezogenenGesundheitsversorgung#REH "Medizinische Rehabilitation" +* $PatientBezogenenGesundheitsversorgung#REH ^extension.url = "http://hl7.org/fhir/StructureDefinition/valueset-concept-comments" +* $PatientBezogenenGesundheitsversorgung#REH ^extension.valueString = "Eine ambulante, teilstationäre oder stationäre Einrichtung der medizinischen Rehabilitation unter ärztlicher Leitung. Darunter fallen sowohl Kur-Einrichtungen und Reha-Kliniken als auch dezentrale Organisationsformen aus dem ambulanten Sektor." +* $PatientBezogenenGesundheitsversorgung#HEI "Nicht-ärztliche Heilberufs-Praxis" +* $PatientBezogenenGesundheitsversorgung#HEI ^extension.url = "http://hl7.org/fhir/StructureDefinition/valueset-concept-comments" +* $PatientBezogenenGesundheitsversorgung#HEI ^extension.valueString = "Von nicht-ärztlichen Heilberuflern betriebene Einrichtungen zur Beratung, Therapie oder Betreuung. Darunter fallen Praxen von Heilpraktikerinnen, Physiotherapeutinnen, Ergotherapeutinnen, Podologinnen, Masseurinnen, Logopädinnen, Sprachtherapeutinnen, Diätassistentinnen, sowie human-medizinische Beratungsstellen. Auch nicht-ärztliche psychotherapeutische\n Praxen, z.B. von Diplom oder Master-Psychologen, gehören dazu. Dokumente von freiberuflichen Hebammen fallen nicht in diese Gruppe, sondern sind mit dem Konzept für HEB \"Hebamme/Geburtshaus\" zu kennzeichnen. Dokumente von Pflegediensten oder freiberuflichen Pflegekräften fallen nicht in diese Gruppe sondern sind mit dem Konzept APD\n  \"Ambulante Pflegedienste\" zu kennzeichnen." +* $PatientBezogenenGesundheitsversorgung#PFL "Pflegeheim" +* $PatientBezogenenGesundheitsversorgung#PFL ^extension.url = "http://hl7.org/fhir/StructureDefinition/valueset-concept-comments" +* $PatientBezogenenGesundheitsversorgung#PFL ^extension.valueString = "Eine Einrichtung zur Unterbringung und Versorgung pflegebedürftiger Menschen. Umfasst Altenpflegeheime und Pflegeheime für Menschen mit Behinderung. Die Einrichtungen versorgen Menschen üblicherweise langfristig, aber auch Kurzzeitpflege der genannten Personengruppen ist durch dieses Konzept abgedeckt." +* $PatientBezogenenGesundheitsversorgung#RTN "Rettungsdienst" +* $PatientBezogenenGesundheitsversorgung#RTN ^extension.url = "http://hl7.org/fhir/StructureDefinition/valueset-concept-comments" +* $PatientBezogenenGesundheitsversorgung#RTN ^extension.valueString = "Einrichtungen des zivilen Rettungsdienst, wie z.B. Rettungswachen, Wasserrettung, etc." +* $PatientBezogenenGesundheitsversorgung#SEL "Selbsthilfe" +* $PatientBezogenenGesundheitsversorgung#SEL ^extension.url = "http://hl7.org/fhir/StructureDefinition/valueset-concept-comments" +* $PatientBezogenenGesundheitsversorgung#SEL ^extension.valueString = "Einrichtungen zur Information und Beratung zur Selbsthilfe sowie Selbsthilfegruppen, z.B. Suchtberatung, AIDS-Hilfe, etc." +* $PatientBezogenenGesundheitsversorgung#TMZ "Telemedizinisches Zentrum" +* $PatientBezogenenGesundheitsversorgung#TMZ ^extension.url = "http://hl7.org/fhir/StructureDefinition/valueset-concept-comments" +* $PatientBezogenenGesundheitsversorgung#TMZ ^extension.valueString = "Eine dedizierte Einrichtung die ausschließlich auf die telemedizinische Betreuung von Patienten abzielt. Dies umfasst sowohl dedizierte Care Management Organisationen, wie auch Telemonitoring-Zentren. Dokumente die im Rahmen von telemedizinischen Dienstleistungen von Krankenhäusern oder niedergelassenen Ärzten erbracht werden, sollten nicht mit diesem\n Konzept gekennzeichnet werden, sondern mit dem Konzept für KHS \"Krankenhaus\" bzw. PRA \"Arztpraxis\"." \ No newline at end of file diff --git a/src/fhir/input/fsh/valuesets/HealthcareServiceSpecialityVS.fsh b/src/fhir/input/fsh/valuesets/HealthcareServiceSpecialityVS.fsh new file mode 100644 index 00000000..02d153c0 --- /dev/null +++ b/src/fhir/input/fsh/valuesets/HealthcareServiceSpecialityVS.fsh @@ -0,0 +1,7 @@ +ValueSet: HealthcareServiceSpecialityVS +Id: HealthcareSpecialityTypeVS +Title: "ValueSet of HealthcareService specialities" +Description: "HealthcareService specialities" +* insert Meta +* include codes from system PharmacyHealthcareSpecialityCS +* include codes from system http://terminology.hl7.org/CodeSystem/service-type \ No newline at end of file diff --git a/src/fhir/input/fsh/valuesets/HealthcareServiceSpecialtyVS.fsh b/src/fhir/input/fsh/valuesets/HealthcareServiceTypeVS.fsh similarity index 97% rename from src/fhir/input/fsh/valuesets/HealthcareServiceSpecialtyVS.fsh rename to src/fhir/input/fsh/valuesets/HealthcareServiceTypeVS.fsh index a83e7e39..15b11cbc 100644 --- a/src/fhir/input/fsh/valuesets/HealthcareServiceSpecialtyVS.fsh +++ b/src/fhir/input/fsh/valuesets/HealthcareServiceTypeVS.fsh @@ -1,5 +1,5 @@ -ValueSet: HealthcareServiceSpecialtyVS -Description: "ValueSet for `HealthcareService.specialty`" +ValueSet: HealthcareServiceTypeVS +Description: "ValueSet for `HealthcareService.type`" * insert Meta // Ärztliche Fachrichtungen * urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#ALLG "Allgemeinmedizin" @@ -98,4 +98,5 @@ Description: "ValueSet for `HealthcareService.specialty`" * urn:oid:1.3.6.1.4.1.19376.3.276.1.5.5#SPR "Sprachtherapie" * urn:oid:1.3.6.1.4.1.19376.3.276.1.5.5#VKO "Versorgungskoordination" * urn:oid:1.3.6.1.4.1.19376.3.276.1.5.5#VER "Verwaltung" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.5#PST "Psychotherapie" \ No newline at end of file +* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.5#PST "Psychotherapie" +* include codes from system PharmacyTypeCS \ No newline at end of file diff --git a/src/fhir/input/fsh/valuesets/OrganizationProfessionOIDTypeVS.fsh b/src/fhir/input/fsh/valuesets/OrganizationProfessionOIDTypeVS.fsh new file mode 100644 index 00000000..6b4929f1 --- /dev/null +++ b/src/fhir/input/fsh/valuesets/OrganizationProfessionOIDTypeVS.fsh @@ -0,0 +1,4 @@ +ValueSet: OrganizationProfessionOIDTypeVS +Description: "ValueSet for `Organization.type`" +* insert Meta +* include codes from system OrganizationProfessionOID \ No newline at end of file diff --git a/src/fhir/input/fsh/valuesets/OrganizationTypeVS.fsh b/src/fhir/input/fsh/valuesets/OrganizationProviderTypeVS.fsh similarity index 58% rename from src/fhir/input/fsh/valuesets/OrganizationTypeVS.fsh rename to src/fhir/input/fsh/valuesets/OrganizationProviderTypeVS.fsh index e074070b..8a1f3021 100644 --- a/src/fhir/input/fsh/valuesets/OrganizationTypeVS.fsh +++ b/src/fhir/input/fsh/valuesets/OrganizationProviderTypeVS.fsh @@ -1,5 +1,4 @@ -ValueSet: OrganizationTypeVS +ValueSet: OrganizationProviderTypeVS Description: "ValueSet for `Organization.type`" * insert Meta -* include codes from system OrganizationProfessionOID * include codes from system OrganizationProviderType diff --git a/src/fhir/input/fsh/valuesets/PharmacyHealthcareServiceTypeVS.fsh b/src/fhir/input/fsh/valuesets/PharmacyHealthcareServiceTypeVS.fsh deleted file mode 100644 index be8c10b4..00000000 --- a/src/fhir/input/fsh/valuesets/PharmacyHealthcareServiceTypeVS.fsh +++ /dev/null @@ -1,8 +0,0 @@ -ValueSet: PharmacyHealthcareServiceTypeVS -Id: PharmacyHealthcareServiceTypeVS -Title: "ValueSet of HealthcareService types" -Description: "Types of accessibilities available" -* insert Meta -* ^version = "1.0" -* include codes from system PharmacyHealthcareServiceTypeCS -* include codes from system http://terminology.hl7.org/CodeSystem/service-type \ No newline at end of file diff --git a/src/fhir/input/fsh/valuesets/PharmacyTypeVS.fsh b/src/fhir/input/fsh/valuesets/PharmacyTypeVS.fsh deleted file mode 100644 index c034f699..00000000 --- a/src/fhir/input/fsh/valuesets/PharmacyTypeVS.fsh +++ /dev/null @@ -1,7 +0,0 @@ -ValueSet: PharmacyTypeVS -Id: PharmacyTypeVS -Title: "ValueSet of Pharmacy types" -Description: "Types of accessibilities available" -* insert Meta -* ^version = "1.0" -* include codes from system PharmacyTypeCS \ No newline at end of file From 504e0dd9098f6ca5f98722b90dff8319ef694c3b Mon Sep 17 00:00:00 2001 From: patrick-werner Date: Wed, 7 Feb 2024 12:44:51 +0100 Subject: [PATCH 02/16] fixed examples --- src/fhir/fsh-generated/fsh-index.json | 14 +- src/fhir/fsh-generated/fsh-index.txt | 9 +- ...ystem-EndpointDirectoryConnectionType.json | 6 +- ...hcareService-HealthcareServiceExample.json | 35 +++- ...Definition-HealthcareServiceDirectory.json | 6 +- ...t-healthcareservice-characteristic-vs.json | 23 +++ src/fhir/input/fsh/alias.fsh | 1 + src/fhir/input/fsh/examples/Examples001.fsh | 7 +- .../fsh/examples/OrganizationExample001.fsh | 2 +- .../profiles/HealthcareServiceDirectory.fsh | 1 + .../HealthCareServiceCharacteristic.fsh | 6 + .../HealthcareServiceSpecialityVS.fsh | 2 +- .../fsh/valuesets/HealthcareServiceTypeVS.fsh | 190 +++++++++--------- 13 files changed, 193 insertions(+), 109 deletions(-) create mode 100644 src/fhir/fsh-generated/resources/ValueSet-healthcareservice-characteristic-vs.json create mode 100644 src/fhir/input/fsh/valuesets/HealthCareServiceCharacteristic.fsh diff --git a/src/fhir/fsh-generated/fsh-index.json b/src/fhir/fsh-generated/fsh-index.json index 15aea4eb..1d3cf0fa 100644 --- a/src/fhir/fsh-generated/fsh-index.json +++ b/src/fhir/fsh-generated/fsh-index.json @@ -5,7 +5,7 @@ "fshType": "CodeSystem", "fshFile": "codesystems/EndpointDirectoryConnectionType.fsh", "startLine": 1, - "endLine": 13 + "endLine": 14 }, { "outputFile": "CodeSystem-EndpointDirectoryPayloadType.json", @@ -101,7 +101,7 @@ "fshType": "Instance", "fshFile": "examples/Examples001.fsh", "startLine": 75, - "endLine": 100 + "endLine": 103 }, { "outputFile": "Location-LocationExample.json", @@ -165,7 +165,7 @@ "fshType": "Profile", "fshFile": "profiles/HealthcareServiceDirectory.fsh", "startLine": 1, - "endLine": 35 + "endLine": 36 }, { "outputFile": "StructureDefinition-LocationDirectory.json", @@ -278,5 +278,13 @@ "fshFile": "valuesets/PractitionerQualificationVS.fsh", "startLine": 1, "endLine": 457 + }, + { + "outputFile": "ValueSet-healthcareservice-characteristic-vs.json", + "fshName": "HealthCareServiceCharacteristicVS", + "fshType": "ValueSet", + "fshFile": "valuesets/HealthCareServiceCharacteristic.fsh", + "startLine": 1, + "endLine": 6 } ] diff --git a/src/fhir/fsh-generated/fsh-index.txt b/src/fhir/fsh-generated/fsh-index.txt index 07edc3cd..01114459 100644 --- a/src/fhir/fsh-generated/fsh-index.txt +++ b/src/fhir/fsh-generated/fsh-index.txt @@ -1,5 +1,5 @@ Output File Name Type FSH File Lines -CodeSystem-EndpointDirectoryConnectionType.json EndpointDirectoryConnectionType CodeSystem codesystems/EndpointDirectoryConnectionType.fsh 1 - 13 +CodeSystem-EndpointDirectoryConnectionType.json EndpointDirectoryConnectionType CodeSystem codesystems/EndpointDirectoryConnectionType.fsh 1 - 14 CodeSystem-EndpointDirectoryPayloadType.json EndpointDirectoryPayloadType CodeSystem codesystems/EndpointDirectoryPayloadType.fsh 1 - 12 CodeSystem-HolderCS.json HolderCS CodeSystem codesystems/HolderCS.fsh 1 - 125 CodeSystem-OrganizationProfessionOID.json OrganizationProfessionOID CodeSystem codesystems/OrganizationProfessionOID.fsh 1 - 66 @@ -11,7 +11,7 @@ CodeSystem-PractitionerProfessionOID.json PractitionerProfessionOID CodeSystem-Region.json Region CodeSystem codesystems/Region.fsh 1 - 27 Endpoint-EndpointExample.json EndpointExample Instance examples/Examples001.fsh 1 - 11 Endpoint-OrganizationExample001-Endpoint-TIM.json OrganizationExample001-Endpoint-TIM Instance examples/OrganizationExample001.fsh 1 - 12 -HealthcareService-HealthcareServiceExample.json HealthcareServiceExample Instance examples/Examples001.fsh 75 - 100 +HealthcareService-HealthcareServiceExample.json HealthcareServiceExample Instance examples/Examples001.fsh 75 - 103 Location-LocationExample.json LocationExample Instance examples/Examples001.fsh 53 - 73 Organization-OrganizationExample.json OrganizationExample Instance examples/Examples001.fsh 38 - 51 Organization-OrganizationExample001.json OrganizationExample001 Instance examples/OrganizationExample001.fsh 14 - 39 @@ -19,7 +19,7 @@ Practitioner-TIPractitionerExample001.json PractitionerExample001 Practitioner-TIPractitionerExampleDentist.json PractitionerExampleDentist Instance examples/Examples001.fsh 13 - 26 PractitionerRole-PractitionerRoleExample.json PractitionerRoleExample Instance examples/Examples001.fsh 28 - 35 StructureDefinition-EndpointDirectory.json EndpointDirectory Profile profiles/EndpointDirectory.fsh 1 - 23 -StructureDefinition-HealthcareServiceDirectory.json HealthcareServiceDirectory Profile profiles/HealthcareServiceDirectory.fsh 1 - 35 +StructureDefinition-HealthcareServiceDirectory.json HealthcareServiceDirectory Profile profiles/HealthcareServiceDirectory.fsh 1 - 36 StructureDefinition-LocationDirectory.json LocationDirectory Profile profiles/LocationDirectory.fsh 1 - 44 StructureDefinition-OrganizationDirectory.json OrganizationDirectory Profile profiles/OrganizationDirectory.fsh 1 - 45 StructureDefinition-PractitionerDirectory.json PractitionerDirectory Profile profiles/PractitionerDirectory.fsh 1 - 40 @@ -33,4 +33,5 @@ ValueSet-HealthcareSpecialityTypeVS.json HealthcareServiceSpeciality ValueSet-OrganizationProfessionOIDTypeVS.json OrganizationProfessionOIDTypeVS ValueSet valuesets/OrganizationProfessionOIDTypeVS.fsh 1 - 4 ValueSet-OrganizationProviderTypeVS.json OrganizationProviderTypeVS ValueSet valuesets/OrganizationProviderTypeVS.fsh 1 - 4 ValueSet-OriginVS.json OriginVS ValueSet valuesets/OriginVS.fsh 1 - 4 -ValueSet-PractitionerQualificationVS.json PractitionerQualificationVS ValueSet valuesets/PractitionerQualificationVS.fsh 1 - 457 \ No newline at end of file +ValueSet-PractitionerQualificationVS.json PractitionerQualificationVS ValueSet valuesets/PractitionerQualificationVS.fsh 1 - 457 +ValueSet-healthcareservice-characteristic-vs.json HealthCareServiceCharacteristicVS ValueSet valuesets/HealthCareServiceCharacteristic.fsh 1 - 6 \ No newline at end of file diff --git a/src/fhir/fsh-generated/resources/CodeSystem-EndpointDirectoryConnectionType.json b/src/fhir/fsh-generated/resources/CodeSystem-EndpointDirectoryConnectionType.json index e851af90..ed633836 100644 --- a/src/fhir/fsh-generated/resources/CodeSystem-EndpointDirectoryConnectionType.json +++ b/src/fhir/fsh-generated/resources/CodeSystem-EndpointDirectoryConnectionType.json @@ -35,9 +35,13 @@ { "code": "erp-supported", "display": "eRP Endpoint" + }, + { + "code": "ident-eingangsabruf", + "display": "Ident Eingangsdatenabruf" } ], "publisher": "gematik GmbH", "caseSensitive": false, - "count": 7 + "count": 8 } diff --git a/src/fhir/fsh-generated/resources/HealthcareService-HealthcareServiceExample.json b/src/fhir/fsh-generated/resources/HealthcareService-HealthcareServiceExample.json index 4449de32..9b7e9e6d 100644 --- a/src/fhir/fsh-generated/resources/HealthcareService-HealthcareServiceExample.json +++ b/src/fhir/fsh-generated/resources/HealthcareService-HealthcareServiceExample.json @@ -15,7 +15,18 @@ "providedBy": { "reference": "Organization/OrganizationExample" }, - "specialty": [ + "category": [ + { + "coding": [ + { + "code": "PRA", + "system": "http://ihe-d.de/CodeSystems/PatientBezogenenGesundheitsversorgung", + "display": "Arztpraxis" + } + ] + } + ], + "type": [ { "coding": [ { @@ -35,6 +46,17 @@ ] } ], + "specialty": [ + { + "coding": [ + { + "code": "92", + "system": "http://terminology.hl7.org/CodeSystem/service-type", + "display": "Paediatric Dentistry" + } + ] + } + ], "location": [ { "reference": "Location/LocationExample" @@ -98,5 +120,16 @@ { "reference": "Endpoint/EndpointExample" } + ], + "characteristic": [ + { + "coding": [ + { + "code": "DELEGATOR", + "system": "http://terminology.hl7.org/CodeSystem/v3-RoleCode", + "display": "eRX Token Receiver" + } + ] + } ] } diff --git a/src/fhir/fsh-generated/resources/StructureDefinition-HealthcareServiceDirectory.json b/src/fhir/fsh-generated/resources/StructureDefinition-HealthcareServiceDirectory.json index 0c5854f9..9538653a 100644 --- a/src/fhir/fsh-generated/resources/StructureDefinition-HealthcareServiceDirectory.json +++ b/src/fhir/fsh-generated/resources/StructureDefinition-HealthcareServiceDirectory.json @@ -136,7 +136,11 @@ { "id": "HealthcareService.characteristic", "path": "HealthcareService.characteristic", - "mustSupport": true + "mustSupport": true, + "binding": { + "strength": "required", + "valueSet": "https://gematik.de/fhir/directory/ValueSet/healthcareservice-characteristic-vs" + } }, { "id": "HealthcareService.communication", diff --git a/src/fhir/fsh-generated/resources/ValueSet-healthcareservice-characteristic-vs.json b/src/fhir/fsh-generated/resources/ValueSet-healthcareservice-characteristic-vs.json new file mode 100644 index 00000000..f7d54ade --- /dev/null +++ b/src/fhir/fsh-generated/resources/ValueSet-healthcareservice-characteristic-vs.json @@ -0,0 +1,23 @@ +{ + "resourceType": "ValueSet", + "status": "active", + "name": "HealthCareServiceCharacteristicVS", + "id": "healthcareservice-characteristic-vs", + "title": "HealthCareServiceCharacteristicVS", + "description": "HealthCareServiceCharacteristicVS", + "url": "https://gematik.de/fhir/directory/ValueSet/healthcareservice-characteristic-vs", + "publisher": "gematik GmbH", + "compose": { + "include": [ + { + "system": "http://terminology.hl7.org/CodeSystem/v3-RoleCode", + "concept": [ + { + "code": "DELEGATOR", + "display": "eRX Token Receiver" + } + ] + } + ] + } +} diff --git a/src/fhir/input/fsh/alias.fsh b/src/fhir/input/fsh/alias.fsh index a85aaf96..4a3aa595 100644 --- a/src/fhir/input/fsh/alias.fsh +++ b/src/fhir/input/fsh/alias.fsh @@ -12,6 +12,7 @@ Alias: $NichtÄrztlicheAutoren = urn:oid:1.3.6.1.4.1.19376.3.276.1.5.11 Alias: $ÄrztlicheFachrichtungen = urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4 Alias: $NichtÄrztlicheFachrichtungen = urn:oid:1.3.6.1.4.1.19376.3.276.1.5.5 +Alias: $ZahnärztlicheFachrichtungen = urn:oid:1.2.276.0.76.5.494 // Identifiers // TelematikID diff --git a/src/fhir/input/fsh/examples/Examples001.fsh b/src/fhir/input/fsh/examples/Examples001.fsh index 6bc47637..b2abb451 100644 --- a/src/fhir/input/fsh/examples/Examples001.fsh +++ b/src/fhir/input/fsh/examples/Examples001.fsh @@ -78,8 +78,10 @@ Usage: #example Description: "Example of an HealthcareService as to be found in gematik FHIR Directory" * meta.tag[Origin] = Origin#ldap * providedBy = Reference(OrganizationExample) -* specialty[+] = $ÄrztlicheFachrichtungen#MZKH "Zahnmedizin" -* specialty[+] = $ÄrztlicheFachrichtungen#ORAL "Oralchirurgie" +* category = $PatientBezogenenGesundheitsversorgung#PRA "Arztpraxis" +* type[+] = $ÄrztlicheFachrichtungen#MZKH "Zahnmedizin" +* type[+] = $ÄrztlicheFachrichtungen#ORAL "Oralchirurgie" +* specialty = ServiceType#92 "Paediatric Dentistry" * location[+] = Reference(LocationExample) * name = "Zahnmedizin" * telecom[+].system = $ContactPointSystem#phone "Phone" @@ -98,3 +100,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 = RoleCode#DELEGATOR "eRX Token Receiver" \ No newline at end of file diff --git a/src/fhir/input/fsh/examples/OrganizationExample001.fsh b/src/fhir/input/fsh/examples/OrganizationExample001.fsh index 8d5d2cc3..a05e655d 100644 --- a/src/fhir/input/fsh/examples/OrganizationExample001.fsh +++ b/src/fhir/input/fsh/examples/OrganizationExample001.fsh @@ -18,7 +18,7 @@ Description: "Example of an Organization as to be found in gematik FHIR Director * meta.tag[Origin] = Origin#ldap * active = true * 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" diff --git a/src/fhir/input/fsh/profiles/HealthcareServiceDirectory.fsh b/src/fhir/input/fsh/profiles/HealthcareServiceDirectory.fsh index 52410e01..52555033 100644 --- a/src/fhir/input/fsh/profiles/HealthcareServiceDirectory.fsh +++ b/src/fhir/input/fsh/profiles/HealthcareServiceDirectory.fsh @@ -33,3 +33,4 @@ organisations specific for german Healthcare and Telematics Infrastructure. * availabilityExceptions MS * endpoint MS * characteristic MS +* characteristic from HealthCareServiceCharacteristicVS \ No newline at end of file diff --git a/src/fhir/input/fsh/valuesets/HealthCareServiceCharacteristic.fsh b/src/fhir/input/fsh/valuesets/HealthCareServiceCharacteristic.fsh new file mode 100644 index 00000000..a2d6f36e --- /dev/null +++ b/src/fhir/input/fsh/valuesets/HealthCareServiceCharacteristic.fsh @@ -0,0 +1,6 @@ +ValueSet: HealthCareServiceCharacteristicVS +Id: healthcareservice-characteristic-vs +Title: "HealthCareServiceCharacteristicVS" +Description: "HealthCareServiceCharacteristicVS" +* insert Meta +* RoleCode#DELEGATOR "eRX Token Receiver" \ No newline at end of file diff --git a/src/fhir/input/fsh/valuesets/HealthcareServiceSpecialityVS.fsh b/src/fhir/input/fsh/valuesets/HealthcareServiceSpecialityVS.fsh index 02d153c0..9fd03ad6 100644 --- a/src/fhir/input/fsh/valuesets/HealthcareServiceSpecialityVS.fsh +++ b/src/fhir/input/fsh/valuesets/HealthcareServiceSpecialityVS.fsh @@ -4,4 +4,4 @@ Title: "ValueSet of HealthcareService specialities" Description: "HealthcareService specialities" * insert Meta * include codes from system PharmacyHealthcareSpecialityCS -* include codes from system http://terminology.hl7.org/CodeSystem/service-type \ No newline at end of file +* include codes from system ServiceType \ No newline at end of file diff --git a/src/fhir/input/fsh/valuesets/HealthcareServiceTypeVS.fsh b/src/fhir/input/fsh/valuesets/HealthcareServiceTypeVS.fsh index 15b11cbc..e656bfa7 100644 --- a/src/fhir/input/fsh/valuesets/HealthcareServiceTypeVS.fsh +++ b/src/fhir/input/fsh/valuesets/HealthcareServiceTypeVS.fsh @@ -2,101 +2,101 @@ ValueSet: HealthcareServiceTypeVS Description: "ValueSet for `HealthcareService.type`" * insert Meta // Ärztliche Fachrichtungen -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#ALLG "Allgemeinmedizin" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#ANAE "Anästhesiologie" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#ARBE "Arbeitsmedizin" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#AUGE "Augenheilkunde" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#CHIR "Chirurgie" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#ALCH "Allgemeinchirurgie" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#GFCH "Gefäßchirurgie" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#HZCH "Herzchirurgie" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#KDCH "Kinderchirurgie" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#ORTH "Orthopädie" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#PLCH "Plastische und Ästhetische Chirurgie" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#THCH "Thoraxchirurgie" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#UNFC "Unfallchirurgie" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#VICH "Viszeralchirurgie" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#FRAU "Frauenheilkunde und Geburtshilfe" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#GEND "Gynäkologische Endokrinologie und Reproduktionsmedizin" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#GONK "Gynäkologische Onkologie" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#PERI "Perinatalmedizin" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#GERI "Geriatrie" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#HNOH "Hals-Nasen-Ohrenheilkunde" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#HRST "Sprach-, Stimm- und kindliche Hörstörungen" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#HAUT "Haut- und Geschlechtskrankheiten" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#HIST "Histologie / Zytologie" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#HUMA "Humangenetik" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#HYGI "Hygiene und Umweltmedizin" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#INNE "Innere Medizin" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#ANGI "Angiologie" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#ENDO "Endokrinologie und Diabetologie" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#GAST "Gastroenterologie" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#HAEM "Hämatologie und internistische Onkologie" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#KARD "Kardiologie" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#NEPH "Nephrologie" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#PNEU "Pneumologie" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#RHEU "Rheumatologie" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#INTM "Intensivmedizin" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#INTZ "Interdisziplinäre Zusammenarbeit" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#INTO "Interdisziplinäre Onkologie" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#INTS "Interdisziplinäre Schmerzmedizin" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#TRPL "Transplantationsmedizin" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#SELT "seltene Erkrankungen" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#KIJU "Kinder- und Jugendmedizin" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#KONK "Kinder-Hämatologie und -Onkologie" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#KKAR "Kinder-Kardiologie" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#NNAT "Neonatologie" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#NPAE "Neuropädiatrie" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#KPSY "Kinder- und Jugendpsychiatrie und -psychotherapie" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#LABO "Laboratoriumsmedizin" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#MIKR "Mikrobiologie, Virologie und Infektionsepidemiologie" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#MKGC "Mund-Kiefer-Gesichtschirurgie" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#NATU "Naturheilverfahren und alternative Heilmethoden" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#NOTF "Notfallmedizin" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#NRCH "Neurochirurgie" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#NEUR "Neurologie" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#NUKL "Nuklearmedizin" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#GESU "Öffentliches Gesundheitswesen" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#PALL "Palliativmedizin" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#PATH "Pathologie" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#NPAT "Neuropathologie" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#PHAR "Pharmakologie" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#TOXI "Toxikologie" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#REHA "Physikalische und Rehabilitative Medizin" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#PSYC "Psychiatrie und Psychotherapie" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#FPSY "Forensische Psychiatrie" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#PSYM "Psychosomatische Medizin und Psychotherapie" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#RADI "Radiologie" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#KRAD "Kinderradiologie" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#NRAD "Neuroradiologie" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#RECH "Rechtsmedizin" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#SCHL "Schlafmedizin" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#SPOR "Sport- und Bewegungsmedizin" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#STRA "Strahlentherapie" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#TRAN "Transfusionsmedizin" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#TROP "Tropen-/Reisemedizin" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#UROL "Urologie" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#MZKH "Zahnmedizin" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#ORAL "Oralchirurgie" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#KIEF "Kieferorthopädie" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.4#PARO "Parodontologie" +* $ÄrztlicheFachrichtungen#ALLG "Allgemeinmedizin" +* $ÄrztlicheFachrichtungen#ANAE "Anästhesiologie" +* $ÄrztlicheFachrichtungen#ARBE "Arbeitsmedizin" +* $ÄrztlicheFachrichtungen#AUGE "Augenheilkunde" +* $ÄrztlicheFachrichtungen#CHIR "Chirurgie" +* $ÄrztlicheFachrichtungen#ALCH "Allgemeinchirurgie" +* $ÄrztlicheFachrichtungen#GFCH "Gefäßchirurgie" +* $ÄrztlicheFachrichtungen#HZCH "Herzchirurgie" +* $ÄrztlicheFachrichtungen#KDCH "Kinderchirurgie" +* $ÄrztlicheFachrichtungen#ORTH "Orthopädie" +* $ÄrztlicheFachrichtungen#PLCH "Plastische und Ästhetische Chirurgie" +* $ÄrztlicheFachrichtungen#THCH "Thoraxchirurgie" +* $ÄrztlicheFachrichtungen#UNFC "Unfallchirurgie" +* $ÄrztlicheFachrichtungen#VICH "Viszeralchirurgie" +* $ÄrztlicheFachrichtungen#FRAU "Frauenheilkunde und Geburtshilfe" +* $ÄrztlicheFachrichtungen#GEND "Gynäkologische Endokrinologie und Reproduktionsmedizin" +* $ÄrztlicheFachrichtungen#GONK "Gynäkologische Onkologie" +* $ÄrztlicheFachrichtungen#PERI "Perinatalmedizin" +* $ÄrztlicheFachrichtungen#GERI "Geriatrie" +* $ÄrztlicheFachrichtungen#HNOH "Hals-Nasen-Ohrenheilkunde" +* $ÄrztlicheFachrichtungen#HRST "Sprach-, Stimm- und kindliche Hörstörungen" +* $ÄrztlicheFachrichtungen#HAUT "Haut- und Geschlechtskrankheiten" +* $ÄrztlicheFachrichtungen#HIST "Histologie / Zytologie" +* $ÄrztlicheFachrichtungen#HUMA "Humangenetik" +* $ÄrztlicheFachrichtungen#HYGI "Hygiene und Umweltmedizin" +* $ÄrztlicheFachrichtungen#INNE "Innere Medizin" +* $ÄrztlicheFachrichtungen#ANGI "Angiologie" +* $ÄrztlicheFachrichtungen#ENDO "Endokrinologie und Diabetologie" +* $ÄrztlicheFachrichtungen#GAST "Gastroenterologie" +* $ÄrztlicheFachrichtungen#HAEM "Hämatologie und internistische Onkologie" +* $ÄrztlicheFachrichtungen#KARD "Kardiologie" +* $ÄrztlicheFachrichtungen#NEPH "Nephrologie" +* $ÄrztlicheFachrichtungen#PNEU "Pneumologie" +* $ÄrztlicheFachrichtungen#RHEU "Rheumatologie" +* $ÄrztlicheFachrichtungen#INTM "Intensivmedizin" +* $ÄrztlicheFachrichtungen#INTZ "Interdisziplinäre Zusammenarbeit" +* $ÄrztlicheFachrichtungen#INTO "Interdisziplinäre Onkologie" +* $ÄrztlicheFachrichtungen#INTS "Interdisziplinäre Schmerzmedizin" +* $ÄrztlicheFachrichtungen#TRPL "Transplantationsmedizin" +* $ÄrztlicheFachrichtungen#SELT "seltene Erkrankungen" +* $ÄrztlicheFachrichtungen#KIJU "Kinder- und Jugendmedizin" +* $ÄrztlicheFachrichtungen#KONK "Kinder-Hämatologie und -Onkologie" +* $ÄrztlicheFachrichtungen#KKAR "Kinder-Kardiologie" +* $ÄrztlicheFachrichtungen#NNAT "Neonatologie" +* $ÄrztlicheFachrichtungen#NPAE "Neuropädiatrie" +* $ÄrztlicheFachrichtungen#KPSY "Kinder- und Jugendpsychiatrie und -psychotherapie" +* $ÄrztlicheFachrichtungen#LABO "Laboratoriumsmedizin" +* $ÄrztlicheFachrichtungen#MIKR "Mikrobiologie, Virologie und Infektionsepidemiologie" +* $ÄrztlicheFachrichtungen#MKGC "Mund-Kiefer-Gesichtschirurgie" +* $ÄrztlicheFachrichtungen#NATU "Naturheilverfahren und alternative Heilmethoden" +* $ÄrztlicheFachrichtungen#NOTF "Notfallmedizin" +* $ÄrztlicheFachrichtungen#NRCH "Neurochirurgie" +* $ÄrztlicheFachrichtungen#NEUR "Neurologie" +* $ÄrztlicheFachrichtungen#NUKL "Nuklearmedizin" +* $ÄrztlicheFachrichtungen#GESU "Öffentliches Gesundheitswesen" +* $ÄrztlicheFachrichtungen#PALL "Palliativmedizin" +* $ÄrztlicheFachrichtungen#PATH "Pathologie" +* $ÄrztlicheFachrichtungen#NPAT "Neuropathologie" +* $ÄrztlicheFachrichtungen#PHAR "Pharmakologie" +* $ÄrztlicheFachrichtungen#TOXI "Toxikologie" +* $ÄrztlicheFachrichtungen#REHA "Physikalische und Rehabilitative Medizin" +* $ÄrztlicheFachrichtungen#PSYC "Psychiatrie und Psychotherapie" +* $ÄrztlicheFachrichtungen#FPSY "Forensische Psychiatrie" +* $ÄrztlicheFachrichtungen#PSYM "Psychosomatische Medizin und Psychotherapie" +* $ÄrztlicheFachrichtungen#RADI "Radiologie" +* $ÄrztlicheFachrichtungen#KRAD "Kinderradiologie" +* $ÄrztlicheFachrichtungen#NRAD "Neuroradiologie" +* $ÄrztlicheFachrichtungen#RECH "Rechtsmedizin" +* $ÄrztlicheFachrichtungen#SCHL "Schlafmedizin" +* $ÄrztlicheFachrichtungen#SPOR "Sport- und Bewegungsmedizin" +* $ÄrztlicheFachrichtungen#STRA "Strahlentherapie" +* $ÄrztlicheFachrichtungen#TRAN "Transfusionsmedizin" +* $ÄrztlicheFachrichtungen#TROP "Tropen-/Reisemedizin" +* $ÄrztlicheFachrichtungen#UROL "Urologie" +* $ÄrztlicheFachrichtungen#MZKH "Zahnmedizin" +* $ÄrztlicheFachrichtungen#ORAL "Oralchirurgie" +* $ÄrztlicheFachrichtungen#KIEF "Kieferorthopädie" +* $ÄrztlicheFachrichtungen#PARO "Parodontologie" // Zahnärztliche Fachrichtungen -* urn:oid:1.2.276.0.76.5.494#MZAH "Allgemeine Zahnheilkunde" -* urn:oid:1.2.276.0.76.5.494#ZGES "Öffentliches Gesundheitswesen" +* $ZahnärztlicheFachrichtungen#MZAH "Allgemeine Zahnheilkunde" +* $ZahnärztlicheFachrichtungen#ZGES "Öffentliches Gesundheitswesen" // Nicht-ärztliche Fachrichtungen -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.5#ERG "Ergotherapie" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.5#ERN "Ernährung und Diätetik" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.5#FOR "Forschung" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.5#PFL "Pflege und Betreuung" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.5#ALT "Altenpflege" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.5#KIN "Kinderpflege" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.5#PAT "Patient außerhalb der Betreuung" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.5#PHZ "Pharmazeutik" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.5#POD "Podologie" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.5#PRV "Prävention" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.5#SOZ "Sozialwesen" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.5#SPR "Sprachtherapie" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.5#VKO "Versorgungskoordination" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.5#VER "Verwaltung" -* urn:oid:1.3.6.1.4.1.19376.3.276.1.5.5#PST "Psychotherapie" +* $NichtÄrztlicheFachrichtungen#ERG "Ergotherapie" +* $NichtÄrztlicheFachrichtungen#ERN "Ernährung und Diätetik" +* $NichtÄrztlicheFachrichtungen#FOR "Forschung" +* $NichtÄrztlicheFachrichtungen#PFL "Pflege und Betreuung" +* $NichtÄrztlicheFachrichtungen#ALT "Altenpflege" +* $NichtÄrztlicheFachrichtungen#KIN "Kinderpflege" +* $NichtÄrztlicheFachrichtungen#PAT "Patient außerhalb der Betreuung" +* $NichtÄrztlicheFachrichtungen#PHZ "Pharmazeutik" +* $NichtÄrztlicheFachrichtungen#POD "Podologie" +* $NichtÄrztlicheFachrichtungen#PRV "Prävention" +* $NichtÄrztlicheFachrichtungen#SOZ "Sozialwesen" +* $NichtÄrztlicheFachrichtungen#SPR "Sprachtherapie" +* $NichtÄrztlicheFachrichtungen#VKO "Versorgungskoordination" +* $NichtÄrztlicheFachrichtungen#VER "Verwaltung" +* $NichtÄrztlicheFachrichtungen#PST "Psychotherapie" * include codes from system PharmacyTypeCS \ No newline at end of file From 4803c982442bb807d7982c1cf4673a2d440e8191 Mon Sep 17 00:00:00 2001 From: patrick-werner Date: Wed, 7 Feb 2024 13:15:57 +0100 Subject: [PATCH 03/16] fixed errors with IG publisher validation --- src/fhir/fsh-generated/fsh-index.json | 22 +++--- src/fhir/fsh-generated/fsh-index.txt | 74 +++++++++---------- .../resources/Location-LocationExample.json | 7 +- .../Organization-OrganizationExample001.json | 2 +- ...lityTypeCodePatientRelatedHealthcare.json} | 2 +- src/fhir/input/fsh/examples/Examples001.fsh | 5 +- .../fsh/examples/OrganizationExample001.fsh | 2 +- .../valuesets/HealthCareServiceCategory.fsh | 2 +- 8 files changed, 60 insertions(+), 56 deletions(-) rename src/fhir/fsh-generated/resources/{ValueSet-1.2.276.0.76.11.58--20211114161028.json => ValueSet-IHEXDShealthcareFacilityTypeCodePatientRelatedHealthcare.json} (99%) diff --git a/src/fhir/fsh-generated/fsh-index.json b/src/fhir/fsh-generated/fsh-index.json index 1d3cf0fa..6b0e8e82 100644 --- a/src/fhir/fsh-generated/fsh-index.json +++ b/src/fhir/fsh-generated/fsh-index.json @@ -100,8 +100,8 @@ "fshName": "HealthcareServiceExample", "fshType": "Instance", "fshFile": "examples/Examples001.fsh", - "startLine": 75, - "endLine": 103 + "startLine": 76, + "endLine": 104 }, { "outputFile": "Location-LocationExample.json", @@ -109,7 +109,7 @@ "fshType": "Instance", "fshFile": "examples/Examples001.fsh", "startLine": 53, - "endLine": 73 + "endLine": 74 }, { "outputFile": "Organization-OrganizationExample.json", @@ -199,14 +199,6 @@ "startLine": 1, "endLine": 15 }, - { - "outputFile": "ValueSet-1.2.276.0.76.11.58--20211114161028.json", - "fshName": "IHEXDShealthcareFacilityTypeCodePatientRelatedHealthcare", - "fshType": "ValueSet", - "fshFile": "valuesets/HealthCareServiceCategory.fsh", - "startLine": 3, - "endLine": 62 - }, { "outputFile": "ValueSet-AddressStateVS.json", "fshName": "AddressStateVS", @@ -247,6 +239,14 @@ "startLine": 1, "endLine": 7 }, + { + "outputFile": "ValueSet-IHEXDShealthcareFacilityTypeCodePatientRelatedHealthcare.json", + "fshName": "IHEXDShealthcareFacilityTypeCodePatientRelatedHealthcare", + "fshType": "ValueSet", + "fshFile": "valuesets/HealthCareServiceCategory.fsh", + "startLine": 3, + "endLine": 62 + }, { "outputFile": "ValueSet-OrganizationProfessionOIDTypeVS.json", "fshName": "OrganizationProfessionOIDTypeVS", diff --git a/src/fhir/fsh-generated/fsh-index.txt b/src/fhir/fsh-generated/fsh-index.txt index 01114459..cbbf2de7 100644 --- a/src/fhir/fsh-generated/fsh-index.txt +++ b/src/fhir/fsh-generated/fsh-index.txt @@ -1,37 +1,37 @@ -Output File Name Type FSH File Lines -CodeSystem-EndpointDirectoryConnectionType.json EndpointDirectoryConnectionType CodeSystem codesystems/EndpointDirectoryConnectionType.fsh 1 - 14 -CodeSystem-EndpointDirectoryPayloadType.json EndpointDirectoryPayloadType CodeSystem codesystems/EndpointDirectoryPayloadType.fsh 1 - 12 -CodeSystem-HolderCS.json HolderCS CodeSystem codesystems/HolderCS.fsh 1 - 125 -CodeSystem-OrganizationProfessionOID.json OrganizationProfessionOID CodeSystem codesystems/OrganizationProfessionOID.fsh 1 - 66 -CodeSystem-OrganizationProviderType.json OrganizationProviderType CodeSystem codesystems/OrganizationProviderType.fsh 1 - 11 -CodeSystem-Origin.json Origin CodeSystem codesystems/Origin.fsh 1 - 7 -CodeSystem-PharmacyHealthcareSpecialityCS.json PharmacyHealthcareSpecialityCS CodeSystem codesystems/PharmacyHealthcareServiceSpecialityCS.fsh 1 - 12 -CodeSystem-PharmacyTypeCS.json PharmacyTypeCS CodeSystem codesystems/PharmacyTypeCS.fsh 1 - 11 -CodeSystem-PractitionerProfessionOID.json PractitionerProfessionOID CodeSystem codesystems/PractitionerProfessionOID.fsh 1 - 43 -CodeSystem-Region.json Region CodeSystem codesystems/Region.fsh 1 - 27 -Endpoint-EndpointExample.json EndpointExample Instance examples/Examples001.fsh 1 - 11 -Endpoint-OrganizationExample001-Endpoint-TIM.json OrganizationExample001-Endpoint-TIM Instance examples/OrganizationExample001.fsh 1 - 12 -HealthcareService-HealthcareServiceExample.json HealthcareServiceExample Instance examples/Examples001.fsh 75 - 103 -Location-LocationExample.json LocationExample Instance examples/Examples001.fsh 53 - 73 -Organization-OrganizationExample.json OrganizationExample Instance examples/Examples001.fsh 38 - 51 -Organization-OrganizationExample001.json OrganizationExample001 Instance examples/OrganizationExample001.fsh 14 - 39 -Practitioner-TIPractitionerExample001.json PractitionerExample001 Instance examples/PractitionerExample001.fsh 1 - 18 -Practitioner-TIPractitionerExampleDentist.json PractitionerExampleDentist Instance examples/Examples001.fsh 13 - 26 -PractitionerRole-PractitionerRoleExample.json PractitionerRoleExample Instance examples/Examples001.fsh 28 - 35 -StructureDefinition-EndpointDirectory.json EndpointDirectory Profile profiles/EndpointDirectory.fsh 1 - 23 -StructureDefinition-HealthcareServiceDirectory.json HealthcareServiceDirectory Profile profiles/HealthcareServiceDirectory.fsh 1 - 36 -StructureDefinition-LocationDirectory.json LocationDirectory Profile profiles/LocationDirectory.fsh 1 - 44 -StructureDefinition-OrganizationDirectory.json OrganizationDirectory Profile profiles/OrganizationDirectory.fsh 1 - 45 -StructureDefinition-PractitionerDirectory.json PractitionerDirectory Profile profiles/PractitionerDirectory.fsh 1 - 40 -StructureDefinition-PractitionerRoleDirectory.json PractitionerRoleDirectory Profile profiles/PractitionerRoleDirectory.fsh 1 - 15 -ValueSet-1.2.276.0.76.11.58--20211114161028.json IHEXDShealthcareFacilityTypeCodePatientRelatedHealthcare ValueSet valuesets/HealthCareServiceCategory.fsh 3 - 62 -ValueSet-AddressStateVS.json AddressStateVS ValueSet valuesets/AddressStateVS.fsh 1 - 4 -ValueSet-EndpointConnectionTypeVS.json EndpointConnectionTypeVS ValueSet valuesets/EndpointConnectionTypeVS.fsh 1 - 5 -ValueSet-EndpointPayloadTypeVS.json EndpointPayloadTypeVS ValueSet valuesets/EndpointPayloadTypeVS.fsh 1 - 4 -ValueSet-HealthcareServiceTypeVS.json HealthcareServiceTypeVS ValueSet valuesets/HealthcareServiceTypeVS.fsh 1 - 102 -ValueSet-HealthcareSpecialityTypeVS.json HealthcareServiceSpecialityVS ValueSet valuesets/HealthcareServiceSpecialityVS.fsh 1 - 7 -ValueSet-OrganizationProfessionOIDTypeVS.json OrganizationProfessionOIDTypeVS ValueSet valuesets/OrganizationProfessionOIDTypeVS.fsh 1 - 4 -ValueSet-OrganizationProviderTypeVS.json OrganizationProviderTypeVS ValueSet valuesets/OrganizationProviderTypeVS.fsh 1 - 4 -ValueSet-OriginVS.json OriginVS ValueSet valuesets/OriginVS.fsh 1 - 4 -ValueSet-PractitionerQualificationVS.json PractitionerQualificationVS ValueSet valuesets/PractitionerQualificationVS.fsh 1 - 457 -ValueSet-healthcareservice-characteristic-vs.json HealthCareServiceCharacteristicVS ValueSet valuesets/HealthCareServiceCharacteristic.fsh 1 - 6 \ No newline at end of file +Output File Name Type FSH File Lines +CodeSystem-EndpointDirectoryConnectionType.json EndpointDirectoryConnectionType CodeSystem codesystems/EndpointDirectoryConnectionType.fsh 1 - 14 +CodeSystem-EndpointDirectoryPayloadType.json EndpointDirectoryPayloadType CodeSystem codesystems/EndpointDirectoryPayloadType.fsh 1 - 12 +CodeSystem-HolderCS.json HolderCS CodeSystem codesystems/HolderCS.fsh 1 - 125 +CodeSystem-OrganizationProfessionOID.json OrganizationProfessionOID CodeSystem codesystems/OrganizationProfessionOID.fsh 1 - 66 +CodeSystem-OrganizationProviderType.json OrganizationProviderType CodeSystem codesystems/OrganizationProviderType.fsh 1 - 11 +CodeSystem-Origin.json Origin CodeSystem codesystems/Origin.fsh 1 - 7 +CodeSystem-PharmacyHealthcareSpecialityCS.json PharmacyHealthcareSpecialityCS CodeSystem codesystems/PharmacyHealthcareServiceSpecialityCS.fsh 1 - 12 +CodeSystem-PharmacyTypeCS.json PharmacyTypeCS CodeSystem codesystems/PharmacyTypeCS.fsh 1 - 11 +CodeSystem-PractitionerProfessionOID.json PractitionerProfessionOID CodeSystem codesystems/PractitionerProfessionOID.fsh 1 - 43 +CodeSystem-Region.json Region CodeSystem codesystems/Region.fsh 1 - 27 +Endpoint-EndpointExample.json EndpointExample Instance examples/Examples001.fsh 1 - 11 +Endpoint-OrganizationExample001-Endpoint-TIM.json OrganizationExample001-Endpoint-TIM Instance examples/OrganizationExample001.fsh 1 - 12 +HealthcareService-HealthcareServiceExample.json HealthcareServiceExample Instance examples/Examples001.fsh 76 - 104 +Location-LocationExample.json LocationExample Instance examples/Examples001.fsh 53 - 74 +Organization-OrganizationExample.json OrganizationExample Instance examples/Examples001.fsh 38 - 51 +Organization-OrganizationExample001.json OrganizationExample001 Instance examples/OrganizationExample001.fsh 14 - 39 +Practitioner-TIPractitionerExample001.json PractitionerExample001 Instance examples/PractitionerExample001.fsh 1 - 18 +Practitioner-TIPractitionerExampleDentist.json PractitionerExampleDentist Instance examples/Examples001.fsh 13 - 26 +PractitionerRole-PractitionerRoleExample.json PractitionerRoleExample Instance examples/Examples001.fsh 28 - 35 +StructureDefinition-EndpointDirectory.json EndpointDirectory Profile profiles/EndpointDirectory.fsh 1 - 23 +StructureDefinition-HealthcareServiceDirectory.json HealthcareServiceDirectory Profile profiles/HealthcareServiceDirectory.fsh 1 - 36 +StructureDefinition-LocationDirectory.json LocationDirectory Profile profiles/LocationDirectory.fsh 1 - 44 +StructureDefinition-OrganizationDirectory.json OrganizationDirectory Profile profiles/OrganizationDirectory.fsh 1 - 45 +StructureDefinition-PractitionerDirectory.json PractitionerDirectory Profile profiles/PractitionerDirectory.fsh 1 - 40 +StructureDefinition-PractitionerRoleDirectory.json PractitionerRoleDirectory Profile profiles/PractitionerRoleDirectory.fsh 1 - 15 +ValueSet-AddressStateVS.json AddressStateVS ValueSet valuesets/AddressStateVS.fsh 1 - 4 +ValueSet-EndpointConnectionTypeVS.json EndpointConnectionTypeVS ValueSet valuesets/EndpointConnectionTypeVS.fsh 1 - 5 +ValueSet-EndpointPayloadTypeVS.json EndpointPayloadTypeVS ValueSet valuesets/EndpointPayloadTypeVS.fsh 1 - 4 +ValueSet-HealthcareServiceTypeVS.json HealthcareServiceTypeVS ValueSet valuesets/HealthcareServiceTypeVS.fsh 1 - 102 +ValueSet-HealthcareSpecialityTypeVS.json HealthcareServiceSpecialityVS ValueSet valuesets/HealthcareServiceSpecialityVS.fsh 1 - 7 +ValueSet-IHEXDShealthcareFacilityTypeCodePatientRelatedHealthcare.json IHEXDShealthcareFacilityTypeCodePatientRelatedHealthcare ValueSet valuesets/HealthCareServiceCategory.fsh 3 - 62 +ValueSet-OrganizationProfessionOIDTypeVS.json OrganizationProfessionOIDTypeVS ValueSet valuesets/OrganizationProfessionOIDTypeVS.fsh 1 - 4 +ValueSet-OrganizationProviderTypeVS.json OrganizationProviderTypeVS ValueSet valuesets/OrganizationProviderTypeVS.fsh 1 - 4 +ValueSet-OriginVS.json OriginVS ValueSet valuesets/OriginVS.fsh 1 - 4 +ValueSet-PractitionerQualificationVS.json PractitionerQualificationVS ValueSet valuesets/PractitionerQualificationVS.fsh 1 - 457 +ValueSet-healthcareservice-characteristic-vs.json HealthCareServiceCharacteristicVS ValueSet valuesets/HealthCareServiceCharacteristic.fsh 1 - 6 \ No newline at end of file diff --git a/src/fhir/fsh-generated/resources/Location-LocationExample.json b/src/fhir/fsh-generated/resources/Location-LocationExample.json index c2429c18..7ced7bf6 100644 --- a/src/fhir/fsh-generated/resources/Location-LocationExample.json +++ b/src/fhir/fsh-generated/resources/Location-LocationExample.json @@ -20,7 +20,7 @@ "Hauptstraße 1" ], "city": "Berlin", - "state": "Berlin", + "state": "DE-BE", "postalCode": "10117", "country": "DE" }, @@ -37,5 +37,8 @@ "closingTime": "18:00:00" } ], - "availabilityExceptions": "An Feiertagen geschlossen" + "availabilityExceptions": "An Feiertagen geschlossen", + "managingOrganization": { + "reference": "Organization/OrganizationExample001" + } } diff --git a/src/fhir/fsh-generated/resources/Organization-OrganizationExample001.json b/src/fhir/fsh-generated/resources/Organization-OrganizationExample001.json index 546fc318..f3fd2ac5 100644 --- a/src/fhir/fsh-generated/resources/Organization-OrganizationExample001.json +++ b/src/fhir/fsh-generated/resources/Organization-OrganizationExample001.json @@ -31,7 +31,7 @@ "Friedrichstr. 136" ], "city": "Berlin", - "state": "Berlin", + "state": "DE-BE", "postalCode": "10117", "country": "DE" } diff --git a/src/fhir/fsh-generated/resources/ValueSet-1.2.276.0.76.11.58--20211114161028.json b/src/fhir/fsh-generated/resources/ValueSet-IHEXDShealthcareFacilityTypeCodePatientRelatedHealthcare.json similarity index 99% rename from src/fhir/fsh-generated/resources/ValueSet-1.2.276.0.76.11.58--20211114161028.json rename to src/fhir/fsh-generated/resources/ValueSet-IHEXDShealthcareFacilityTypeCodePatientRelatedHealthcare.json index a35ce7ad..226a2639 100644 --- a/src/fhir/fsh-generated/resources/ValueSet-1.2.276.0.76.11.58--20211114161028.json +++ b/src/fhir/fsh-generated/resources/ValueSet-IHEXDShealthcareFacilityTypeCodePatientRelatedHealthcare.json @@ -2,7 +2,7 @@ "resourceType": "ValueSet", "status": "active", "name": "IHEXDShealthcareFacilityTypeCodePatientRelatedHealthcare", - "id": "1.2.276.0.76.11.58--20211114161028", + "id": "IHEXDShealthcareFacilityTypeCodePatientRelatedHealthcare", "title": "IHE XDS healthcareFacilityTypeCode Patient Related Healthcare", "description": "**healthcareFacilityTypeCode (XDSDocumentEntry)**\n This code for an XDS Document represents the type of organizational setting of the clinical encounter during which the documented act occurred.", "url": "http://ihe-d.de/ValueSets/IHEXDShealthcareFacilityTypeCodePatientRelatedHealthcare", diff --git a/src/fhir/input/fsh/examples/Examples001.fsh b/src/fhir/input/fsh/examples/Examples001.fsh index b2abb451..395b8dd4 100644 --- a/src/fhir/input/fsh/examples/Examples001.fsh +++ b/src/fhir/input/fsh/examples/Examples001.fsh @@ -60,7 +60,7 @@ Description: "Example of a Location as to be found in gematik FHIR Directory" * address.text = "Hauptstraße 1, 10117 Berlin" * address.line = "Hauptstraße 1" * address.city = "Berlin" -* address.state = "Berlin" +* address.state = "DE-BE" * address.postalCode = "10117" * address.country = "DE" * hoursOfOperation.daysOfWeek[+] = $DaysOfWeek#mon "Monday" @@ -71,6 +71,7 @@ Description: "Example of a Location as to be found in gematik FHIR Directory" * hoursOfOperation.openingTime = "08:00:00" * hoursOfOperation.closingTime = "18:00:00" * availabilityExceptions = "An Feiertagen geschlossen" +* managingOrganization = Reference(OrganizationExample001) Instance: HealthcareServiceExample InstanceOf: HealthcareServiceDirectory @@ -100,4 +101,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 = RoleCode#DELEGATOR "eRX Token Receiver" \ No newline at end of file +* characteristic = RoleCode#DELEGATOR "eRX Token Receiver" diff --git a/src/fhir/input/fsh/examples/OrganizationExample001.fsh b/src/fhir/input/fsh/examples/OrganizationExample001.fsh index a05e655d..9a559152 100644 --- a/src/fhir/input/fsh/examples/OrganizationExample001.fsh +++ b/src/fhir/input/fsh/examples/OrganizationExample001.fsh @@ -28,7 +28,7 @@ Friedrichstr. 136, * address.line[+] = "Friedrichstr. 136" * address.city = "Berlin" * address.extension[Stadtteil].valueString = "Mitte" -* address.state = Region#Berlin +* address.state = "DE-BE" * address.postalCode = "10117" * address.country = "DE" // Gibt es bedarf an TI/DE-spezifischen Kontakt-Zwecken? diff --git a/src/fhir/input/fsh/valuesets/HealthCareServiceCategory.fsh b/src/fhir/input/fsh/valuesets/HealthCareServiceCategory.fsh index 9c2b9021..8e3fc2aa 100644 --- a/src/fhir/input/fsh/valuesets/HealthCareServiceCategory.fsh +++ b/src/fhir/input/fsh/valuesets/HealthCareServiceCategory.fsh @@ -1,7 +1,7 @@ Alias: $PatientBezogenenGesundheitsversorgung = http://ihe-d.de/CodeSystems/PatientBezogenenGesundheitsversorgung ValueSet: IHEXDShealthcareFacilityTypeCodePatientRelatedHealthcare -Id: 1.2.276.0.76.11.58--20211114161028 +Id: IHEXDShealthcareFacilityTypeCodePatientRelatedHealthcare Title: "IHE XDS healthcareFacilityTypeCode Patient Related Healthcare" Description: """**healthcareFacilityTypeCode (XDSDocumentEntry)** This code for an XDS Document represents the type of organizational setting of the clinical encounter during which the documented act occurred.""" From 53497538e4116407853141af8ea3af9a1cb90b1f Mon Sep 17 00:00:00 2001 From: patrick-werner Date: Tue, 27 Feb 2024 12:52:55 +0100 Subject: [PATCH 04/16] applied PR review comments --- src/fhir/fsh-generated/fsh-index.json | 8 +- src/fhir/fsh-generated/fsh-index.txt | 8 +- .../Organization-OrganizationExample.json | 10 ++- .../Organization-OrganizationExample001.json | 22 +++++- ...StructureDefinition-LocationDirectory.json | 30 -------- ...ctureDefinition-OrganizationDirectory.json | 76 +++++++++++++------ .../fsh/examples/OrganizationExample001.fsh | 1 + .../input/fsh/profiles/LocationDirectory.fsh | 6 -- .../fsh/profiles/OrganizationDirectory.fsh | 21 +++-- 9 files changed, 105 insertions(+), 77 deletions(-) diff --git a/src/fhir/fsh-generated/fsh-index.json b/src/fhir/fsh-generated/fsh-index.json index 6b0e8e82..7d7519da 100644 --- a/src/fhir/fsh-generated/fsh-index.json +++ b/src/fhir/fsh-generated/fsh-index.json @@ -125,7 +125,7 @@ "fshType": "Instance", "fshFile": "examples/OrganizationExample001.fsh", "startLine": 14, - "endLine": 39 + "endLine": 40 }, { "outputFile": "Practitioner-TIPractitionerExample001.json", @@ -165,7 +165,7 @@ "fshType": "Profile", "fshFile": "profiles/HealthcareServiceDirectory.fsh", "startLine": 1, - "endLine": 36 + "endLine": 37 }, { "outputFile": "StructureDefinition-LocationDirectory.json", @@ -173,7 +173,7 @@ "fshType": "Profile", "fshFile": "profiles/LocationDirectory.fsh", "startLine": 1, - "endLine": 44 + "endLine": 38 }, { "outputFile": "StructureDefinition-OrganizationDirectory.json", @@ -181,7 +181,7 @@ "fshType": "Profile", "fshFile": "profiles/OrganizationDirectory.fsh", "startLine": 1, - "endLine": 45 + "endLine": 53 }, { "outputFile": "StructureDefinition-PractitionerDirectory.json", diff --git a/src/fhir/fsh-generated/fsh-index.txt b/src/fhir/fsh-generated/fsh-index.txt index cbbf2de7..78896c46 100644 --- a/src/fhir/fsh-generated/fsh-index.txt +++ b/src/fhir/fsh-generated/fsh-index.txt @@ -14,14 +14,14 @@ Endpoint-OrganizationExample001-Endpoint-TIM.json Organiza HealthcareService-HealthcareServiceExample.json HealthcareServiceExample Instance examples/Examples001.fsh 76 - 104 Location-LocationExample.json LocationExample Instance examples/Examples001.fsh 53 - 74 Organization-OrganizationExample.json OrganizationExample Instance examples/Examples001.fsh 38 - 51 -Organization-OrganizationExample001.json OrganizationExample001 Instance examples/OrganizationExample001.fsh 14 - 39 +Organization-OrganizationExample001.json OrganizationExample001 Instance examples/OrganizationExample001.fsh 14 - 40 Practitioner-TIPractitionerExample001.json PractitionerExample001 Instance examples/PractitionerExample001.fsh 1 - 18 Practitioner-TIPractitionerExampleDentist.json PractitionerExampleDentist Instance examples/Examples001.fsh 13 - 26 PractitionerRole-PractitionerRoleExample.json PractitionerRoleExample Instance examples/Examples001.fsh 28 - 35 StructureDefinition-EndpointDirectory.json EndpointDirectory Profile profiles/EndpointDirectory.fsh 1 - 23 -StructureDefinition-HealthcareServiceDirectory.json HealthcareServiceDirectory Profile profiles/HealthcareServiceDirectory.fsh 1 - 36 -StructureDefinition-LocationDirectory.json LocationDirectory Profile profiles/LocationDirectory.fsh 1 - 44 -StructureDefinition-OrganizationDirectory.json OrganizationDirectory Profile profiles/OrganizationDirectory.fsh 1 - 45 +StructureDefinition-HealthcareServiceDirectory.json HealthcareServiceDirectory Profile profiles/HealthcareServiceDirectory.fsh 1 - 37 +StructureDefinition-LocationDirectory.json LocationDirectory Profile profiles/LocationDirectory.fsh 1 - 38 +StructureDefinition-OrganizationDirectory.json OrganizationDirectory Profile profiles/OrganizationDirectory.fsh 1 - 53 StructureDefinition-PractitionerDirectory.json PractitionerDirectory Profile profiles/PractitionerDirectory.fsh 1 - 40 StructureDefinition-PractitionerRoleDirectory.json PractitionerRoleDirectory Profile profiles/PractitionerRoleDirectory.fsh 1 - 15 ValueSet-AddressStateVS.json AddressStateVS ValueSet valuesets/AddressStateVS.fsh 1 - 4 diff --git a/src/fhir/fsh-generated/resources/Organization-OrganizationExample.json b/src/fhir/fsh-generated/resources/Organization-OrganizationExample.json index 1bacb7ff..0823f861 100644 --- a/src/fhir/fsh-generated/resources/Organization-OrganizationExample.json +++ b/src/fhir/fsh-generated/resources/Organization-OrganizationExample.json @@ -14,7 +14,15 @@ }, "identifier": [ { - "system": "https://gematik.de/fhir/sid/telematik-id", + "system": "http://fhir.de/StructureDefinition/identifier-telematik-id", + "type": { + "coding": [ + { + "code": "63161005", + "system": "http://snomed.info/sct" + } + ] + }, "value": "2-2.58.00000040" } ], diff --git a/src/fhir/fsh-generated/resources/Organization-OrganizationExample001.json b/src/fhir/fsh-generated/resources/Organization-OrganizationExample001.json index f3fd2ac5..428b5896 100644 --- a/src/fhir/fsh-generated/resources/Organization-OrganizationExample001.json +++ b/src/fhir/fsh-generated/resources/Organization-OrganizationExample001.json @@ -14,8 +14,28 @@ }, "identifier": [ { - "system": "https://gematik.de/fhir/sid/telematik-id", + "system": "http://fhir.de/StructureDefinition/identifier-telematik-id", + "type": { + "coding": [ + { + "code": "63161005", + "system": "http://snomed.info/sct" + } + ] + }, "value": "9-2.58.00000040" + }, + { + "system": "http://fhir.de/StructureDefinition/identifier-telematik-id", + "type": { + "coding": [ + { + "code": "2603003", + "system": "http://snomed.info/sct" + } + ] + }, + "value": "9-2.58.00000050" } ], "address": [ diff --git a/src/fhir/fsh-generated/resources/StructureDefinition-LocationDirectory.json b/src/fhir/fsh-generated/resources/StructureDefinition-LocationDirectory.json index 4716fd61..9d2df58a 100644 --- a/src/fhir/fsh-generated/resources/StructureDefinition-LocationDirectory.json +++ b/src/fhir/fsh-generated/resources/StructureDefinition-LocationDirectory.json @@ -65,36 +65,6 @@ "min": 1, "patternUri": "https://gematik.de/fhir/directory/CodeSystem/Origin" }, - { - "id": "Location.identifier", - "path": "Location.identifier", - "slicing": { - "discriminator": [ - { - "type": "value", - "path": "system" - } - ], - "rules": "open" - }, - "mustSupport": true - }, - { - "id": "Location.identifier:BSNR", - "path": "Location.identifier", - "sliceName": "BSNR", - "min": 0, - "max": "1", - "type": [ - { - "code": "Identifier", - "profile": [ - "http://fhir.de/StructureDefinition/identifier-bsnr" - ] - } - ], - "mustSupport": true - }, { "id": "Location.name", "path": "Location.name", diff --git a/src/fhir/fsh-generated/resources/StructureDefinition-OrganizationDirectory.json b/src/fhir/fsh-generated/resources/StructureDefinition-OrganizationDirectory.json index 061d51c8..f00703a3 100644 --- a/src/fhir/fsh-generated/resources/StructureDefinition-OrganizationDirectory.json +++ b/src/fhir/fsh-generated/resources/StructureDefinition-OrganizationDirectory.json @@ -81,8 +81,8 @@ "slicing": { "discriminator": [ { - "type": "value", - "path": "system" + "type": "pattern", + "path": "$this" } ], "rules": "open" @@ -96,14 +96,36 @@ "sliceName": "TelematikID", "min": 1, "max": "1", - "type": [ - { - "code": "Identifier", - "profile": [ - "http://fhir.de/StructureDefinition/identifier-telematik-id" + "patternIdentifier": { + "system": "http://fhir.de/StructureDefinition/identifier-telematik-id", + "type": { + "coding": [ + { + "code": "63161005", + "system": "http://snomed.info/sct" + } ] } - ], + }, + "mustSupport": true + }, + { + "id": "Organization.identifier:AlternativeTelematikID", + "path": "Organization.identifier", + "sliceName": "AlternativeTelematikID", + "min": 0, + "max": "*", + "patternIdentifier": { + "system": "http://fhir.de/StructureDefinition/identifier-telematik-id", + "type": { + "coding": [ + { + "code": "2603003", + "system": "http://snomed.info/sct" + } + ] + } + }, "mustSupport": true }, { @@ -112,14 +134,9 @@ "sliceName": "KZVA", "min": 0, "max": "1", - "type": [ - { - "code": "Identifier", - "profile": [ - "http://fhir.de/StructureDefinition/identifier-kzva" - ] - } - ], + "patternIdentifier": { + "system": "http://fhir.de/StructureDefinition/identifier-kzva" + }, "mustSupport": true }, { @@ -128,14 +145,20 @@ "sliceName": "IKNR", "min": 0, "max": "1", - "type": [ - { - "code": "Identifier", - "profile": [ - "http://fhir.de/StructureDefinition/identifier-iknr" - ] - } - ], + "patternIdentifier": { + "system": "http://fhir.de/StructureDefinition/identifier-iknr" + }, + "mustSupport": true + }, + { + "id": "Organization.identifier:BSNR", + "path": "Organization.identifier", + "sliceName": "BSNR", + "min": 0, + "max": "1", + "patternIdentifier": { + "system": "http://fhir.de/StructureDefinition/identifier-bsnr" + }, "mustSupport": true }, { @@ -236,6 +259,11 @@ "path": "Organization.address.country", "mustSupport": true }, + { + "id": "Organization.partOf", + "path": "Organization.partOf", + "mustSupport": true + }, { "id": "Organization.contact", "path": "Organization.contact", diff --git a/src/fhir/input/fsh/examples/OrganizationExample001.fsh b/src/fhir/input/fsh/examples/OrganizationExample001.fsh index 9a559152..e7cb4436 100644 --- a/src/fhir/input/fsh/examples/OrganizationExample001.fsh +++ b/src/fhir/input/fsh/examples/OrganizationExample001.fsh @@ -18,6 +18,7 @@ Description: "Example of an Organization as to be found in gematik FHIR Director * meta.tag[Origin] = Origin#ldap * active = true * identifier[TelematikID].value = "9-2.58.00000040" +* identifier[AlternativeTelematikID].value = "9-2.58.00000050" * type[profession] = OrganizationProfessionOID#1.2.276.0.76.4.58 * name = "gematik GmbH" * active = true diff --git a/src/fhir/input/fsh/profiles/LocationDirectory.fsh b/src/fhir/input/fsh/profiles/LocationDirectory.fsh index f87519e3..035bc545 100644 --- a/src/fhir/input/fsh/profiles/LocationDirectory.fsh +++ b/src/fhir/input/fsh/profiles/LocationDirectory.fsh @@ -12,12 +12,6 @@ organisations specific for german Healthcare and Telematics Infrastructure. * meta.tag contains Origin 1..1 MS * meta.tag[Origin] from OriginVS * meta.tag[Origin].system = "https://gematik.de/fhir/directory/CodeSystem/Origin" -* identifier MS -* identifier ^slicing.discriminator.type = #value -* identifier ^slicing.discriminator.path = "system" -* identifier ^slicing.rules = #open -* identifier contains BSNR 0..1 MS -* identifier[BSNR] only $IdentifierBSNR * id 0..1 MS * name MS * description MS diff --git a/src/fhir/input/fsh/profiles/OrganizationDirectory.fsh b/src/fhir/input/fsh/profiles/OrganizationDirectory.fsh index 36071649..1d5c2eba 100644 --- a/src/fhir/input/fsh/profiles/OrganizationDirectory.fsh +++ b/src/fhir/input/fsh/profiles/OrganizationDirectory.fsh @@ -15,20 +15,26 @@ organisations specific for german Healthcare and Telematics Infrastructure. * id 0..1 MS * name 1..1 MS * identifier 1..* MS -* identifier ^slicing.discriminator.type = #value -* identifier ^slicing.discriminator.path = "system" +* identifier ^slicing.discriminator.type = #pattern +* identifier ^slicing.discriminator.path = "$this" * identifier ^slicing.rules = #open * identifier contains TelematikID 1..1 MS -* identifier[TelematikID] only $IdentifierTelematikID +* identifier[TelematikID] ^patternIdentifier.system = $IdentifierTelematikID +* identifier[TelematikID] ^patternIdentifier.type = $sct#63161005 // primary +* identifier contains AlternativeTelematikID 0..* MS +* identifier[AlternativeTelematikID] ^patternIdentifier.system = $IdentifierTelematikID +* identifier[AlternativeTelematikID] ^patternIdentifier.type = $sct#2603003 //secondary * identifier contains KZVA 0..1 MS -* identifier[KZVA] only $IdentifierKZVA +* identifier[KZVA] ^patternIdentifier.system = $IdentifierKZVA * identifier contains IKNR 0..1 MS -* identifier[IKNR] only $IdentifierIKNR +* identifier[IKNR] ^patternIdentifier.system = $IdentifierIKNR +* identifier contains BSNR 0..1 MS +* identifier[BSNR] ^patternIdentifier.system = $IdentifierBSNR * type 1..* MS * ^slicing.discriminator.type = #pattern * ^slicing.discriminator.path = "$this" * ^slicing.rules = #open -* type contains providerType 0..* MS and profession 0..* MS +* type contains providerType 0..* MS and profession 0..* MS * type[providerType] from OrganizationProviderTypeVS * type[profession] from OrganizationProfessionOIDTypeVS * name 1..1 MS @@ -42,4 +48,5 @@ organisations specific for german Healthcare and Telematics Infrastructure. * city MS * state MS * postalCode MS - * country MS \ No newline at end of file + * country MS +* partOf MS \ No newline at end of file From faa70ddd2b543423b486885e8dad1698b515535d Mon Sep 17 00:00:00 2001 From: patrick-werner Date: Tue, 27 Feb 2024 14:21:23 +0100 Subject: [PATCH 05/16] =?UTF-8?q?feat:=20Nutzungskennzeichen=20Organizatio?= =?UTF-8?q?n=20&=20Endpoint=20hinzugef=C3=BCgt.=20(VisibilityExtension)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/fhir/fsh-generated/fsh-index.json | 76 +++++++++++++++---- src/fhir/fsh-generated/fsh-index.txt | 24 +++--- .../resources/Endpoint-EndpointExample.json | 9 +++ .../Organization-OrganizationExample001.json | 9 +++ ...StructureDefinition-EndpointDirectory.json | 16 ++++ ...ctureDefinition-OrganizationDirectory.json | 16 ++++ src/fhir/input/fsh/examples/Examples001.fsh | 1 + .../fsh/examples/OrganizationExample001.fsh | 1 + .../input/fsh/profiles/EndpointDirectory.fsh | 1 + .../fsh/profiles/OrganizationDirectory.fsh | 1 + 10 files changed, 131 insertions(+), 23 deletions(-) diff --git a/src/fhir/fsh-generated/fsh-index.json b/src/fhir/fsh-generated/fsh-index.json index 7d7519da..5babad7c 100644 --- a/src/fhir/fsh-generated/fsh-index.json +++ b/src/fhir/fsh-generated/fsh-index.json @@ -15,6 +15,14 @@ "startLine": 1, "endLine": 12 }, + { + "outputFile": "CodeSystem-EndpointVisibilityCS.json", + "fshName": "EndpointVisibilityCS", + "fshType": "CodeSystem", + "fshFile": "profiles/Extension.fsh", + "startLine": 35, + "endLine": 40 + }, { "outputFile": "CodeSystem-HolderCS.json", "fshName": "HolderCS", @@ -39,6 +47,14 @@ "startLine": 1, "endLine": 11 }, + { + "outputFile": "CodeSystem-OrganizationVisibilityCS.json", + "fshName": "OrganizationVisibilityCS", + "fshType": "CodeSystem", + "fshFile": "profiles/Extension.fsh", + "startLine": 11, + "endLine": 16 + }, { "outputFile": "CodeSystem-Origin.json", "fshName": "Origin", @@ -85,7 +101,7 @@ "fshType": "Instance", "fshFile": "examples/Examples001.fsh", "startLine": 1, - "endLine": 11 + "endLine": 12 }, { "outputFile": "Endpoint-OrganizationExample001-Endpoint-TIM.json", @@ -100,24 +116,24 @@ "fshName": "HealthcareServiceExample", "fshType": "Instance", "fshFile": "examples/Examples001.fsh", - "startLine": 76, - "endLine": 104 + "startLine": 77, + "endLine": 105 }, { "outputFile": "Location-LocationExample.json", "fshName": "LocationExample", "fshType": "Instance", "fshFile": "examples/Examples001.fsh", - "startLine": 53, - "endLine": 74 + "startLine": 54, + "endLine": 75 }, { "outputFile": "Organization-OrganizationExample.json", "fshName": "OrganizationExample", "fshType": "Instance", "fshFile": "examples/Examples001.fsh", - "startLine": 38, - "endLine": 51 + "startLine": 39, + "endLine": 52 }, { "outputFile": "Organization-OrganizationExample001.json", @@ -125,7 +141,7 @@ "fshType": "Instance", "fshFile": "examples/OrganizationExample001.fsh", "startLine": 14, - "endLine": 40 + "endLine": 41 }, { "outputFile": "Practitioner-TIPractitionerExample001.json", @@ -140,16 +156,16 @@ "fshName": "PractitionerExampleDentist", "fshType": "Instance", "fshFile": "examples/Examples001.fsh", - "startLine": 13, - "endLine": 26 + "startLine": 14, + "endLine": 27 }, { "outputFile": "PractitionerRole-PractitionerRoleExample.json", "fshName": "PractitionerRoleExample", "fshType": "Instance", "fshFile": "examples/Examples001.fsh", - "startLine": 28, - "endLine": 35 + "startLine": 29, + "endLine": 36 }, { "outputFile": "StructureDefinition-EndpointDirectory.json", @@ -157,7 +173,15 @@ "fshType": "Profile", "fshFile": "profiles/EndpointDirectory.fsh", "startLine": 1, - "endLine": 23 + "endLine": 24 + }, + { + "outputFile": "StructureDefinition-EndpointVisibility.json", + "fshName": "EndpointVisibility", + "fshType": "Extension", + "fshFile": "profiles/Extension.fsh", + "startLine": 25, + "endLine": 33 }, { "outputFile": "StructureDefinition-HealthcareServiceDirectory.json", @@ -165,7 +189,7 @@ "fshType": "Profile", "fshFile": "profiles/HealthcareServiceDirectory.fsh", "startLine": 1, - "endLine": 37 + "endLine": 36 }, { "outputFile": "StructureDefinition-LocationDirectory.json", @@ -183,6 +207,14 @@ "startLine": 1, "endLine": 53 }, + { + "outputFile": "StructureDefinition-OrganizationVisibility.json", + "fshName": "OrganizationVisibility", + "fshType": "Extension", + "fshFile": "profiles/Extension.fsh", + "startLine": 1, + "endLine": 9 + }, { "outputFile": "StructureDefinition-PractitionerDirectory.json", "fshName": "PractitionerDirectory", @@ -223,6 +255,14 @@ "startLine": 1, "endLine": 4 }, + { + "outputFile": "ValueSet-EndpointVisibilityVS.json", + "fshName": "EndpointVisibilityVS", + "fshType": "ValueSet", + "fshFile": "profiles/Extension.fsh", + "startLine": 42, + "endLine": 47 + }, { "outputFile": "ValueSet-HealthcareServiceTypeVS.json", "fshName": "HealthcareServiceTypeVS", @@ -263,6 +303,14 @@ "startLine": 1, "endLine": 4 }, + { + "outputFile": "ValueSet-OrganizationVisibilityVS.json", + "fshName": "OrganizationVisibilityVS", + "fshType": "ValueSet", + "fshFile": "profiles/Extension.fsh", + "startLine": 18, + "endLine": 23 + }, { "outputFile": "ValueSet-OriginVS.json", "fshName": "OriginVS", diff --git a/src/fhir/fsh-generated/fsh-index.txt b/src/fhir/fsh-generated/fsh-index.txt index 78896c46..e09b141a 100644 --- a/src/fhir/fsh-generated/fsh-index.txt +++ b/src/fhir/fsh-generated/fsh-index.txt @@ -1,37 +1,43 @@ Output File Name Type FSH File Lines CodeSystem-EndpointDirectoryConnectionType.json EndpointDirectoryConnectionType CodeSystem codesystems/EndpointDirectoryConnectionType.fsh 1 - 14 CodeSystem-EndpointDirectoryPayloadType.json EndpointDirectoryPayloadType CodeSystem codesystems/EndpointDirectoryPayloadType.fsh 1 - 12 +CodeSystem-EndpointVisibilityCS.json EndpointVisibilityCS CodeSystem profiles/Extension.fsh 35 - 40 CodeSystem-HolderCS.json HolderCS CodeSystem codesystems/HolderCS.fsh 1 - 125 CodeSystem-OrganizationProfessionOID.json OrganizationProfessionOID CodeSystem codesystems/OrganizationProfessionOID.fsh 1 - 66 CodeSystem-OrganizationProviderType.json OrganizationProviderType CodeSystem codesystems/OrganizationProviderType.fsh 1 - 11 +CodeSystem-OrganizationVisibilityCS.json OrganizationVisibilityCS CodeSystem profiles/Extension.fsh 11 - 16 CodeSystem-Origin.json Origin CodeSystem codesystems/Origin.fsh 1 - 7 CodeSystem-PharmacyHealthcareSpecialityCS.json PharmacyHealthcareSpecialityCS CodeSystem codesystems/PharmacyHealthcareServiceSpecialityCS.fsh 1 - 12 CodeSystem-PharmacyTypeCS.json PharmacyTypeCS CodeSystem codesystems/PharmacyTypeCS.fsh 1 - 11 CodeSystem-PractitionerProfessionOID.json PractitionerProfessionOID CodeSystem codesystems/PractitionerProfessionOID.fsh 1 - 43 CodeSystem-Region.json Region CodeSystem codesystems/Region.fsh 1 - 27 -Endpoint-EndpointExample.json EndpointExample Instance examples/Examples001.fsh 1 - 11 +Endpoint-EndpointExample.json EndpointExample Instance examples/Examples001.fsh 1 - 12 Endpoint-OrganizationExample001-Endpoint-TIM.json OrganizationExample001-Endpoint-TIM Instance examples/OrganizationExample001.fsh 1 - 12 -HealthcareService-HealthcareServiceExample.json HealthcareServiceExample Instance examples/Examples001.fsh 76 - 104 -Location-LocationExample.json LocationExample Instance examples/Examples001.fsh 53 - 74 -Organization-OrganizationExample.json OrganizationExample Instance examples/Examples001.fsh 38 - 51 -Organization-OrganizationExample001.json OrganizationExample001 Instance examples/OrganizationExample001.fsh 14 - 40 +HealthcareService-HealthcareServiceExample.json HealthcareServiceExample Instance examples/Examples001.fsh 77 - 105 +Location-LocationExample.json LocationExample Instance examples/Examples001.fsh 54 - 75 +Organization-OrganizationExample.json OrganizationExample Instance examples/Examples001.fsh 39 - 52 +Organization-OrganizationExample001.json OrganizationExample001 Instance examples/OrganizationExample001.fsh 14 - 41 Practitioner-TIPractitionerExample001.json PractitionerExample001 Instance examples/PractitionerExample001.fsh 1 - 18 -Practitioner-TIPractitionerExampleDentist.json PractitionerExampleDentist Instance examples/Examples001.fsh 13 - 26 -PractitionerRole-PractitionerRoleExample.json PractitionerRoleExample Instance examples/Examples001.fsh 28 - 35 -StructureDefinition-EndpointDirectory.json EndpointDirectory Profile profiles/EndpointDirectory.fsh 1 - 23 -StructureDefinition-HealthcareServiceDirectory.json HealthcareServiceDirectory Profile profiles/HealthcareServiceDirectory.fsh 1 - 37 +Practitioner-TIPractitionerExampleDentist.json PractitionerExampleDentist Instance examples/Examples001.fsh 14 - 27 +PractitionerRole-PractitionerRoleExample.json PractitionerRoleExample Instance examples/Examples001.fsh 29 - 36 +StructureDefinition-EndpointDirectory.json EndpointDirectory Profile profiles/EndpointDirectory.fsh 1 - 24 +StructureDefinition-EndpointVisibility.json EndpointVisibility Extension profiles/Extension.fsh 25 - 33 +StructureDefinition-HealthcareServiceDirectory.json HealthcareServiceDirectory Profile profiles/HealthcareServiceDirectory.fsh 1 - 36 StructureDefinition-LocationDirectory.json LocationDirectory Profile profiles/LocationDirectory.fsh 1 - 38 StructureDefinition-OrganizationDirectory.json OrganizationDirectory Profile profiles/OrganizationDirectory.fsh 1 - 53 +StructureDefinition-OrganizationVisibility.json OrganizationVisibility Extension profiles/Extension.fsh 1 - 9 StructureDefinition-PractitionerDirectory.json PractitionerDirectory Profile profiles/PractitionerDirectory.fsh 1 - 40 StructureDefinition-PractitionerRoleDirectory.json PractitionerRoleDirectory Profile profiles/PractitionerRoleDirectory.fsh 1 - 15 ValueSet-AddressStateVS.json AddressStateVS ValueSet valuesets/AddressStateVS.fsh 1 - 4 ValueSet-EndpointConnectionTypeVS.json EndpointConnectionTypeVS ValueSet valuesets/EndpointConnectionTypeVS.fsh 1 - 5 ValueSet-EndpointPayloadTypeVS.json EndpointPayloadTypeVS ValueSet valuesets/EndpointPayloadTypeVS.fsh 1 - 4 +ValueSet-EndpointVisibilityVS.json EndpointVisibilityVS ValueSet profiles/Extension.fsh 42 - 47 ValueSet-HealthcareServiceTypeVS.json HealthcareServiceTypeVS ValueSet valuesets/HealthcareServiceTypeVS.fsh 1 - 102 ValueSet-HealthcareSpecialityTypeVS.json HealthcareServiceSpecialityVS ValueSet valuesets/HealthcareServiceSpecialityVS.fsh 1 - 7 ValueSet-IHEXDShealthcareFacilityTypeCodePatientRelatedHealthcare.json IHEXDShealthcareFacilityTypeCodePatientRelatedHealthcare ValueSet valuesets/HealthCareServiceCategory.fsh 3 - 62 ValueSet-OrganizationProfessionOIDTypeVS.json OrganizationProfessionOIDTypeVS ValueSet valuesets/OrganizationProfessionOIDTypeVS.fsh 1 - 4 ValueSet-OrganizationProviderTypeVS.json OrganizationProviderTypeVS ValueSet valuesets/OrganizationProviderTypeVS.fsh 1 - 4 +ValueSet-OrganizationVisibilityVS.json OrganizationVisibilityVS ValueSet profiles/Extension.fsh 18 - 23 ValueSet-OriginVS.json OriginVS ValueSet valuesets/OriginVS.fsh 1 - 4 ValueSet-PractitionerQualificationVS.json PractitionerQualificationVS ValueSet valuesets/PractitionerQualificationVS.fsh 1 - 457 ValueSet-healthcareservice-characteristic-vs.json HealthCareServiceCharacteristicVS ValueSet valuesets/HealthCareServiceCharacteristic.fsh 1 - 6 \ No newline at end of file diff --git a/src/fhir/fsh-generated/resources/Endpoint-EndpointExample.json b/src/fhir/fsh-generated/resources/Endpoint-EndpointExample.json index 28b86b2d..514a7a2a 100644 --- a/src/fhir/fsh-generated/resources/Endpoint-EndpointExample.json +++ b/src/fhir/fsh-generated/resources/Endpoint-EndpointExample.json @@ -12,6 +12,15 @@ "https://gematik.de/fhir/directory/StructureDefinition/EndpointDirectory" ] }, + "extension": [ + { + "url": "https://gematik.de/fhir/directory/StructureDefinition/EndpointVisibility", + "valueCoding": { + "code": "versicherte", + "system": "https://gematik.de/fhir/directory/CodeSystem/EndpointVisibilityCS" + } + } + ], "status": "active", "connectionType": { "code": "tim", diff --git a/src/fhir/fsh-generated/resources/Organization-OrganizationExample001.json b/src/fhir/fsh-generated/resources/Organization-OrganizationExample001.json index 428b5896..80f90c64 100644 --- a/src/fhir/fsh-generated/resources/Organization-OrganizationExample001.json +++ b/src/fhir/fsh-generated/resources/Organization-OrganizationExample001.json @@ -38,6 +38,15 @@ "value": "9-2.58.00000050" } ], + "extension": [ + { + "url": "https://gematik.de/fhir/directory/StructureDefinition/OrganizationVisibility", + "valueCoding": { + "code": "erezeptApp", + "system": "https://gematik.de/fhir/directory/CodeSystem/OrganizationVisibilityCS" + } + } + ], "address": [ { "extension": [ diff --git a/src/fhir/fsh-generated/resources/StructureDefinition-EndpointDirectory.json b/src/fhir/fsh-generated/resources/StructureDefinition-EndpointDirectory.json index 0ce8652c..8bf0bdea 100644 --- a/src/fhir/fsh-generated/resources/StructureDefinition-EndpointDirectory.json +++ b/src/fhir/fsh-generated/resources/StructureDefinition-EndpointDirectory.json @@ -60,6 +60,22 @@ "min": 1, "patternUri": "https://gematik.de/fhir/directory/CodeSystem/Origin" }, + { + "id": "Endpoint.extension:endpointVisibility", + "path": "Endpoint.extension", + "sliceName": "endpointVisibility", + "min": 0, + "max": "*", + "type": [ + { + "code": "Extension", + "profile": [ + "https://gematik.de/fhir/directory/StructureDefinition/EndpointVisibility" + ] + } + ], + "mustSupport": true + }, { "id": "Endpoint.status", "path": "Endpoint.status", diff --git a/src/fhir/fsh-generated/resources/StructureDefinition-OrganizationDirectory.json b/src/fhir/fsh-generated/resources/StructureDefinition-OrganizationDirectory.json index f00703a3..ebdf5fbb 100644 --- a/src/fhir/fsh-generated/resources/StructureDefinition-OrganizationDirectory.json +++ b/src/fhir/fsh-generated/resources/StructureDefinition-OrganizationDirectory.json @@ -75,6 +75,22 @@ "min": 1, "patternUri": "https://gematik.de/fhir/directory/CodeSystem/Origin" }, + { + "id": "Organization.extension:organizationVisibility", + "path": "Organization.extension", + "sliceName": "organizationVisibility", + "min": 0, + "max": "*", + "type": [ + { + "code": "Extension", + "profile": [ + "https://gematik.de/fhir/directory/StructureDefinition/OrganizationVisibility" + ] + } + ], + "mustSupport": true + }, { "id": "Organization.identifier", "path": "Organization.identifier", diff --git a/src/fhir/input/fsh/examples/Examples001.fsh b/src/fhir/input/fsh/examples/Examples001.fsh index 395b8dd4..5508c360 100644 --- a/src/fhir/input/fsh/examples/Examples001.fsh +++ b/src/fhir/input/fsh/examples/Examples001.fsh @@ -3,6 +3,7 @@ InstanceOf: EndpointDirectory Usage: #example Description: "Example of a Endpoint as to be found in gematik FHIR Directory" * meta.tag[Origin] = Origin#owner +* extension[endpointVisibility].valueCoding = EndpointVisibilityCS#versicherte * status = #active "Active" * connectionType = EndpointDirectoryConnectionType#tim "TI-Messenger Endpoint" * name = "Messenger" diff --git a/src/fhir/input/fsh/examples/OrganizationExample001.fsh b/src/fhir/input/fsh/examples/OrganizationExample001.fsh index e7cb4436..f30966b2 100644 --- a/src/fhir/input/fsh/examples/OrganizationExample001.fsh +++ b/src/fhir/input/fsh/examples/OrganizationExample001.fsh @@ -17,6 +17,7 @@ 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#erezeptApp * identifier[TelematikID].value = "9-2.58.00000040" * identifier[AlternativeTelematikID].value = "9-2.58.00000050" * type[profession] = OrganizationProfessionOID#1.2.276.0.76.4.58 diff --git a/src/fhir/input/fsh/profiles/EndpointDirectory.fsh b/src/fhir/input/fsh/profiles/EndpointDirectory.fsh index 8552eadb..ffde5ca6 100644 --- a/src/fhir/input/fsh/profiles/EndpointDirectory.fsh +++ b/src/fhir/input/fsh/profiles/EndpointDirectory.fsh @@ -4,6 +4,7 @@ Parent: Endpoint Title: "Endpoint in gematik Directory" Description: "Endpoints for applications in the gematik Directory" * insert Meta +* extension contains EndpointVisibility named endpointVisibility 0..* MS * meta.tag 1.. MS * ^slicing.discriminator.type = #value * ^slicing.discriminator.path = "system" diff --git a/src/fhir/input/fsh/profiles/OrganizationDirectory.fsh b/src/fhir/input/fsh/profiles/OrganizationDirectory.fsh index 1d5c2eba..08e8806d 100644 --- a/src/fhir/input/fsh/profiles/OrganizationDirectory.fsh +++ b/src/fhir/input/fsh/profiles/OrganizationDirectory.fsh @@ -5,6 +5,7 @@ Description: """Defines the data structure for medical, regulatory and technical organisations specific for german Healthcare and Telematics Infrastructure. """ * insert Meta +* extension contains OrganizationVisibility named organizationVisibility 0..* MS * meta.tag 1.. MS * ^slicing.discriminator.type = #value * ^slicing.discriminator.path = "system" From 1d4472f78553e26cc8980708552972e5dd6dbc71 Mon Sep 17 00:00:00 2001 From: patrick-werner Date: Tue, 27 Feb 2024 14:28:46 +0100 Subject: [PATCH 06/16] fix: adding missing files --- .../CodeSystem-EndpointVisibilityCS.json | 18 ++++++ .../CodeSystem-OrganizationVisibilityCS.json | 18 ++++++ .../resources/Endpoint-EndpointExample.json | 2 +- .../Organization-OrganizationExample001.json | 2 +- ...tructureDefinition-EndpointVisibility.json | 63 +++++++++++++++++++ ...tureDefinition-OrganizationVisibility.json | 63 +++++++++++++++++++ .../ValueSet-EndpointVisibilityVS.json | 17 +++++ .../ValueSet-OrganizationVisibilityVS.json | 17 +++++ src/fhir/input/fsh/examples/Examples001.fsh | 2 +- .../fsh/examples/OrganizationExample001.fsh | 2 +- src/fhir/input/fsh/profiles/Extension.fsh | 47 ++++++++++++++ 11 files changed, 247 insertions(+), 4 deletions(-) create mode 100644 src/fhir/fsh-generated/resources/CodeSystem-EndpointVisibilityCS.json create mode 100644 src/fhir/fsh-generated/resources/CodeSystem-OrganizationVisibilityCS.json create mode 100644 src/fhir/fsh-generated/resources/StructureDefinition-EndpointVisibility.json create mode 100644 src/fhir/fsh-generated/resources/StructureDefinition-OrganizationVisibility.json create mode 100644 src/fhir/fsh-generated/resources/ValueSet-EndpointVisibilityVS.json create mode 100644 src/fhir/fsh-generated/resources/ValueSet-OrganizationVisibilityVS.json create mode 100644 src/fhir/input/fsh/profiles/Extension.fsh diff --git a/src/fhir/fsh-generated/resources/CodeSystem-EndpointVisibilityCS.json b/src/fhir/fsh-generated/resources/CodeSystem-EndpointVisibilityCS.json new file mode 100644 index 00000000..cc280429 --- /dev/null +++ b/src/fhir/fsh-generated/resources/CodeSystem-EndpointVisibilityCS.json @@ -0,0 +1,18 @@ +{ + "resourceType": "CodeSystem", + "status": "active", + "content": "complete", + "name": "EndpointVisibilityCS", + "id": "EndpointVisibilityCS", + "title": "EndpointVisibilityCS", + "description": "EndpointVisibilityCS", + "url": "https://gematik.de/fhir/directory/CodeSystem/EndpointVisibilityCS", + "concept": [ + { + "code": "hide-versicherte", + "display": "Eintrag nicht Versicherten anzeigen" + } + ], + "publisher": "gematik GmbH", + "count": 1 +} diff --git a/src/fhir/fsh-generated/resources/CodeSystem-OrganizationVisibilityCS.json b/src/fhir/fsh-generated/resources/CodeSystem-OrganizationVisibilityCS.json new file mode 100644 index 00000000..98dfe5f8 --- /dev/null +++ b/src/fhir/fsh-generated/resources/CodeSystem-OrganizationVisibilityCS.json @@ -0,0 +1,18 @@ +{ + "resourceType": "CodeSystem", + "status": "active", + "content": "complete", + "name": "OrganizationVisibilityCS", + "id": "OrganizationVisibilityCS", + "title": "OrganizationVisibilityCS", + "description": "OrganizationVisibilityCS", + "url": "https://gematik.de/fhir/directory/CodeSystem/OrganizationVisibilityCS", + "concept": [ + { + "code": "hide-erezeptApp", + "display": "Eintrag nicht in eRezeptApp darstellen" + } + ], + "publisher": "gematik GmbH", + "count": 1 +} diff --git a/src/fhir/fsh-generated/resources/Endpoint-EndpointExample.json b/src/fhir/fsh-generated/resources/Endpoint-EndpointExample.json index 514a7a2a..39e3512c 100644 --- a/src/fhir/fsh-generated/resources/Endpoint-EndpointExample.json +++ b/src/fhir/fsh-generated/resources/Endpoint-EndpointExample.json @@ -16,7 +16,7 @@ { "url": "https://gematik.de/fhir/directory/StructureDefinition/EndpointVisibility", "valueCoding": { - "code": "versicherte", + "code": "hide-versicherte", "system": "https://gematik.de/fhir/directory/CodeSystem/EndpointVisibilityCS" } } diff --git a/src/fhir/fsh-generated/resources/Organization-OrganizationExample001.json b/src/fhir/fsh-generated/resources/Organization-OrganizationExample001.json index 80f90c64..5c236463 100644 --- a/src/fhir/fsh-generated/resources/Organization-OrganizationExample001.json +++ b/src/fhir/fsh-generated/resources/Organization-OrganizationExample001.json @@ -42,7 +42,7 @@ { "url": "https://gematik.de/fhir/directory/StructureDefinition/OrganizationVisibility", "valueCoding": { - "code": "erezeptApp", + "code": "hide-erezeptApp", "system": "https://gematik.de/fhir/directory/CodeSystem/OrganizationVisibilityCS" } } diff --git a/src/fhir/fsh-generated/resources/StructureDefinition-EndpointVisibility.json b/src/fhir/fsh-generated/resources/StructureDefinition-EndpointVisibility.json new file mode 100644 index 00000000..062d70bc --- /dev/null +++ b/src/fhir/fsh-generated/resources/StructureDefinition-EndpointVisibility.json @@ -0,0 +1,63 @@ +{ + "resourceType": "StructureDefinition", + "id": "EndpointVisibility", + "url": "https://gematik.de/fhir/directory/StructureDefinition/EndpointVisibility", + "name": "EndpointVisibility", + "title": "EndpointVisibility", + "status": "active", + "publisher": "gematik GmbH", + "description": "Visibility of an Endpoint in the FHIR-VZD. This Extensions includes codes of use-cases im which this Endpoint SHALL not be visible.", + "fhirVersion": "4.0.1", + "mapping": [ + { + "identity": "rim", + "uri": "http://hl7.org/v3", + "name": "RIM Mapping" + } + ], + "kind": "complex-type", + "abstract": false, + "context": [ + { + "expression": "Organization", + "type": "element" + } + ], + "type": "Extension", + "baseDefinition": "http://hl7.org/fhir/StructureDefinition/Extension", + "derivation": "constraint", + "differential": { + "element": [ + { + "id": "Extension", + "path": "Extension", + "short": "EndpointVisibility", + "definition": "Visibility of an Endpoint in the FHIR-VZD. This Extensions includes codes of use-cases im which this Endpoint SHALL not be visible." + }, + { + "id": "Extension.extension", + "path": "Extension.extension", + "max": "0" + }, + { + "id": "Extension.url", + "path": "Extension.url", + "fixedUri": "https://gematik.de/fhir/directory/StructureDefinition/EndpointVisibility" + }, + { + "id": "Extension.value[x]", + "path": "Extension.value[x]", + "type": [ + { + "code": "Coding" + } + ], + "mustSupport": true, + "binding": { + "strength": "required", + "valueSet": "https://gematik.de/fhir/directory/ValueSet/EndpointVisibilityVS" + } + } + ] + } +} diff --git a/src/fhir/fsh-generated/resources/StructureDefinition-OrganizationVisibility.json b/src/fhir/fsh-generated/resources/StructureDefinition-OrganizationVisibility.json new file mode 100644 index 00000000..b79ca92d --- /dev/null +++ b/src/fhir/fsh-generated/resources/StructureDefinition-OrganizationVisibility.json @@ -0,0 +1,63 @@ +{ + "resourceType": "StructureDefinition", + "id": "OrganizationVisibility", + "url": "https://gematik.de/fhir/directory/StructureDefinition/OrganizationVisibility", + "name": "OrganizationVisibility", + "title": "OrganizationVisibility", + "status": "active", + "publisher": "gematik GmbH", + "description": "Visibility of an Organization in the FHIR-VZD. This Extensions includes codes of use-cases im which this Organization SHALL not be visible.", + "fhirVersion": "4.0.1", + "mapping": [ + { + "identity": "rim", + "uri": "http://hl7.org/v3", + "name": "RIM Mapping" + } + ], + "kind": "complex-type", + "abstract": false, + "context": [ + { + "expression": "Organization", + "type": "element" + } + ], + "type": "Extension", + "baseDefinition": "http://hl7.org/fhir/StructureDefinition/Extension", + "derivation": "constraint", + "differential": { + "element": [ + { + "id": "Extension", + "path": "Extension", + "short": "OrganizationVisibility", + "definition": "Visibility of an Organization in the FHIR-VZD. This Extensions includes codes of use-cases im which this Organization SHALL not be visible." + }, + { + "id": "Extension.extension", + "path": "Extension.extension", + "max": "0" + }, + { + "id": "Extension.url", + "path": "Extension.url", + "fixedUri": "https://gematik.de/fhir/directory/StructureDefinition/OrganizationVisibility" + }, + { + "id": "Extension.value[x]", + "path": "Extension.value[x]", + "type": [ + { + "code": "Coding" + } + ], + "mustSupport": true, + "binding": { + "strength": "required", + "valueSet": "https://gematik.de/fhir/directory/ValueSet/OrganizationVisibilityVS" + } + } + ] + } +} diff --git a/src/fhir/fsh-generated/resources/ValueSet-EndpointVisibilityVS.json b/src/fhir/fsh-generated/resources/ValueSet-EndpointVisibilityVS.json new file mode 100644 index 00000000..bab70199 --- /dev/null +++ b/src/fhir/fsh-generated/resources/ValueSet-EndpointVisibilityVS.json @@ -0,0 +1,17 @@ +{ + "resourceType": "ValueSet", + "status": "active", + "name": "EndpointVisibilityVS", + "id": "EndpointVisibilityVS", + "title": "EndpointVisibilityVS", + "description": "EndpointVisibilityVS", + "url": "https://gematik.de/fhir/directory/ValueSet/EndpointVisibilityVS", + "publisher": "gematik GmbH", + "compose": { + "include": [ + { + "system": "https://gematik.de/fhir/directory/CodeSystem/EndpointVisibilityCS" + } + ] + } +} diff --git a/src/fhir/fsh-generated/resources/ValueSet-OrganizationVisibilityVS.json b/src/fhir/fsh-generated/resources/ValueSet-OrganizationVisibilityVS.json new file mode 100644 index 00000000..e7223918 --- /dev/null +++ b/src/fhir/fsh-generated/resources/ValueSet-OrganizationVisibilityVS.json @@ -0,0 +1,17 @@ +{ + "resourceType": "ValueSet", + "status": "active", + "name": "OrganizationVisibilityVS", + "id": "OrganizationVisibilityVS", + "title": "OrganizationVisibilityVS", + "description": "OrganizationVisibilityVS", + "url": "https://gematik.de/fhir/directory/ValueSet/OrganizationVisibilityVS", + "publisher": "gematik GmbH", + "compose": { + "include": [ + { + "system": "https://gematik.de/fhir/directory/CodeSystem/OrganizationVisibilityCS" + } + ] + } +} diff --git a/src/fhir/input/fsh/examples/Examples001.fsh b/src/fhir/input/fsh/examples/Examples001.fsh index 5508c360..b6df5e31 100644 --- a/src/fhir/input/fsh/examples/Examples001.fsh +++ b/src/fhir/input/fsh/examples/Examples001.fsh @@ -3,7 +3,7 @@ InstanceOf: EndpointDirectory Usage: #example Description: "Example of a Endpoint as to be found in gematik FHIR Directory" * meta.tag[Origin] = Origin#owner -* extension[endpointVisibility].valueCoding = EndpointVisibilityCS#versicherte +* extension[endpointVisibility].valueCoding = EndpointVisibilityCS#hide-versicherte * status = #active "Active" * connectionType = EndpointDirectoryConnectionType#tim "TI-Messenger Endpoint" * name = "Messenger" diff --git a/src/fhir/input/fsh/examples/OrganizationExample001.fsh b/src/fhir/input/fsh/examples/OrganizationExample001.fsh index f30966b2..14cea358 100644 --- a/src/fhir/input/fsh/examples/OrganizationExample001.fsh +++ b/src/fhir/input/fsh/examples/OrganizationExample001.fsh @@ -17,7 +17,7 @@ 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#erezeptApp +* extension[organizationVisibility].valueCoding = OrganizationVisibilityCS#hide-erezeptApp * identifier[TelematikID].value = "9-2.58.00000040" * identifier[AlternativeTelematikID].value = "9-2.58.00000050" * type[profession] = OrganizationProfessionOID#1.2.276.0.76.4.58 diff --git a/src/fhir/input/fsh/profiles/Extension.fsh b/src/fhir/input/fsh/profiles/Extension.fsh new file mode 100644 index 00000000..f8f7b38c --- /dev/null +++ b/src/fhir/input/fsh/profiles/Extension.fsh @@ -0,0 +1,47 @@ +Extension: OrganizationVisibility +Id: OrganizationVisibility +Title: "OrganizationVisibility" +Description: "Visibility of an Organization in the FHIR-VZD. This Extensions includes codes of use-cases im which this Organization SHALL not be visible." +Context: Organization +* insert Meta +* value[x] MS +* value[x] only Coding +* value[x] from OrganizationVisibilityVS + +CodeSystem: OrganizationVisibilityCS +Id: OrganizationVisibilityCS +Title: "OrganizationVisibilityCS" +Description: "OrganizationVisibilityCS" +* insert Meta +* #hide-erezeptApp "Eintrag nicht in eRezeptApp darstellen" + +ValueSet: OrganizationVisibilityVS +Id: OrganizationVisibilityVS +Title: "OrganizationVisibilityVS" +Description: "OrganizationVisibilityVS" +* insert Meta +* include codes from system OrganizationVisibilityCS + +Extension: EndpointVisibility +Id: EndpointVisibility +Title: "EndpointVisibility" +Description: "Visibility of an Endpoint in the FHIR-VZD. This Extensions includes codes of use-cases im which this Endpoint SHALL not be visible." +Context: Organization +* insert Meta +* value[x] MS +* value[x] only Coding +* value[x] from EndpointVisibilityVS + +CodeSystem: EndpointVisibilityCS +Id: EndpointVisibilityCS +Title: "EndpointVisibilityCS" +Description: "EndpointVisibilityCS" +* insert Meta +* #hide-versicherte "Eintrag nicht Versicherten anzeigen" + +ValueSet: EndpointVisibilityVS +Id: EndpointVisibilityVS +Title: "EndpointVisibilityVS" +Description: "EndpointVisibilityVS" +* insert Meta +* include codes from system EndpointVisibilityCS \ No newline at end of file From 4dcf06e62fa004cdb0e18bb0ba510af9ddf27b3f Mon Sep 17 00:00:00 2001 From: patrick-werner Date: Tue, 27 Feb 2024 14:49:48 +0100 Subject: [PATCH 07/16] fix: adding support for partOf --- .../resources/StructureDefinition-LocationDirectory.json | 5 +++++ src/fhir/input/fsh/profiles/LocationDirectory.fsh | 1 + 2 files changed, 6 insertions(+) diff --git a/src/fhir/fsh-generated/resources/StructureDefinition-LocationDirectory.json b/src/fhir/fsh-generated/resources/StructureDefinition-LocationDirectory.json index 9d2df58a..c3359e82 100644 --- a/src/fhir/fsh-generated/resources/StructureDefinition-LocationDirectory.json +++ b/src/fhir/fsh-generated/resources/StructureDefinition-LocationDirectory.json @@ -148,6 +148,11 @@ "path": "Location.managingOrganization", "mustSupport": true }, + { + "id": "Location.partOf", + "path": "Location.partOf", + "mustSupport": true + }, { "id": "Location.hoursOfOperation", "path": "Location.hoursOfOperation", diff --git a/src/fhir/input/fsh/profiles/LocationDirectory.fsh b/src/fhir/input/fsh/profiles/LocationDirectory.fsh index 035bc545..5149c3d2 100644 --- a/src/fhir/input/fsh/profiles/LocationDirectory.fsh +++ b/src/fhir/input/fsh/profiles/LocationDirectory.fsh @@ -29,6 +29,7 @@ organisations specific for german Healthcare and Telematics Infrastructure. * longitude MS * latitude MS * altitude MS +* partOf MS * hoursOfOperation MS * daysOfWeek MS * allDay MS From 21cda9d662cdeb3d8ec81595f276200884d59787 Mon Sep 17 00:00:00 2001 From: patrick-werner Date: Wed, 28 Feb 2024 15:20:38 +0100 Subject: [PATCH 08/16] fix: fixed telematikID --- src/fhir/fsh-generated/fsh-index.json | 2 +- src/fhir/fsh-generated/fsh-index.txt | 2 +- .../Organization-OrganizationExample.json | 11 +--- .../Organization-OrganizationExample001.json | 22 ++----- ...ctureDefinition-OrganizationDirectory.json | 64 +++++++++++++------ ...ctureDefinition-PractitionerDirectory.json | 2 +- src/fhir/ig.ini | 3 + src/fhir/input/fsh/alias.fsh | 12 ++-- .../input/fsh/profiles/LocationDirectory.fsh | 1 - .../fsh/profiles/OrganizationDirectory.fsh | 19 ++++-- .../fsh/profiles/PractitionerDirectory.fsh | 2 +- 11 files changed, 76 insertions(+), 64 deletions(-) create mode 100644 src/fhir/ig.ini diff --git a/src/fhir/fsh-generated/fsh-index.json b/src/fhir/fsh-generated/fsh-index.json index 5babad7c..fad8fb86 100644 --- a/src/fhir/fsh-generated/fsh-index.json +++ b/src/fhir/fsh-generated/fsh-index.json @@ -205,7 +205,7 @@ "fshType": "Profile", "fshFile": "profiles/OrganizationDirectory.fsh", "startLine": 1, - "endLine": 53 + "endLine": 58 }, { "outputFile": "StructureDefinition-OrganizationVisibility.json", diff --git a/src/fhir/fsh-generated/fsh-index.txt b/src/fhir/fsh-generated/fsh-index.txt index e09b141a..cbe0f190 100644 --- a/src/fhir/fsh-generated/fsh-index.txt +++ b/src/fhir/fsh-generated/fsh-index.txt @@ -24,7 +24,7 @@ StructureDefinition-EndpointDirectory.json Endpoint StructureDefinition-EndpointVisibility.json EndpointVisibility Extension profiles/Extension.fsh 25 - 33 StructureDefinition-HealthcareServiceDirectory.json HealthcareServiceDirectory Profile profiles/HealthcareServiceDirectory.fsh 1 - 36 StructureDefinition-LocationDirectory.json LocationDirectory Profile profiles/LocationDirectory.fsh 1 - 38 -StructureDefinition-OrganizationDirectory.json OrganizationDirectory Profile profiles/OrganizationDirectory.fsh 1 - 53 +StructureDefinition-OrganizationDirectory.json OrganizationDirectory Profile profiles/OrganizationDirectory.fsh 1 - 58 StructureDefinition-OrganizationVisibility.json OrganizationVisibility Extension profiles/Extension.fsh 1 - 9 StructureDefinition-PractitionerDirectory.json PractitionerDirectory Profile profiles/PractitionerDirectory.fsh 1 - 40 StructureDefinition-PractitionerRoleDirectory.json PractitionerRoleDirectory Profile profiles/PractitionerRoleDirectory.fsh 1 - 15 diff --git a/src/fhir/fsh-generated/resources/Organization-OrganizationExample.json b/src/fhir/fsh-generated/resources/Organization-OrganizationExample.json index 0823f861..4fbea86a 100644 --- a/src/fhir/fsh-generated/resources/Organization-OrganizationExample.json +++ b/src/fhir/fsh-generated/resources/Organization-OrganizationExample.json @@ -14,15 +14,8 @@ }, "identifier": [ { - "system": "http://fhir.de/StructureDefinition/identifier-telematik-id", - "type": { - "coding": [ - { - "code": "63161005", - "system": "http://snomed.info/sct" - } - ] - }, + "system": "https://gematik.de/fhir/sid/telematik-id", + "use": "usual", "value": "2-2.58.00000040" } ], diff --git a/src/fhir/fsh-generated/resources/Organization-OrganizationExample001.json b/src/fhir/fsh-generated/resources/Organization-OrganizationExample001.json index 5c236463..2ff6a4a9 100644 --- a/src/fhir/fsh-generated/resources/Organization-OrganizationExample001.json +++ b/src/fhir/fsh-generated/resources/Organization-OrganizationExample001.json @@ -14,27 +14,13 @@ }, "identifier": [ { - "system": "http://fhir.de/StructureDefinition/identifier-telematik-id", - "type": { - "coding": [ - { - "code": "63161005", - "system": "http://snomed.info/sct" - } - ] - }, + "system": "https://gematik.de/fhir/sid/telematik-id", + "use": "usual", "value": "9-2.58.00000040" }, { - "system": "http://fhir.de/StructureDefinition/identifier-telematik-id", - "type": { - "coding": [ - { - "code": "2603003", - "system": "http://snomed.info/sct" - } - ] - }, + "system": "https://gematik.de/fhir/sid/telematik-id", + "use": "secondary", "value": "9-2.58.00000050" } ], diff --git a/src/fhir/fsh-generated/resources/StructureDefinition-OrganizationDirectory.json b/src/fhir/fsh-generated/resources/StructureDefinition-OrganizationDirectory.json index ebdf5fbb..d628f060 100644 --- a/src/fhir/fsh-generated/resources/StructureDefinition-OrganizationDirectory.json +++ b/src/fhir/fsh-generated/resources/StructureDefinition-OrganizationDirectory.json @@ -112,16 +112,17 @@ "sliceName": "TelematikID", "min": 1, "max": "1", - "patternIdentifier": { - "system": "http://fhir.de/StructureDefinition/identifier-telematik-id", - "type": { - "coding": [ - { - "code": "63161005", - "system": "http://snomed.info/sct" - } + "type": [ + { + "code": "Identifier", + "profile": [ + "http://fhir.de/StructureDefinition/identifier-telematik-id" ] } + ], + "patternIdentifier": { + "system": "https://gematik.de/fhir/sid/telematik-id", + "use": "usual" }, "mustSupport": true }, @@ -131,16 +132,17 @@ "sliceName": "AlternativeTelematikID", "min": 0, "max": "*", - "patternIdentifier": { - "system": "http://fhir.de/StructureDefinition/identifier-telematik-id", - "type": { - "coding": [ - { - "code": "2603003", - "system": "http://snomed.info/sct" - } + "type": [ + { + "code": "Identifier", + "profile": [ + "http://fhir.de/StructureDefinition/identifier-telematik-id" ] } + ], + "patternIdentifier": { + "system": "https://gematik.de/fhir/sid/telematik-id", + "use": "secondary" }, "mustSupport": true }, @@ -150,8 +152,16 @@ "sliceName": "KZVA", "min": 0, "max": "1", + "type": [ + { + "code": "Identifier", + "profile": [ + "http://fhir.de/StructureDefinition/identifier-kzva" + ] + } + ], "patternIdentifier": { - "system": "http://fhir.de/StructureDefinition/identifier-kzva" + "system": "http://fhir.de/sid/kzbv/kzvabrechnungsnummer" }, "mustSupport": true }, @@ -161,8 +171,16 @@ "sliceName": "IKNR", "min": 0, "max": "1", + "type": [ + { + "code": "Identifier", + "profile": [ + "http://fhir.de/StructureDefinition/identifier-iknr" + ] + } + ], "patternIdentifier": { - "system": "http://fhir.de/StructureDefinition/identifier-iknr" + "system": "http://fhir.de/sid/arge-ik/iknr" }, "mustSupport": true }, @@ -172,8 +190,16 @@ "sliceName": "BSNR", "min": 0, "max": "1", + "type": [ + { + "code": "Identifier", + "profile": [ + "http://fhir.de/StructureDefinition/identifier-bsnr" + ] + } + ], "patternIdentifier": { - "system": "http://fhir.de/StructureDefinition/identifier-bsnr" + "system": "https://fhir.kbv.de/NamingSystem/KBV_NS_Base_BSNR" }, "mustSupport": true }, diff --git a/src/fhir/fsh-generated/resources/StructureDefinition-PractitionerDirectory.json b/src/fhir/fsh-generated/resources/StructureDefinition-PractitionerDirectory.json index 4ea4e552..d864e7cf 100644 --- a/src/fhir/fsh-generated/resources/StructureDefinition-PractitionerDirectory.json +++ b/src/fhir/fsh-generated/resources/StructureDefinition-PractitionerDirectory.json @@ -94,7 +94,7 @@ "path": "Practitioner.identifier", "sliceName": "TelematikID", "min": 1, - "max": "*", + "max": "1", "type": [ { "code": "Identifier", diff --git a/src/fhir/ig.ini b/src/fhir/ig.ini new file mode 100644 index 00000000..4aa62823 --- /dev/null +++ b/src/fhir/ig.ini @@ -0,0 +1,3 @@ +[IG] +ig = fsh-generated/resources/ImplementationGuide-fhir-vzd.json +template = fhir.base.template#current \ No newline at end of file diff --git a/src/fhir/input/fsh/alias.fsh b/src/fhir/input/fsh/alias.fsh index 4a3aa595..a7482292 100644 --- a/src/fhir/input/fsh/alias.fsh +++ b/src/fhir/input/fsh/alias.fsh @@ -17,22 +17,22 @@ Alias: $ZahnärztlicheFachrichtungen = urn:oid:1.2.276.0.76.5.494 // Identifiers // TelematikID Alias: $IdentifierTelematikID = http://fhir.de/StructureDefinition/identifier-telematik-id -Alias: $NamingSystemTelematikID = https://gematik.de/fhir/sid/telematik-id +Alias: $SidTelematikID = https://gematik.de/fhir/sid/telematik-id // BSNR (Betriebstättennummer) Alias: $IdentifierBSNR = http://fhir.de/StructureDefinition/identifier-bsnr -Alias: $NamingSystemBSNR = https://fhir.kbv.de/NamingSystem/KBV_NS_Base_BSNR +Alias: $SidBSNR = https://fhir.kbv.de/NamingSystem/KBV_NS_Base_BSNR // KZVA (KZV-Abrechnungsnummer) Alias: $IdentifierKZVA = http://fhir.de/StructureDefinition/identifier-kzva -Alias: $NamingSystemKZVA = http://fhir.de/sid/kzbv/kzvabrechnungsnummer +Alias: $SidKZVA = http://fhir.de/sid/kzbv/kzvabrechnungsnummer // IKNR (Institutionskennzeichen) Alias: $IdentifierIKNR = http://fhir.de/StructureDefinition/identifier-iknr -Alias: $NamingSystemIKNR = http://fhir.de/sid/arge-ik/iknr +Alias: $SidIKNR = http://fhir.de/sid/arge-ik/iknr // LANR (Lebenslange Arztnummer) Alias: $IdentifierLANR = http://fhir.de/StructureDefinition/identifier-lanr -Alias: $NamingSystemLANR = https://fhir.kbv.de/NamingSystem/KBV_NS_Base_ANR +Alias: $SidLANR = https://fhir.kbv.de/NamingSystem/KBV_NS_Base_ANR // ZANR (Lebenslange Zahnarztnummer) Alias: $IdentifierZANR = http://fhir.de/StructureDefinition/identifier-zanr -Alias: $NamingSystemZANR = http://fhir.de/sid/kzbv/zahnarztnummer +Alias: $SidZANR = http://fhir.de/sid/kzbv/zahnarztnummer Alias: $ContactEntityType = http://terminology.hl7.org/CodeSystem/contactentity-type Alias: $DaysOfWeek = http://hl7.org/fhir/days-of-week diff --git a/src/fhir/input/fsh/profiles/LocationDirectory.fsh b/src/fhir/input/fsh/profiles/LocationDirectory.fsh index 5149c3d2..153e1b98 100644 --- a/src/fhir/input/fsh/profiles/LocationDirectory.fsh +++ b/src/fhir/input/fsh/profiles/LocationDirectory.fsh @@ -22,7 +22,6 @@ organisations specific for german Healthcare and Telematics Infrastructure. * line MS * city MS * state MS -// FIXME: widerspricht dt. Basisprofilen * state from AddressStateVS (extensible) * postalCode MS * country MS * position MS diff --git a/src/fhir/input/fsh/profiles/OrganizationDirectory.fsh b/src/fhir/input/fsh/profiles/OrganizationDirectory.fsh index 08e8806d..c5dc7b9e 100644 --- a/src/fhir/input/fsh/profiles/OrganizationDirectory.fsh +++ b/src/fhir/input/fsh/profiles/OrganizationDirectory.fsh @@ -20,17 +20,22 @@ organisations specific for german Healthcare and Telematics Infrastructure. * identifier ^slicing.discriminator.path = "$this" * identifier ^slicing.rules = #open * identifier contains TelematikID 1..1 MS -* identifier[TelematikID] ^patternIdentifier.system = $IdentifierTelematikID -* identifier[TelematikID] ^patternIdentifier.type = $sct#63161005 // primary +* identifier[TelematikID] only $IdentifierTelematikID +* identifier[TelematikID] ^patternIdentifier.system = $SidTelematikID +* identifier[TelematikID] ^patternIdentifier.use = #usual * identifier contains AlternativeTelematikID 0..* MS -* identifier[AlternativeTelematikID] ^patternIdentifier.system = $IdentifierTelematikID -* identifier[AlternativeTelematikID] ^patternIdentifier.type = $sct#2603003 //secondary +* identifier[AlternativeTelematikID] only $IdentifierTelematikID +* identifier[AlternativeTelematikID] ^patternIdentifier.system = $SidTelematikID +* identifier[AlternativeTelematikID] ^patternIdentifier.use = #secondary * identifier contains KZVA 0..1 MS -* identifier[KZVA] ^patternIdentifier.system = $IdentifierKZVA +* identifier[KZVA] only IdentifierKzva +* identifier[KZVA] ^patternIdentifier.system = $SidKZVA * identifier contains IKNR 0..1 MS -* identifier[IKNR] ^patternIdentifier.system = $IdentifierIKNR +* identifier[IKNR] only IdentifierIknr +* identifier[IKNR] ^patternIdentifier.system = $SidIKNR * identifier contains BSNR 0..1 MS -* identifier[BSNR] ^patternIdentifier.system = $IdentifierBSNR +* identifier[BSNR] only IdentifierBsnr +* identifier[BSNR] ^patternIdentifier.system = $SidBSNR * type 1..* MS * ^slicing.discriminator.type = #pattern * ^slicing.discriminator.path = "$this" diff --git a/src/fhir/input/fsh/profiles/PractitionerDirectory.fsh b/src/fhir/input/fsh/profiles/PractitionerDirectory.fsh index cb3bd3f9..db1b1b3a 100644 --- a/src/fhir/input/fsh/profiles/PractitionerDirectory.fsh +++ b/src/fhir/input/fsh/profiles/PractitionerDirectory.fsh @@ -14,7 +14,7 @@ Title: "Practitioner in gematik Directory" * ^slicing.discriminator.type = #value * ^slicing.discriminator.path = "system" * ^slicing.rules = #open -* identifier contains TelematikID 1.. MS +* identifier contains TelematikID 1..1 MS * identifier[TelematikID] only $IdentifierTelematikID * identifier contains LANR 0.. MS * identifier[LANR] only $IdentifierLANR From ef8e1516ef77cc9e594b71a216476ad72f48784e Mon Sep 17 00:00:00 2001 From: patrick-werner Date: Thu, 7 Mar 2024 09:15:30 +0100 Subject: [PATCH 09/16] feat: updated version to 0.11.0 feat: changed EndpointDirectoryConnectionType concepts --- src/fhir/fsh-generated/fsh-index.json | 2 +- src/fhir/fsh-generated/fsh-index.txt | 2 +- .../CodeSystem-EndpointDirectoryConnectionType.json | 11 ++++++++--- .../CodeSystem-EndpointDirectoryPayloadType.json | 1 + .../resources/CodeSystem-EndpointVisibilityCS.json | 1 + .../fsh-generated/resources/CodeSystem-HolderCS.json | 1 + .../CodeSystem-OrganizationProfessionOID.json | 1 + .../CodeSystem-OrganizationProviderType.json | 1 + .../CodeSystem-OrganizationVisibilityCS.json | 1 + .../fsh-generated/resources/CodeSystem-Origin.json | 1 + .../CodeSystem-PharmacyHealthcareSpecialityCS.json | 1 + .../CodeSystem-PractitionerProfessionOID.json | 1 + .../fsh-generated/resources/CodeSystem-Region.json | 1 + .../StructureDefinition-EndpointDirectory.json | 1 + .../StructureDefinition-EndpointVisibility.json | 1 + ...tructureDefinition-HealthcareServiceDirectory.json | 1 + .../StructureDefinition-LocationDirectory.json | 1 + .../StructureDefinition-OrganizationDirectory.json | 1 + .../StructureDefinition-OrganizationVisibility.json | 1 + .../StructureDefinition-PractitionerDirectory.json | 1 + ...StructureDefinition-PractitionerRoleDirectory.json | 1 + .../resources/ValueSet-AddressStateVS.json | 1 + .../resources/ValueSet-EndpointConnectionTypeVS.json | 1 + .../resources/ValueSet-EndpointPayloadTypeVS.json | 1 + .../resources/ValueSet-EndpointVisibilityVS.json | 1 + .../resources/ValueSet-HealthcareServiceTypeVS.json | 1 + .../ValueSet-HealthcareSpecialityTypeVS.json | 1 + ...hcareFacilityTypeCodePatientRelatedHealthcare.json | 1 + .../ValueSet-OrganizationProfessionOIDTypeVS.json | 1 + .../ValueSet-OrganizationProviderTypeVS.json | 1 + .../resources/ValueSet-OrganizationVisibilityVS.json | 1 + .../fsh-generated/resources/ValueSet-OriginVS.json | 1 + .../ValueSet-PractitionerQualificationVS.json | 1 + .../ValueSet-healthcareservice-characteristic-vs.json | 1 + .../codesystems/EndpointDirectoryConnectionType.fsh | 3 ++- src/fhir/input/fsh/ruleset.fsh | 1 + src/fhir/sushi-config.yaml | 2 +- 37 files changed, 45 insertions(+), 7 deletions(-) diff --git a/src/fhir/fsh-generated/fsh-index.json b/src/fhir/fsh-generated/fsh-index.json index fad8fb86..03326cc3 100644 --- a/src/fhir/fsh-generated/fsh-index.json +++ b/src/fhir/fsh-generated/fsh-index.json @@ -5,7 +5,7 @@ "fshType": "CodeSystem", "fshFile": "codesystems/EndpointDirectoryConnectionType.fsh", "startLine": 1, - "endLine": 14 + "endLine": 15 }, { "outputFile": "CodeSystem-EndpointDirectoryPayloadType.json", diff --git a/src/fhir/fsh-generated/fsh-index.txt b/src/fhir/fsh-generated/fsh-index.txt index cbe0f190..f213f856 100644 --- a/src/fhir/fsh-generated/fsh-index.txt +++ b/src/fhir/fsh-generated/fsh-index.txt @@ -1,5 +1,5 @@ Output File Name Type FSH File Lines -CodeSystem-EndpointDirectoryConnectionType.json EndpointDirectoryConnectionType CodeSystem codesystems/EndpointDirectoryConnectionType.fsh 1 - 14 +CodeSystem-EndpointDirectoryConnectionType.json EndpointDirectoryConnectionType CodeSystem codesystems/EndpointDirectoryConnectionType.fsh 1 - 15 CodeSystem-EndpointDirectoryPayloadType.json EndpointDirectoryPayloadType CodeSystem codesystems/EndpointDirectoryPayloadType.fsh 1 - 12 CodeSystem-EndpointVisibilityCS.json EndpointVisibilityCS CodeSystem profiles/Extension.fsh 35 - 40 CodeSystem-HolderCS.json HolderCS CodeSystem codesystems/HolderCS.fsh 1 - 125 diff --git a/src/fhir/fsh-generated/resources/CodeSystem-EndpointDirectoryConnectionType.json b/src/fhir/fsh-generated/resources/CodeSystem-EndpointDirectoryConnectionType.json index ed633836..1a10c1cb 100644 --- a/src/fhir/fsh-generated/resources/CodeSystem-EndpointDirectoryConnectionType.json +++ b/src/fhir/fsh-generated/resources/CodeSystem-EndpointDirectoryConnectionType.json @@ -13,8 +13,12 @@ "display": "TI-Messenger Endpoint" }, { - "code": "tim-domain", - "display": "TI-Messenger domain name" + "code": "tim-fa", + "display": "TI-Messenger Funktionsaccount" + }, + { + "code": "tim-bot", + "display": "TI-Messenger Chatbot" }, { "code": "kim-1.0", @@ -42,6 +46,7 @@ } ], "publisher": "gematik GmbH", + "version": "0.11.0", "caseSensitive": false, - "count": 8 + "count": 9 } diff --git a/src/fhir/fsh-generated/resources/CodeSystem-EndpointDirectoryPayloadType.json b/src/fhir/fsh-generated/resources/CodeSystem-EndpointDirectoryPayloadType.json index a9db6e24..eb0fa791 100644 --- a/src/fhir/fsh-generated/resources/CodeSystem-EndpointDirectoryPayloadType.json +++ b/src/fhir/fsh-generated/resources/CodeSystem-EndpointDirectoryPayloadType.json @@ -14,6 +14,7 @@ } ], "publisher": "gematik GmbH", + "version": "0.11.0", "caseSensitive": false, "count": 1 } diff --git a/src/fhir/fsh-generated/resources/CodeSystem-EndpointVisibilityCS.json b/src/fhir/fsh-generated/resources/CodeSystem-EndpointVisibilityCS.json index cc280429..b0392aea 100644 --- a/src/fhir/fsh-generated/resources/CodeSystem-EndpointVisibilityCS.json +++ b/src/fhir/fsh-generated/resources/CodeSystem-EndpointVisibilityCS.json @@ -14,5 +14,6 @@ } ], "publisher": "gematik GmbH", + "version": "0.11.0", "count": 1 } diff --git a/src/fhir/fsh-generated/resources/CodeSystem-HolderCS.json b/src/fhir/fsh-generated/resources/CodeSystem-HolderCS.json index 776fc978..2343d21c 100644 --- a/src/fhir/fsh-generated/resources/CodeSystem-HolderCS.json +++ b/src/fhir/fsh-generated/resources/CodeSystem-HolderCS.json @@ -474,6 +474,7 @@ } ], "publisher": "gematik GmbH", + "version": "0.11.0", "caseSensitive": false, "count": 116 } diff --git a/src/fhir/fsh-generated/resources/CodeSystem-OrganizationProfessionOID.json b/src/fhir/fsh-generated/resources/CodeSystem-OrganizationProfessionOID.json index e8d63534..6bbf8c60 100644 --- a/src/fhir/fsh-generated/resources/CodeSystem-OrganizationProfessionOID.json +++ b/src/fhir/fsh-generated/resources/CodeSystem-OrganizationProfessionOID.json @@ -242,6 +242,7 @@ } ], "publisher": "gematik GmbH", + "version": "0.11.0", "caseSensitive": false, "count": 58 } diff --git a/src/fhir/fsh-generated/resources/CodeSystem-OrganizationProviderType.json b/src/fhir/fsh-generated/resources/CodeSystem-OrganizationProviderType.json index f9eaaea1..e65bcb0a 100644 --- a/src/fhir/fsh-generated/resources/CodeSystem-OrganizationProviderType.json +++ b/src/fhir/fsh-generated/resources/CodeSystem-OrganizationProviderType.json @@ -25,6 +25,7 @@ } ], "publisher": "gematik GmbH", + "version": "0.11.0", "caseSensitive": false, "count": 4 } diff --git a/src/fhir/fsh-generated/resources/CodeSystem-OrganizationVisibilityCS.json b/src/fhir/fsh-generated/resources/CodeSystem-OrganizationVisibilityCS.json index 98dfe5f8..d073f687 100644 --- a/src/fhir/fsh-generated/resources/CodeSystem-OrganizationVisibilityCS.json +++ b/src/fhir/fsh-generated/resources/CodeSystem-OrganizationVisibilityCS.json @@ -14,5 +14,6 @@ } ], "publisher": "gematik GmbH", + "version": "0.11.0", "count": 1 } diff --git a/src/fhir/fsh-generated/resources/CodeSystem-Origin.json b/src/fhir/fsh-generated/resources/CodeSystem-Origin.json index 90bfa22a..743b817f 100644 --- a/src/fhir/fsh-generated/resources/CodeSystem-Origin.json +++ b/src/fhir/fsh-generated/resources/CodeSystem-Origin.json @@ -17,6 +17,7 @@ } ], "publisher": "gematik GmbH", + "version": "0.11.0", "caseSensitive": false, "count": 2 } diff --git a/src/fhir/fsh-generated/resources/CodeSystem-PharmacyHealthcareSpecialityCS.json b/src/fhir/fsh-generated/resources/CodeSystem-PharmacyHealthcareSpecialityCS.json index 33e6aea4..d7c4d19c 100644 --- a/src/fhir/fsh-generated/resources/CodeSystem-PharmacyHealthcareSpecialityCS.json +++ b/src/fhir/fsh-generated/resources/CodeSystem-PharmacyHealthcareSpecialityCS.json @@ -30,6 +30,7 @@ } ], "publisher": "gematik GmbH", + "version": "0.11.0", "caseSensitive": false, "count": 5 } diff --git a/src/fhir/fsh-generated/resources/CodeSystem-PractitionerProfessionOID.json b/src/fhir/fsh-generated/resources/CodeSystem-PractitionerProfessionOID.json index 51d6fb4b..a4178a66 100644 --- a/src/fhir/fsh-generated/resources/CodeSystem-PractitionerProfessionOID.json +++ b/src/fhir/fsh-generated/resources/CodeSystem-PractitionerProfessionOID.json @@ -151,6 +151,7 @@ } ], "publisher": "gematik GmbH", + "version": "0.11.0", "caseSensitive": false, "count": 35 } diff --git a/src/fhir/fsh-generated/resources/CodeSystem-Region.json b/src/fhir/fsh-generated/resources/CodeSystem-Region.json index c17116a7..bf27e617 100644 --- a/src/fhir/fsh-generated/resources/CodeSystem-Region.json +++ b/src/fhir/fsh-generated/resources/CodeSystem-Region.json @@ -82,6 +82,7 @@ } ], "publisher": "gematik GmbH", + "version": "0.11.0", "caseSensitive": false, "count": 18 } diff --git a/src/fhir/fsh-generated/resources/StructureDefinition-EndpointDirectory.json b/src/fhir/fsh-generated/resources/StructureDefinition-EndpointDirectory.json index 8bf0bdea..de721d93 100644 --- a/src/fhir/fsh-generated/resources/StructureDefinition-EndpointDirectory.json +++ b/src/fhir/fsh-generated/resources/StructureDefinition-EndpointDirectory.json @@ -2,6 +2,7 @@ "resourceType": "StructureDefinition", "id": "EndpointDirectory", "url": "https://gematik.de/fhir/directory/StructureDefinition/EndpointDirectory", + "version": "0.11.0", "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 062d70bc..c07eb540 100644 --- a/src/fhir/fsh-generated/resources/StructureDefinition-EndpointVisibility.json +++ b/src/fhir/fsh-generated/resources/StructureDefinition-EndpointVisibility.json @@ -2,6 +2,7 @@ "resourceType": "StructureDefinition", "id": "EndpointVisibility", "url": "https://gematik.de/fhir/directory/StructureDefinition/EndpointVisibility", + "version": "0.11.0", "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 9538653a..beb94ab9 100644 --- a/src/fhir/fsh-generated/resources/StructureDefinition-HealthcareServiceDirectory.json +++ b/src/fhir/fsh-generated/resources/StructureDefinition-HealthcareServiceDirectory.json @@ -2,6 +2,7 @@ "resourceType": "StructureDefinition", "id": "HealthcareServiceDirectory", "url": "https://gematik.de/fhir/directory/StructureDefinition/HealthcareServiceDirectory", + "version": "0.11.0", "name": "HealthcareServiceDirectory", "title": "HealthcareService in gematik Directory", "status": "active", diff --git a/src/fhir/fsh-generated/resources/StructureDefinition-LocationDirectory.json b/src/fhir/fsh-generated/resources/StructureDefinition-LocationDirectory.json index c3359e82..382344dd 100644 --- a/src/fhir/fsh-generated/resources/StructureDefinition-LocationDirectory.json +++ b/src/fhir/fsh-generated/resources/StructureDefinition-LocationDirectory.json @@ -2,6 +2,7 @@ "resourceType": "StructureDefinition", "id": "LocationDirectory", "url": "https://gematik.de/fhir/directory/StructureDefinition/LocationDirectory", + "version": "0.11.0", "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 d628f060..4ffd75d1 100644 --- a/src/fhir/fsh-generated/resources/StructureDefinition-OrganizationDirectory.json +++ b/src/fhir/fsh-generated/resources/StructureDefinition-OrganizationDirectory.json @@ -2,6 +2,7 @@ "resourceType": "StructureDefinition", "id": "OrganizationDirectory", "url": "https://gematik.de/fhir/directory/StructureDefinition/OrganizationDirectory", + "version": "0.11.0", "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 b79ca92d..23ec6163 100644 --- a/src/fhir/fsh-generated/resources/StructureDefinition-OrganizationVisibility.json +++ b/src/fhir/fsh-generated/resources/StructureDefinition-OrganizationVisibility.json @@ -2,6 +2,7 @@ "resourceType": "StructureDefinition", "id": "OrganizationVisibility", "url": "https://gematik.de/fhir/directory/StructureDefinition/OrganizationVisibility", + "version": "0.11.0", "name": "OrganizationVisibility", "title": "OrganizationVisibility", "status": "active", diff --git a/src/fhir/fsh-generated/resources/StructureDefinition-PractitionerDirectory.json b/src/fhir/fsh-generated/resources/StructureDefinition-PractitionerDirectory.json index d864e7cf..f6ab5029 100644 --- a/src/fhir/fsh-generated/resources/StructureDefinition-PractitionerDirectory.json +++ b/src/fhir/fsh-generated/resources/StructureDefinition-PractitionerDirectory.json @@ -2,6 +2,7 @@ "resourceType": "StructureDefinition", "id": "PractitionerDirectory", "url": "https://gematik.de/fhir/directory/StructureDefinition/PractitionerDirectory", + "version": "0.11.0", "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 ca73a0fa..24d658b5 100644 --- a/src/fhir/fsh-generated/resources/StructureDefinition-PractitionerRoleDirectory.json +++ b/src/fhir/fsh-generated/resources/StructureDefinition-PractitionerRoleDirectory.json @@ -2,6 +2,7 @@ "resourceType": "StructureDefinition", "id": "PractitionerRoleDirectory", "url": "https://gematik.de/fhir/directory/StructureDefinition/PractitionerRoleDirectory", + "version": "0.11.0", "name": "PractitionerRoleDirectory", "title": "PractitionerRole in gematik Directory", "status": "active", diff --git a/src/fhir/fsh-generated/resources/ValueSet-AddressStateVS.json b/src/fhir/fsh-generated/resources/ValueSet-AddressStateVS.json index ce8cb10d..07cca5c1 100644 --- a/src/fhir/fsh-generated/resources/ValueSet-AddressStateVS.json +++ b/src/fhir/fsh-generated/resources/ValueSet-AddressStateVS.json @@ -6,6 +6,7 @@ "description": "ValueSet for `Address.state`", "url": "https://gematik.de/fhir/directory/ValueSet/AddressStateVS", "publisher": "gematik GmbH", + "version": "0.11.0", "compose": { "include": [ { diff --git a/src/fhir/fsh-generated/resources/ValueSet-EndpointConnectionTypeVS.json b/src/fhir/fsh-generated/resources/ValueSet-EndpointConnectionTypeVS.json index 5fa24b64..4b15968c 100644 --- a/src/fhir/fsh-generated/resources/ValueSet-EndpointConnectionTypeVS.json +++ b/src/fhir/fsh-generated/resources/ValueSet-EndpointConnectionTypeVS.json @@ -6,6 +6,7 @@ "description": "ValueSet for `Endpoint.connectionType`", "url": "https://gematik.de/fhir/directory/ValueSet/EndpointConnectionTypeVS", "publisher": "gematik GmbH", + "version": "0.11.0", "compose": { "include": [ { diff --git a/src/fhir/fsh-generated/resources/ValueSet-EndpointPayloadTypeVS.json b/src/fhir/fsh-generated/resources/ValueSet-EndpointPayloadTypeVS.json index f596a0d6..ab1baa1a 100644 --- a/src/fhir/fsh-generated/resources/ValueSet-EndpointPayloadTypeVS.json +++ b/src/fhir/fsh-generated/resources/ValueSet-EndpointPayloadTypeVS.json @@ -6,6 +6,7 @@ "description": "ValueSet for `Endpoint.payloadType`", "url": "https://gematik.de/fhir/directory/ValueSet/EndpointPayloadTypeVS", "publisher": "gematik GmbH", + "version": "0.11.0", "compose": { "include": [ { diff --git a/src/fhir/fsh-generated/resources/ValueSet-EndpointVisibilityVS.json b/src/fhir/fsh-generated/resources/ValueSet-EndpointVisibilityVS.json index bab70199..b572e4b4 100644 --- a/src/fhir/fsh-generated/resources/ValueSet-EndpointVisibilityVS.json +++ b/src/fhir/fsh-generated/resources/ValueSet-EndpointVisibilityVS.json @@ -7,6 +7,7 @@ "description": "EndpointVisibilityVS", "url": "https://gematik.de/fhir/directory/ValueSet/EndpointVisibilityVS", "publisher": "gematik GmbH", + "version": "0.11.0", "compose": { "include": [ { diff --git a/src/fhir/fsh-generated/resources/ValueSet-HealthcareServiceTypeVS.json b/src/fhir/fsh-generated/resources/ValueSet-HealthcareServiceTypeVS.json index 8057cd97..006b42cc 100644 --- a/src/fhir/fsh-generated/resources/ValueSet-HealthcareServiceTypeVS.json +++ b/src/fhir/fsh-generated/resources/ValueSet-HealthcareServiceTypeVS.json @@ -6,6 +6,7 @@ "description": "ValueSet for `HealthcareService.type`", "url": "https://gematik.de/fhir/directory/ValueSet/HealthcareServiceTypeVS", "publisher": "gematik GmbH", + "version": "0.11.0", "compose": { "include": [ { diff --git a/src/fhir/fsh-generated/resources/ValueSet-HealthcareSpecialityTypeVS.json b/src/fhir/fsh-generated/resources/ValueSet-HealthcareSpecialityTypeVS.json index 946f5262..76654ba7 100644 --- a/src/fhir/fsh-generated/resources/ValueSet-HealthcareSpecialityTypeVS.json +++ b/src/fhir/fsh-generated/resources/ValueSet-HealthcareSpecialityTypeVS.json @@ -7,6 +7,7 @@ "description": "HealthcareService specialities", "url": "https://gematik.de/fhir/directory/ValueSet/HealthcareSpecialityTypeVS", "publisher": "gematik GmbH", + "version": "0.11.0", "compose": { "include": [ { diff --git a/src/fhir/fsh-generated/resources/ValueSet-IHEXDShealthcareFacilityTypeCodePatientRelatedHealthcare.json b/src/fhir/fsh-generated/resources/ValueSet-IHEXDShealthcareFacilityTypeCodePatientRelatedHealthcare.json index 226a2639..78f0a9af 100644 --- a/src/fhir/fsh-generated/resources/ValueSet-IHEXDShealthcareFacilityTypeCodePatientRelatedHealthcare.json +++ b/src/fhir/fsh-generated/resources/ValueSet-IHEXDShealthcareFacilityTypeCodePatientRelatedHealthcare.json @@ -7,6 +7,7 @@ "description": "**healthcareFacilityTypeCode (XDSDocumentEntry)**\n This code for an XDS Document represents the type of organizational setting of the clinical encounter during which the documented act occurred.", "url": "http://ihe-d.de/ValueSets/IHEXDShealthcareFacilityTypeCodePatientRelatedHealthcare", "publisher": "IHE Deutschland e.V.", + "version": "0.11.0", "experimental": false, "compose": { "include": [ diff --git a/src/fhir/fsh-generated/resources/ValueSet-OrganizationProfessionOIDTypeVS.json b/src/fhir/fsh-generated/resources/ValueSet-OrganizationProfessionOIDTypeVS.json index 85862cd5..ad8d9ecd 100644 --- a/src/fhir/fsh-generated/resources/ValueSet-OrganizationProfessionOIDTypeVS.json +++ b/src/fhir/fsh-generated/resources/ValueSet-OrganizationProfessionOIDTypeVS.json @@ -6,6 +6,7 @@ "description": "ValueSet for `Organization.type`", "url": "https://gematik.de/fhir/directory/ValueSet/OrganizationProfessionOIDTypeVS", "publisher": "gematik GmbH", + "version": "0.11.0", "compose": { "include": [ { diff --git a/src/fhir/fsh-generated/resources/ValueSet-OrganizationProviderTypeVS.json b/src/fhir/fsh-generated/resources/ValueSet-OrganizationProviderTypeVS.json index 6ad1dbca..2f720f12 100644 --- a/src/fhir/fsh-generated/resources/ValueSet-OrganizationProviderTypeVS.json +++ b/src/fhir/fsh-generated/resources/ValueSet-OrganizationProviderTypeVS.json @@ -6,6 +6,7 @@ "description": "ValueSet for `Organization.type`", "url": "https://gematik.de/fhir/directory/ValueSet/OrganizationProviderTypeVS", "publisher": "gematik GmbH", + "version": "0.11.0", "compose": { "include": [ { diff --git a/src/fhir/fsh-generated/resources/ValueSet-OrganizationVisibilityVS.json b/src/fhir/fsh-generated/resources/ValueSet-OrganizationVisibilityVS.json index e7223918..d9337e7f 100644 --- a/src/fhir/fsh-generated/resources/ValueSet-OrganizationVisibilityVS.json +++ b/src/fhir/fsh-generated/resources/ValueSet-OrganizationVisibilityVS.json @@ -7,6 +7,7 @@ "description": "OrganizationVisibilityVS", "url": "https://gematik.de/fhir/directory/ValueSet/OrganizationVisibilityVS", "publisher": "gematik GmbH", + "version": "0.11.0", "compose": { "include": [ { diff --git a/src/fhir/fsh-generated/resources/ValueSet-OriginVS.json b/src/fhir/fsh-generated/resources/ValueSet-OriginVS.json index b2996813..d3cfee3e 100644 --- a/src/fhir/fsh-generated/resources/ValueSet-OriginVS.json +++ b/src/fhir/fsh-generated/resources/ValueSet-OriginVS.json @@ -6,6 +6,7 @@ "description": "ValueSet for `meta.tag[Origin]`", "url": "https://gematik.de/fhir/directory/ValueSet/OriginVS", "publisher": "gematik GmbH", + "version": "0.11.0", "compose": { "include": [ { diff --git a/src/fhir/fsh-generated/resources/ValueSet-PractitionerQualificationVS.json b/src/fhir/fsh-generated/resources/ValueSet-PractitionerQualificationVS.json index 0cd5acd2..37557af6 100644 --- a/src/fhir/fsh-generated/resources/ValueSet-PractitionerQualificationVS.json +++ b/src/fhir/fsh-generated/resources/ValueSet-PractitionerQualificationVS.json @@ -6,6 +6,7 @@ "description": "ValueSet for `Practitoner.qualification`", "url": "https://gematik.de/fhir/directory/ValueSet/PractitionerQualificationVS", "publisher": "gematik GmbH", + "version": "0.11.0", "compose": { "include": [ { diff --git a/src/fhir/fsh-generated/resources/ValueSet-healthcareservice-characteristic-vs.json b/src/fhir/fsh-generated/resources/ValueSet-healthcareservice-characteristic-vs.json index f7d54ade..a419eaad 100644 --- a/src/fhir/fsh-generated/resources/ValueSet-healthcareservice-characteristic-vs.json +++ b/src/fhir/fsh-generated/resources/ValueSet-healthcareservice-characteristic-vs.json @@ -7,6 +7,7 @@ "description": "HealthCareServiceCharacteristicVS", "url": "https://gematik.de/fhir/directory/ValueSet/healthcareservice-characteristic-vs", "publisher": "gematik GmbH", + "version": "0.11.0", "compose": { "include": [ { diff --git a/src/fhir/input/fsh/codesystems/EndpointDirectoryConnectionType.fsh b/src/fhir/input/fsh/codesystems/EndpointDirectoryConnectionType.fsh index 8e4c737b..7999c311 100644 --- a/src/fhir/input/fsh/codesystems/EndpointDirectoryConnectionType.fsh +++ b/src/fhir/input/fsh/codesystems/EndpointDirectoryConnectionType.fsh @@ -5,7 +5,8 @@ Description: "CodeSystem TI specific connection types assigned to the Endpoints" * ^content = #complete * ^caseSensitive = false * #tim "TI-Messenger Endpoint" -* #tim-domain "TI-Messenger domain name" +* #tim-fa "TI-Messenger Funktionsaccount" +* #tim-bot "TI-Messenger Chatbot" * #kim-1.0 "KIM 1.0 Endpoint" * #kim-1.5 "KIM 1.5 Endpoint" * #kim-2.0 "KIM 2.0 Endpoint" diff --git a/src/fhir/input/fsh/ruleset.fsh b/src/fhir/input/fsh/ruleset.fsh index 49e26cb4..61cfcf89 100644 --- a/src/fhir/input/fsh/ruleset.fsh +++ b/src/fhir/input/fsh/ruleset.fsh @@ -1,3 +1,4 @@ RuleSet: Meta * ^status = #active * ^publisher = "gematik GmbH" +* ^version = "0.11.0" diff --git a/src/fhir/sushi-config.yaml b/src/fhir/sushi-config.yaml index a310d362..1509d32c 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.10.2 +version: 0.11.0 fhirVersion: 4.0.1 dependencies: de.basisprofil.r4: 1.4.0 From 82c28cf493d119379b5c275ff6cc3313841d8ab4 Mon Sep 17 00:00:00 2001 From: patrick-werner Date: Mon, 11 Mar 2024 10:28:25 +0100 Subject: [PATCH 10/16] feat: added changelog.md --- docs/changelog.md | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 docs/changelog.md diff --git a/docs/changelog.md b/docs/changelog.md new file mode 100644 index 00000000..5b01246d --- /dev/null +++ b/docs/changelog.md @@ -0,0 +1,36 @@ +# Changelog + +## 2024-03-10 - Version 0.11.0 + +### EndpointDirectory +- EndpointVisibility Extension hinzugefügt + +### LocationDirectory +- address muss AddressDeBasis entsprechen +- partOf `MS` +- managingOrganization `MS` + +### HealthcareServiceDirectory +- category `MS` & binding an: IHEXDShealthcareFacilityTypeCodePatientRelatedHealthcare +- type `MS` binding auf HealthcareServiceTypeVS (HealthcareServiceTypeVS enthält jetzt die Codes zuvor in HealthcareServiceSpecialtyVS enthalten waren) +- speciality binding auf neues VS: HealthcareServiceSpecialityVS +- characteristics `MS` & binding an: HealthCareServiceCharacteristicVS + +### OrganizationDirectory +- OrganizationVisibility Extension hinzugefügt +- identifier slicing umgestellt auf `#pattern, $this` +- identifier[TelematikID] hinzugefügt +- identifier[AlternativeTelematikID] hinzugefügt +- type OrganizationTypeVS aufgeteilt in zwei ValueSets & Slices: type[providerType] & type[profession] +- address `MS` +- address `MS` +- address muss AddressDeBasis entsprechen +- partOf `MS` + +### PractitionerDirectory +- identifier[TelematikID] maximal Kardinalität auf `1` reduziert +- name muss HumannameDeBasis entsprechen + +### Breaking Changes aufgrund von compliance zu dt. Basisprofilen +- Stadteile werden über die Extension http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-precinct abgebildet, district sind in den dt. Basisprofilen auf 0..0 constrained +- Bundesland wird in dt. Basisprofilen mittels: https://simplifier.net/basisprofil-de-r4/codesystemiso31662de kodiert \ No newline at end of file From 487695028875f94684376886edb2c2c7bc6e6fb8 Mon Sep 17 00:00:00 2001 From: patrick-werner Date: Mon, 11 Mar 2024 10:41:33 +0100 Subject: [PATCH 11/16] feat: added new class diagram --- images/VZD_FHIR_Directory_Resourcen-neu.svg | 1 + 1 file changed, 1 insertion(+) create mode 100644 images/VZD_FHIR_Directory_Resourcen-neu.svg diff --git a/images/VZD_FHIR_Directory_Resourcen-neu.svg b/images/VZD_FHIR_Directory_Resourcen-neu.svg new file mode 100644 index 00000000..8a09d486 --- /dev/null +++ b/images/VZD_FHIR_Directory_Resourcen-neu.svg @@ -0,0 +1 @@ + \ No newline at end of file From 9069351270dac29c15aeb617b492b780434e1d02 Mon Sep 17 00:00:00 2001 From: patrick-werner Date: Sat, 16 Mar 2024 15:12:50 +0100 Subject: [PATCH 12/16] fix: typo --- docs/changelog.md | 3 +-- src/fhir/input/fsh/codesystems/PractitionerProfessionOID.fsh | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/changelog.md b/docs/changelog.md index 5b01246d..4cb7b600 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -23,8 +23,7 @@ - identifier[AlternativeTelematikID] hinzugefügt - type OrganizationTypeVS aufgeteilt in zwei ValueSets & Slices: type[providerType] & type[profession] - address `MS` -- address `MS` -- address muss AddressDeBasis entsprechen +- address muss **AddressDeBasis** entsprechen - partOf `MS` ### PractitionerDirectory diff --git a/src/fhir/input/fsh/codesystems/PractitionerProfessionOID.fsh b/src/fhir/input/fsh/codesystems/PractitionerProfessionOID.fsh index 80ab7fe5..8e28be09 100644 --- a/src/fhir/input/fsh/codesystems/PractitionerProfessionOID.fsh +++ b/src/fhir/input/fsh/codesystems/PractitionerProfessionOID.fsh @@ -1,5 +1,5 @@ CodeSystem: PractitionerProfessionOID -Title: "CodeSystem for Practitioner's ProfessioiOID" +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) """ From de4de43e3c1e9b954524becb884cda70c81b78f8 Mon Sep 17 00:00:00 2001 From: patrick-werner Date: Sat, 16 Mar 2024 16:12:08 +0100 Subject: [PATCH 13/16] fix: reverted breaking change of VS name/url --- src/fhir/input/fsh/profiles/OrganizationDirectory.fsh | 2 +- .../{OrganizationProviderTypeVS.fsh => OrganizationTypeVS.fsh} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename src/fhir/input/fsh/valuesets/{OrganizationProviderTypeVS.fsh => OrganizationTypeVS.fsh} (75%) diff --git a/src/fhir/input/fsh/profiles/OrganizationDirectory.fsh b/src/fhir/input/fsh/profiles/OrganizationDirectory.fsh index c5dc7b9e..f57b7aba 100644 --- a/src/fhir/input/fsh/profiles/OrganizationDirectory.fsh +++ b/src/fhir/input/fsh/profiles/OrganizationDirectory.fsh @@ -41,7 +41,7 @@ organisations specific for german Healthcare and Telematics Infrastructure. * ^slicing.discriminator.path = "$this" * ^slicing.rules = #open * type contains providerType 0..* MS and profession 0..* MS -* type[providerType] from OrganizationProviderTypeVS +* type[providerType] from OrganizationTypeVS * type[profession] from OrganizationProfessionOIDTypeVS * name 1..1 MS * alias MS diff --git a/src/fhir/input/fsh/valuesets/OrganizationProviderTypeVS.fsh b/src/fhir/input/fsh/valuesets/OrganizationTypeVS.fsh similarity index 75% rename from src/fhir/input/fsh/valuesets/OrganizationProviderTypeVS.fsh rename to src/fhir/input/fsh/valuesets/OrganizationTypeVS.fsh index 8a1f3021..33a960c1 100644 --- a/src/fhir/input/fsh/valuesets/OrganizationProviderTypeVS.fsh +++ b/src/fhir/input/fsh/valuesets/OrganizationTypeVS.fsh @@ -1,4 +1,4 @@ -ValueSet: OrganizationProviderTypeVS +ValueSet: OrganizationTypeVS Description: "ValueSet for `Organization.type`" * insert Meta * include codes from system OrganizationProviderType From 3cfe0ea872bfbde247c1883ef2aa5ca30b4643ce Mon Sep 17 00:00:00 2001 From: patrick-werner Date: Sat, 16 Mar 2024 16:13:20 +0100 Subject: [PATCH 14/16] commiting json // moved changelog.md --- docs/changelog.md => changelog.md | 0 src/fhir/fsh-generated/fsh-index.json | 6 ++--- src/fhir/fsh-generated/fsh-index.txt | 2 +- .../CodeSystem-PractitionerProfessionOID.json | 2 +- ...StructureDefinition-EndpointDirectory.json | 12 ---------- ...tructureDefinition-EndpointVisibility.json | 7 ------ ...Definition-HealthcareServiceDirectory.json | 12 ---------- ...StructureDefinition-LocationDirectory.json | 12 ---------- ...ctureDefinition-OrganizationDirectory.json | 24 +------------------ ...tureDefinition-OrganizationVisibility.json | 7 ------ ...ctureDefinition-PractitionerDirectory.json | 22 ----------------- ...eDefinition-PractitionerRoleDirectory.json | 22 ----------------- .../ValueSet-OrganizationProviderTypeVS.json | 17 ------------- 13 files changed, 6 insertions(+), 139 deletions(-) rename docs/changelog.md => changelog.md (100%) delete mode 100644 src/fhir/fsh-generated/resources/ValueSet-OrganizationProviderTypeVS.json diff --git a/docs/changelog.md b/changelog.md similarity index 100% rename from docs/changelog.md rename to changelog.md diff --git a/src/fhir/fsh-generated/fsh-index.json b/src/fhir/fsh-generated/fsh-index.json index 03326cc3..b9fffa30 100644 --- a/src/fhir/fsh-generated/fsh-index.json +++ b/src/fhir/fsh-generated/fsh-index.json @@ -296,10 +296,10 @@ "endLine": 4 }, { - "outputFile": "ValueSet-OrganizationProviderTypeVS.json", - "fshName": "OrganizationProviderTypeVS", + "outputFile": "ValueSet-OrganizationTypeVS.json", + "fshName": "OrganizationTypeVS", "fshType": "ValueSet", - "fshFile": "valuesets/OrganizationProviderTypeVS.fsh", + "fshFile": "valuesets/OrganizationTypeVS.fsh", "startLine": 1, "endLine": 4 }, diff --git a/src/fhir/fsh-generated/fsh-index.txt b/src/fhir/fsh-generated/fsh-index.txt index f213f856..5bd4fefa 100644 --- a/src/fhir/fsh-generated/fsh-index.txt +++ b/src/fhir/fsh-generated/fsh-index.txt @@ -36,7 +36,7 @@ ValueSet-HealthcareServiceTypeVS.json Healthca ValueSet-HealthcareSpecialityTypeVS.json HealthcareServiceSpecialityVS ValueSet valuesets/HealthcareServiceSpecialityVS.fsh 1 - 7 ValueSet-IHEXDShealthcareFacilityTypeCodePatientRelatedHealthcare.json IHEXDShealthcareFacilityTypeCodePatientRelatedHealthcare ValueSet valuesets/HealthCareServiceCategory.fsh 3 - 62 ValueSet-OrganizationProfessionOIDTypeVS.json OrganizationProfessionOIDTypeVS ValueSet valuesets/OrganizationProfessionOIDTypeVS.fsh 1 - 4 -ValueSet-OrganizationProviderTypeVS.json OrganizationProviderTypeVS ValueSet valuesets/OrganizationProviderTypeVS.fsh 1 - 4 +ValueSet-OrganizationTypeVS.json OrganizationTypeVS ValueSet valuesets/OrganizationTypeVS.fsh 1 - 4 ValueSet-OrganizationVisibilityVS.json OrganizationVisibilityVS ValueSet profiles/Extension.fsh 18 - 23 ValueSet-OriginVS.json OriginVS ValueSet valuesets/OriginVS.fsh 1 - 4 ValueSet-PractitionerQualificationVS.json PractitionerQualificationVS ValueSet valuesets/PractitionerQualificationVS.fsh 1 - 457 diff --git a/src/fhir/fsh-generated/resources/CodeSystem-PractitionerProfessionOID.json b/src/fhir/fsh-generated/resources/CodeSystem-PractitionerProfessionOID.json index a4178a66..858faf7f 100644 --- a/src/fhir/fsh-generated/resources/CodeSystem-PractitionerProfessionOID.json +++ b/src/fhir/fsh-generated/resources/CodeSystem-PractitionerProfessionOID.json @@ -4,7 +4,7 @@ "content": "complete", "name": "PractitionerProfessionOID", "id": "PractitionerProfessionOID", - "title": "CodeSystem for Practitioner's ProfessioiOID", + "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)", "url": "https://gematik.de/fhir/directory/CodeSystem/PractitionerProfessionOID", "concept": [ diff --git a/src/fhir/fsh-generated/resources/StructureDefinition-EndpointDirectory.json b/src/fhir/fsh-generated/resources/StructureDefinition-EndpointDirectory.json index de721d93..172af473 100644 --- a/src/fhir/fsh-generated/resources/StructureDefinition-EndpointDirectory.json +++ b/src/fhir/fsh-generated/resources/StructureDefinition-EndpointDirectory.json @@ -9,18 +9,6 @@ "publisher": "gematik GmbH", "description": "Endpoints for applications in the gematik Directory", "fhirVersion": "4.0.1", - "mapping": [ - { - "identity": "rim", - "uri": "http://hl7.org/v3", - "name": "RIM Mapping" - }, - { - "identity": "w5", - "uri": "http://hl7.org/fhir/fivews", - "name": "FiveWs Pattern Mapping" - } - ], "kind": "resource", "abstract": false, "type": "Endpoint", diff --git a/src/fhir/fsh-generated/resources/StructureDefinition-EndpointVisibility.json b/src/fhir/fsh-generated/resources/StructureDefinition-EndpointVisibility.json index c07eb540..750d2275 100644 --- a/src/fhir/fsh-generated/resources/StructureDefinition-EndpointVisibility.json +++ b/src/fhir/fsh-generated/resources/StructureDefinition-EndpointVisibility.json @@ -9,13 +9,6 @@ "publisher": "gematik GmbH", "description": "Visibility of an Endpoint in the FHIR-VZD. This Extensions includes codes of use-cases im which this Endpoint SHALL not be visible.", "fhirVersion": "4.0.1", - "mapping": [ - { - "identity": "rim", - "uri": "http://hl7.org/v3", - "name": "RIM Mapping" - } - ], "kind": "complex-type", "abstract": false, "context": [ diff --git a/src/fhir/fsh-generated/resources/StructureDefinition-HealthcareServiceDirectory.json b/src/fhir/fsh-generated/resources/StructureDefinition-HealthcareServiceDirectory.json index beb94ab9..5c1db2ea 100644 --- a/src/fhir/fsh-generated/resources/StructureDefinition-HealthcareServiceDirectory.json +++ b/src/fhir/fsh-generated/resources/StructureDefinition-HealthcareServiceDirectory.json @@ -9,18 +9,6 @@ "publisher": "gematik GmbH", "description": "Defines the data structure for medical, regulatory and technical\norganisations specific for german Healthcare and Telematics Infrastructure.", "fhirVersion": "4.0.1", - "mapping": [ - { - "identity": "rim", - "uri": "http://hl7.org/v3", - "name": "RIM Mapping" - }, - { - "identity": "w5", - "uri": "http://hl7.org/fhir/fivews", - "name": "FiveWs Pattern Mapping" - } - ], "kind": "resource", "abstract": false, "type": "HealthcareService", diff --git a/src/fhir/fsh-generated/resources/StructureDefinition-LocationDirectory.json b/src/fhir/fsh-generated/resources/StructureDefinition-LocationDirectory.json index 382344dd..2c3b8299 100644 --- a/src/fhir/fsh-generated/resources/StructureDefinition-LocationDirectory.json +++ b/src/fhir/fsh-generated/resources/StructureDefinition-LocationDirectory.json @@ -9,18 +9,6 @@ "publisher": "gematik GmbH", "description": "Defines the data structure for medical, regulatory and technical\norganisations specific for german Healthcare and Telematics Infrastructure.", "fhirVersion": "4.0.1", - "mapping": [ - { - "identity": "rim", - "uri": "http://hl7.org/v3", - "name": "RIM Mapping" - }, - { - "identity": "w5", - "uri": "http://hl7.org/fhir/fivews", - "name": "FiveWs Pattern Mapping" - } - ], "kind": "resource", "abstract": false, "type": "Location", diff --git a/src/fhir/fsh-generated/resources/StructureDefinition-OrganizationDirectory.json b/src/fhir/fsh-generated/resources/StructureDefinition-OrganizationDirectory.json index 4ffd75d1..7986f54b 100644 --- a/src/fhir/fsh-generated/resources/StructureDefinition-OrganizationDirectory.json +++ b/src/fhir/fsh-generated/resources/StructureDefinition-OrganizationDirectory.json @@ -9,28 +9,6 @@ "publisher": "gematik GmbH", "description": "Defines the data structure for medical, regulatory and technical \norganisations specific for german Healthcare and Telematics Infrastructure.", "fhirVersion": "4.0.1", - "mapping": [ - { - "identity": "v2", - "uri": "http://hl7.org/v2", - "name": "HL7 v2 Mapping" - }, - { - "identity": "rim", - "uri": "http://hl7.org/v3", - "name": "RIM Mapping" - }, - { - "identity": "servd", - "uri": "http://www.omg.org/spec/ServD/1.0/", - "name": "ServD" - }, - { - "identity": "w5", - "uri": "http://hl7.org/fhir/fivews", - "name": "FiveWs Pattern Mapping" - } - ], "kind": "resource", "abstract": false, "type": "Organization", @@ -228,7 +206,7 @@ "mustSupport": true, "binding": { "strength": "required", - "valueSet": "https://gematik.de/fhir/directory/ValueSet/OrganizationProviderTypeVS" + "valueSet": "https://gematik.de/fhir/directory/ValueSet/OrganizationTypeVS" } }, { diff --git a/src/fhir/fsh-generated/resources/StructureDefinition-OrganizationVisibility.json b/src/fhir/fsh-generated/resources/StructureDefinition-OrganizationVisibility.json index 23ec6163..feda21d1 100644 --- a/src/fhir/fsh-generated/resources/StructureDefinition-OrganizationVisibility.json +++ b/src/fhir/fsh-generated/resources/StructureDefinition-OrganizationVisibility.json @@ -9,13 +9,6 @@ "publisher": "gematik GmbH", "description": "Visibility of an Organization in the FHIR-VZD. This Extensions includes codes of use-cases im which this Organization SHALL not be visible.", "fhirVersion": "4.0.1", - "mapping": [ - { - "identity": "rim", - "uri": "http://hl7.org/v3", - "name": "RIM Mapping" - } - ], "kind": "complex-type", "abstract": false, "context": [ diff --git a/src/fhir/fsh-generated/resources/StructureDefinition-PractitionerDirectory.json b/src/fhir/fsh-generated/resources/StructureDefinition-PractitionerDirectory.json index f6ab5029..f7a916fc 100644 --- a/src/fhir/fsh-generated/resources/StructureDefinition-PractitionerDirectory.json +++ b/src/fhir/fsh-generated/resources/StructureDefinition-PractitionerDirectory.json @@ -8,28 +8,6 @@ "status": "active", "publisher": "gematik GmbH", "fhirVersion": "4.0.1", - "mapping": [ - { - "identity": "v2", - "uri": "http://hl7.org/v2", - "name": "HL7 v2 Mapping" - }, - { - "identity": "rim", - "uri": "http://hl7.org/v3", - "name": "RIM Mapping" - }, - { - "identity": "servd", - "uri": "http://www.omg.org/spec/ServD/1.0/", - "name": "ServD" - }, - { - "identity": "w5", - "uri": "http://hl7.org/fhir/fivews", - "name": "FiveWs Pattern Mapping" - } - ], "kind": "resource", "abstract": false, "type": "Practitioner", diff --git a/src/fhir/fsh-generated/resources/StructureDefinition-PractitionerRoleDirectory.json b/src/fhir/fsh-generated/resources/StructureDefinition-PractitionerRoleDirectory.json index 24d658b5..75c60bbe 100644 --- a/src/fhir/fsh-generated/resources/StructureDefinition-PractitionerRoleDirectory.json +++ b/src/fhir/fsh-generated/resources/StructureDefinition-PractitionerRoleDirectory.json @@ -8,28 +8,6 @@ "status": "active", "publisher": "gematik GmbH", "fhirVersion": "4.0.1", - "mapping": [ - { - "identity": "v2", - "uri": "http://hl7.org/v2", - "name": "HL7 v2 Mapping" - }, - { - "identity": "rim", - "uri": "http://hl7.org/v3", - "name": "RIM Mapping" - }, - { - "identity": "servd", - "uri": "http://www.omg.org/spec/ServD/1.0/", - "name": "ServD" - }, - { - "identity": "w5", - "uri": "http://hl7.org/fhir/fivews", - "name": "FiveWs Pattern Mapping" - } - ], "kind": "resource", "abstract": false, "type": "PractitionerRole", diff --git a/src/fhir/fsh-generated/resources/ValueSet-OrganizationProviderTypeVS.json b/src/fhir/fsh-generated/resources/ValueSet-OrganizationProviderTypeVS.json deleted file mode 100644 index 2f720f12..00000000 --- a/src/fhir/fsh-generated/resources/ValueSet-OrganizationProviderTypeVS.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "resourceType": "ValueSet", - "status": "active", - "name": "OrganizationProviderTypeVS", - "id": "OrganizationProviderTypeVS", - "description": "ValueSet for `Organization.type`", - "url": "https://gematik.de/fhir/directory/ValueSet/OrganizationProviderTypeVS", - "publisher": "gematik GmbH", - "version": "0.11.0", - "compose": { - "include": [ - { - "system": "https://gematik.de/fhir/directory/CodeSystem/OrganizationProviderType" - } - ] - } -} From 7029a3a75adec9e64a1e870e0ddf91fa0e8082d6 Mon Sep 17 00:00:00 2001 From: patrick-werner Date: Wed, 20 Mar 2024 08:18:55 +0100 Subject: [PATCH 15/16] commiting missing VS --- .../resources/ValueSet-OrganizationTypeVS.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 src/fhir/fsh-generated/resources/ValueSet-OrganizationTypeVS.json diff --git a/src/fhir/fsh-generated/resources/ValueSet-OrganizationTypeVS.json b/src/fhir/fsh-generated/resources/ValueSet-OrganizationTypeVS.json new file mode 100644 index 00000000..08ae0f19 --- /dev/null +++ b/src/fhir/fsh-generated/resources/ValueSet-OrganizationTypeVS.json @@ -0,0 +1,17 @@ +{ + "resourceType": "ValueSet", + "status": "active", + "name": "OrganizationTypeVS", + "id": "OrganizationTypeVS", + "description": "ValueSet for `Organization.type`", + "url": "https://gematik.de/fhir/directory/ValueSet/OrganizationTypeVS", + "publisher": "gematik GmbH", + "version": "0.11.0", + "compose": { + "include": [ + { + "system": "https://gematik.de/fhir/directory/CodeSystem/OrganizationProviderType" + } + ] + } +} From 8379f821eb756707b1d281b4440ce25f41f3e6de Mon Sep 17 00:00:00 2001 From: patrick-werner Date: Wed, 20 Mar 2024 08:22:48 +0100 Subject: [PATCH 16/16] added gitignore updated CI pipeline --- .github/workflows/FHIRValidator.yml | 10 +- .gitignore | 148 ++++++++++++++++++++++++++++ 2 files changed, 155 insertions(+), 3 deletions(-) diff --git a/.github/workflows/FHIRValidator.yml b/.github/workflows/FHIRValidator.yml index ae43c27b..668f676d 100644 --- a/.github/workflows/FHIRValidator.yml +++ b/.github/workflows/FHIRValidator.yml @@ -25,12 +25,12 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 # Java and .NET are already installed on ubuntu-latest - name: Firely.Terminal (GitHub Actions) - uses: FirelyTeam/firely-terminal-pipeline@v0.3.5 + uses: FirelyTeam/firely-terminal-pipeline@v0.4.0 with: PATH_TO_CONFORMANCE_RESOURCES: src/fhir/fsh-generated/resources/ #PATH_TO_EXAMPLES: Examples @@ -43,9 +43,13 @@ jobs: SIMPLIFIER_PASSWORD: ${{ secrets.SIMPLIFIER_PASSWORD }} SUSHI_ENABLED: true SUSHI_OPTIONS: src/fhir/ + SUSHI_VERSION: 3.8.0 EXPECTED_FAILS: VALIDATION_CONFORMANCE_DOTNET VALIDATION_CONFORMANCE_JAVA VALIDATION_EXAMPLES_JAVA - name: Add & Commit - uses: EndBug/add-and-commit@v7 + uses: EndBug/add-and-commit@v9 with: + committer_name: GitHub Actions Bot + committer_email: ActionBot@github.com add: 'src/fhir/fsh-generated/resources/' + message: auto-generated FHIR files by GitHub Actions (CI FSH to FHIR Validation) diff --git a/.gitignore b/.gitignore index 55edb258..d3f6e745 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,151 @@ src/fhir/temp src/fhir/template src/fhir/input-cache *.bkp +### JetBrains template +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +# User-specific stuff +.idea/**/workspace.xml +.idea/**/tasks.xml +.idea/**/usage.statistics.xml +.idea/**/dictionaries +.idea/**/shelf + +# AWS User-specific +.idea/**/aws.xml + +# Generated files +.idea/**/contentModel.xml + +# Sensitive or high-churn files +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.local.xml +.idea/**/sqlDataSources.xml +.idea/**/dynamic.xml +.idea/**/uiDesigner.xml +.idea/**/dbnavigator.xml + +# Gradle +.idea/**/gradle.xml +.idea/**/libraries + +# Gradle and Maven with auto-import +# When using Gradle or Maven with auto-import, you should exclude module files, +# since they will be recreated, and may cause churn. Uncomment if using +# auto-import. +# .idea/artifacts +# .idea/compiler.xml +# .idea/jarRepositories.xml +# .idea/modules.xml +# .idea/*.iml +# .idea/modules +# *.iml +# *.ipr + +# CMake +cmake-build-*/ + +# Mongo Explorer plugin +.idea/**/mongoSettings.xml + +# File-based project format +*.iws + +# IntelliJ +out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Cursive Clojure plugin +.idea/replstate.xml + +# SonarLint plugin +.idea/sonarlint/ + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + +# Editor-based Rest Client +.idea/httpRequests + +# Android studio 3.1+ serialized cache file +.idea/caches/build_file_checksums.ser + +### Linux template +*~ + +# temporary files which can be created if a process still has a handle open of a deleted file +.fuse_hidden* + +# KDE directory preferences +.directory + +# Linux trash folder which might appear on any partition or disk +.Trash-* + +# .nfs files are created when an open file is removed but is still being accessed +.nfs* + +### Windows template +# Windows thumbnail cache files +Thumbs.db +Thumbs.db:encryptable +ehthumbs.db +ehthumbs_vista.db + +# Dump file +*.stackdump + +# Folder config file +[Dd]esktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msix +*.msm +*.msp + +# Windows shortcuts +*.lnk + +### macOS template +# General +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk +