Skip to content

Commit 06168c0

Browse files
patrick-wernerpatrick-werner
committed
changed scope of OwnerTelematikIdEx to Resource
1 parent b154862 commit 06168c0

14 files changed

+111
-75
lines changed

‎changelog.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
- `change`: removed KBV_CS_SFHIR_BAR2_WBO_OID_URL (urn:oid:1.2.276.0.76.5.114) from PractitionerQualificationVS
66
- `fix`: set VS binding on correct element for Endpoint.connectionType. Was on code, but should be on connectionType(Coding)
77
- `feat`: added holderId Extension to PractitionerRoleDirectory and HealthcareServiceDirectory to represent the holderId.
8-
- `feat`: added EndpointOwnerTelematikIdEx
9-
- `feat`: added EndpointOwnerTelematikIdEx to HealthcareServiceDirectory
8+
- `feat`: added OwnerTelematikIdEx Extension
9+
- `feat`: added OwnerTelematikIdEx to HealthcareServiceDirectory, PractitionerRoleDirectory and HealthcareServiceDirectory
1010
- `feat`: added SearchParameter HolderIdSP to enable search for holderIds
11-
- `feat`: added SearchParameter EndpointOwnerTelematikIdSP to enable search for Endpoint owners TelematikId
11+
- `feat`: added SearchParameter OwnerTelematikIdSP to enable search for owners TelematikId
1212
- `feat`: split VZD-Service-Opening-TimeInv in two Invariants to report better validation errors to implementers
1313
- `change`: moved .telecom from Practitioner to PractitionerRole
1414

‎src/fhir/fsh-generated/fsh-index.json

+22-22
Original file line numberDiff line numberDiff line change
@@ -343,14 +343,6 @@
343343
"startLine": 13,
344344
"endLine": 22
345345
},
346-
{
347-
"outputFile": "SearchParameter-EndpointOwnerTelematikIdSP.json",
348-
"fshName": "EndpointOwnerTelematikIdSP",
349-
"fshType": "Instance",
350-
"fshFile": "searchParameter.fsh",
351-
"startLine": 102,
352-
"endLine": 111
353-
},
354346
{
355347
"outputFile": "SearchParameter-EndpointVisibilitySP.json",
356348
"fshName": "EndpointVisibilitySP",
@@ -431,6 +423,14 @@
431423
"startLine": 24,
432424
"endLine": 33
433425
},
426+
{
427+
"outputFile": "SearchParameter-OwnerTelematikIdSP.json",
428+
"fshName": "OwnerTelematikIdSP",
429+
"fshType": "Instance",
430+
"fshFile": "searchParameter.fsh",
431+
"startLine": 102,
432+
"endLine": 111
433+
},
434434
{
435435
"outputFile": "SearchParameter-PractitionerQualificationSP.json",
436436
"fshName": "PractitionerQualificationSP",
@@ -479,14 +479,6 @@
479479
"startLine": 1,
480480
"endLine": 29
481481
},
482-
{
483-
"outputFile": "StructureDefinition-EndpointOwnerTelematikIdEx.json",
484-
"fshName": "EndpointOwnerTelematikIdEx",
485-
"fshType": "Extension",
486-
"fshFile": "profiles/Extension.fsh",
487-
"startLine": 113,
488-
"endLine": 120
489-
},
490482
{
491483
"outputFile": "StructureDefinition-EndpointVisibility.json",
492484
"fshName": "EndpointVisibility",
@@ -501,15 +493,15 @@
501493
"fshType": "Profile",
502494
"fshFile": "profiles/HealthcareServiceDirectory.fsh",
503495
"startLine": 1,
504-
"endLine": 75
496+
"endLine": 77
505497
},
506498
{
507499
"outputFile": "StructureDefinition-HealthcareServiceDirectoryStrict.json",
508500
"fshName": "HealthcareServiceDirectoryStrict",
509501
"fshType": "Profile",
510502
"fshFile": "profiles/HealthcareServiceDirectory.fsh",
511-
"startLine": 77,
512-
"endLine": 113
503+
"startLine": 79,
504+
"endLine": 115
513505
},
514506
{
515507
"outputFile": "StructureDefinition-LocationDirectory.json",
@@ -551,6 +543,14 @@
551543
"startLine": 23,
552544
"endLine": 33
553545
},
546+
{
547+
"outputFile": "StructureDefinition-OwnerTelematikIdEx.json",
548+
"fshName": "OwnerTelematikIdEx",
549+
"fshType": "Extension",
550+
"fshFile": "profiles/Extension.fsh",
551+
"startLine": 113,
552+
"endLine": 120
553+
},
554554
{
555555
"outputFile": "StructureDefinition-PhysicalFeaturesAdditionalNoteEX.json",
556556
"fshName": "PhysicalFeaturesAdditionalNoteEX",
@@ -581,15 +581,15 @@
581581
"fshType": "Profile",
582582
"fshFile": "profiles/PractitionerRoleDirectory.fsh",
583583
"startLine": 1,
584-
"endLine": 23
584+
"endLine": 25
585585
},
586586
{
587587
"outputFile": "StructureDefinition-PractitionerRoleDirectoryStrict.json",
588588
"fshName": "PractitionerRoleDirectoryStrict",
589589
"fshType": "Profile",
590590
"fshFile": "profiles/PractitionerRoleDirectory.fsh",
591-
"startLine": 25,
592-
"endLine": 41
591+
"startLine": 27,
592+
"endLine": 43
593593
},
594594
{
595595
"outputFile": "StructureDefinition-ServiceCoverageArea.json",

‎src/fhir/fsh-generated/fsh-index.txt

+6-6
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ Practitioner-TIPractitionerExample001.json PractitionerE
4242
Practitioner-TIPractitionerExampleDentist.json PractitionerExampleDentist Instance examples/Examples001.fsh 13 - 26
4343
PractitionerRole-PractitionerRoleExample.json PractitionerRoleExample Instance examples/Examples001.fsh 28 - 35
4444
SearchParameter-EndpointAddressSP.json EndpointAddressSP Instance searchParameter.fsh 13 - 22
45-
SearchParameter-EndpointOwnerTelematikIdSP.json EndpointOwnerTelematikIdSP Instance searchParameter.fsh 102 - 111
4645
SearchParameter-EndpointVisibilitySP.json EndpointVisibilitySP Instance searchParameter.fsh 46 - 55
4746
SearchParameter-HealthcareService-endpoint.json HealthcareService-endpoint Instance upliftedRefChains.fsh 65 - 97
4847
SearchParameter-HealthcareService-location.json HealthcareService-location Instance upliftedRefChains.fsh 35 - 63
@@ -53,26 +52,27 @@ SearchParameter-OrganizationAliasSP.json OrganizationA
5352
SearchParameter-OrganizationNCPeHCountrySP.json OrganizationNCPeHCountrySP Instance searchParameter.fsh 68 - 77
5453
SearchParameter-OrganizationTypeDisplaySP.json OrganizationTypeDisplaySP Instance searchParameter.fsh 1 - 11
5554
SearchParameter-OrganizationVisibilitySP.json OrganizationVisibilitySP Instance searchParameter.fsh 24 - 33
55+
SearchParameter-OwnerTelematikIdSP.json OwnerTelematikIdSP Instance searchParameter.fsh 102 - 111
5656
SearchParameter-PractitionerQualificationSP.json PractitionerQualificationSP Instance searchParameter.fsh 35 - 44
5757
SearchParameter-PractitionerRole-endpoint.json PractitionerRole-endpoint Instance upliftedRefChains.fsh 161 - 190
5858
SearchParameter-PractitionerRole-location.json PractitionerRole-location Instance upliftedRefChains.fsh 131 - 159
5959
SearchParameter-PractitionerRole-practitioner.json PractitionerRole-practitioner Instance upliftedRefChains.fsh 99 - 129
6060
StructureDefinition-CodingWithCodeAndSystem.json CodingWithCodeAndSystem Profile profiles/DataType.fsh 1 - 8
6161
StructureDefinition-EndpointDirectory.json EndpointDirectory Profile profiles/EndpointDirectory.fsh 1 - 29
62-
StructureDefinition-EndpointOwnerTelematikIdEx.json EndpointOwnerTelematikIdEx Extension profiles/Extension.fsh 113 - 120
6362
StructureDefinition-EndpointVisibility.json EndpointVisibility Extension profiles/Extension.fsh 35 - 45
64-
StructureDefinition-HealthcareServiceDirectory.json HealthcareServiceDirectory Profile profiles/HealthcareServiceDirectory.fsh 1 - 75
65-
StructureDefinition-HealthcareServiceDirectoryStrict.json HealthcareServiceDirectoryStrict Profile profiles/HealthcareServiceDirectory.fsh 77 - 113
63+
StructureDefinition-HealthcareServiceDirectory.json HealthcareServiceDirectory Profile profiles/HealthcareServiceDirectory.fsh 1 - 77
64+
StructureDefinition-HealthcareServiceDirectoryStrict.json HealthcareServiceDirectoryStrict Profile profiles/HealthcareServiceDirectory.fsh 79 - 115
6665
StructureDefinition-LocationDirectory.json LocationDirectory Profile profiles/LocationDirectory.fsh 1 - 34
6766
StructureDefinition-LocationDirectoryStrict.json LocationDirectoryStrict Profile profiles/LocationDirectory.fsh 36 - 54
6867
StructureDefinition-OrganizationDirectory.json OrganizationDirectory Profile profiles/OrganizationDirectory.fsh 1 - 56
6968
StructureDefinition-OrganizationDirectoryStrict.json OrganizationDirectoryStrict Profile profiles/OrganizationDirectory.fsh 58 - 74
7069
StructureDefinition-OrganizationVisibility.json OrganizationVisibility Extension profiles/Extension.fsh 23 - 33
70+
StructureDefinition-OwnerTelematikIdEx.json OwnerTelematikIdEx Extension profiles/Extension.fsh 113 - 120
7171
StructureDefinition-PhysicalFeaturesAdditionalNoteEX.json PhysicalFeaturesAdditionalNoteEX Extension profiles/Extension.fsh 65 - 72
7272
StructureDefinition-PractitionerDirectory.json PractitionerDirectory Profile profiles/PractitionerDirectory.fsh 1 - 36
7373
StructureDefinition-PractitionerDirectoryStrict.json PractitionerDirectoryStrict Profile profiles/PractitionerDirectory.fsh 38 - 56
74-
StructureDefinition-PractitionerRoleDirectory.json PractitionerRoleDirectory Profile profiles/PractitionerRoleDirectory.fsh 1 - 23
75-
StructureDefinition-PractitionerRoleDirectoryStrict.json PractitionerRoleDirectoryStrict Profile profiles/PractitionerRoleDirectory.fsh 25 - 41
74+
StructureDefinition-PractitionerRoleDirectory.json PractitionerRoleDirectory Profile profiles/PractitionerRoleDirectory.fsh 1 - 25
75+
StructureDefinition-PractitionerRoleDirectoryStrict.json PractitionerRoleDirectoryStrict Profile profiles/PractitionerRoleDirectory.fsh 27 - 43
7676
StructureDefinition-ServiceCoverageArea.json ServiceCoverageArea Extension profiles/Extension.fsh 1 - 12
7777
StructureDefinition-ServiceCoveragePostalCode.json ServiceCoveragePostalCode Extension profiles/Extension.fsh 14 - 21
7878
StructureDefinition-SpecialOpeningTimesEX.json SpecialOpeningTimesEX Extension profiles/Extension.fsh 47 - 63

‎src/fhir/fsh-generated/resources/SearchParameter-EndpointOwnerTelematikIdSP.json

-18
This file was deleted.

‎src/fhir/fsh-generated/resources/SearchParameter-OwnerTelematikIdSP.json

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"resourceType": "SearchParameter",
3+
"id": "OwnerTelematikIdSP",
4+
"url": "https://gematik.de/fhir/directory/SearchParameter/OwnerTelematikIdSP",
5+
"version": "0.13.0",
6+
"status": "active",
7+
"experimental": false,
8+
"publisher": "gematik GmbH",
9+
"date": "2024-10-29",
10+
"name": "owner-telematik-id",
11+
"description": "SearchParameter for the Telematik ID of the owner of a resource using the OwnerTelematikIdEx extension",
12+
"code": "owner-telematik-id",
13+
"base": [
14+
"Resource"
15+
],
16+
"type": "token",
17+
"expression": "Resource.extension.where(url='https://gematik.de/fhir/directory/StructureDefinition/OwnerTelematikIdEx').value"
18+
}

‎src/fhir/fsh-generated/resources/StructureDefinition-EndpointDirectory.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -82,16 +82,16 @@
8282
"mustSupport": true
8383
},
8484
{
85-
"id": "Endpoint.extension:endpointOwnerTelematikId",
85+
"id": "Endpoint.extension:ownerTelematikId",
8686
"path": "Endpoint.extension",
87-
"sliceName": "endpointOwnerTelematikId",
87+
"sliceName": "ownerTelematikId",
8888
"min": 0,
8989
"max": "1",
9090
"type": [
9191
{
9292
"code": "Extension",
9393
"profile": [
94-
"https://gematik.de/fhir/directory/StructureDefinition/EndpointOwnerTelematikIdEx"
94+
"https://gematik.de/fhir/directory/StructureDefinition/OwnerTelematikIdEx"
9595
]
9696
}
9797
],

‎src/fhir/fsh-generated/resources/StructureDefinition-HealthcareServiceDirectory.json

+16
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,22 @@
8181
],
8282
"mustSupport": true
8383
},
84+
{
85+
"id": "HealthcareService.extension:ownerTelematikId",
86+
"path": "HealthcareService.extension",
87+
"sliceName": "ownerTelematikId",
88+
"min": 0,
89+
"max": "1",
90+
"type": [
91+
{
92+
"code": "Extension",
93+
"profile": [
94+
"https://gematik.de/fhir/directory/StructureDefinition/OwnerTelematikIdEx"
95+
]
96+
}
97+
],
98+
"mustSupport": true
99+
},
84100
{
85101
"id": "HealthcareService.identifier",
86102
"path": "HealthcareService.identifier",

‎src/fhir/fsh-generated/resources/StructureDefinition-EndpointOwnerTelematikIdEx.json renamed to ‎src/fhir/fsh-generated/resources/StructureDefinition-OwnerTelematikIdEx.json

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
{
22
"resourceType": "StructureDefinition",
3-
"id": "EndpointOwnerTelematikIdEx",
4-
"url": "https://gematik.de/fhir/directory/StructureDefinition/EndpointOwnerTelematikIdEx",
3+
"id": "OwnerTelematikIdEx",
4+
"url": "https://gematik.de/fhir/directory/StructureDefinition/OwnerTelematikIdEx",
55
"version": "0.13.0",
6-
"name": "EndpointOwnerTelematikIdEx",
7-
"title": "EndpointOwnerTelematikIdEx",
6+
"name": "OwnerTelematikIdEx",
7+
"title": "OwnerTelematikIdEx",
88
"status": "active",
99
"experimental": false,
1010
"date": "2024-10-29",
1111
"publisher": "gematik GmbH",
12-
"description": "Extension for the Telematik ID of the owner of an Endpoint",
12+
"description": "Extension for the Telematik ID of the owner of a Resource",
1313
"fhirVersion": "4.0.1",
1414
"kind": "complex-type",
1515
"abstract": false,
1616
"context": [
1717
{
18-
"expression": "Endpoint",
18+
"expression": "Resource",
1919
"type": "element"
2020
}
2121
],
@@ -27,8 +27,8 @@
2727
{
2828
"id": "Extension",
2929
"path": "Extension",
30-
"short": "EndpointOwnerTelematikIdEx",
31-
"definition": "Extension for the Telematik ID of the owner of an Endpoint"
30+
"short": "OwnerTelematikIdEx",
31+
"definition": "Extension for the Telematik ID of the owner of a Resource"
3232
},
3333
{
3434
"id": "Extension.extension",
@@ -38,7 +38,7 @@
3838
{
3939
"id": "Extension.url",
4040
"path": "Extension.url",
41-
"fixedUri": "https://gematik.de/fhir/directory/StructureDefinition/EndpointOwnerTelematikIdEx"
41+
"fixedUri": "https://gematik.de/fhir/directory/StructureDefinition/OwnerTelematikIdEx"
4242
},
4343
{
4444
"id": "Extension.value[x]",

‎src/fhir/fsh-generated/resources/StructureDefinition-PractitionerRoleDirectory.json

+16
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,22 @@
8080
],
8181
"mustSupport": true
8282
},
83+
{
84+
"id": "PractitionerRole.extension:ownerTelematikId",
85+
"path": "PractitionerRole.extension",
86+
"sliceName": "ownerTelematikId",
87+
"min": 0,
88+
"max": "1",
89+
"type": [
90+
{
91+
"code": "Extension",
92+
"profile": [
93+
"https://gematik.de/fhir/directory/StructureDefinition/OwnerTelematikIdEx"
94+
]
95+
}
96+
],
97+
"mustSupport": true
98+
},
8399
{
84100
"id": "PractitionerRole.practitioner",
85101
"path": "PractitionerRole.practitioner",

‎src/fhir/input/fsh/profiles/EndpointDirectory.fsh

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Description: "Endpoints for applications in the gematik Directory"
77
* id MS
88
* extension contains
99
EndpointVisibility named endpointVisibility 0..* MS and
10-
EndpointOwnerTelematikIdEx named endpointOwnerTelematikId 0..1 MS
10+
OwnerTelematikIdEx named ownerTelematikId 0..1 MS
1111
* meta.tag 1.. MS
1212
* ^slicing.discriminator.type = #pattern
1313
* ^slicing.discriminator.path = "system"

‎src/fhir/input/fsh/profiles/Extension.fsh

+5-5
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,11 @@ Context: HealthcareService, PractitionerRole
110110
* value[x] only code
111111
* valueCode 1.. MS
112112

113-
Extension: EndpointOwnerTelematikIdEx
114-
Id: EndpointOwnerTelematikIdEx
115-
Title: "EndpointOwnerTelematikIdEx"
116-
Description: "Extension for the Telematik ID of the owner of an Endpoint"
117-
Context: Endpoint
113+
Extension: OwnerTelematikIdEx
114+
Id: OwnerTelematikIdEx
115+
Title: "OwnerTelematikIdEx"
116+
Description: "Extension for the Telematik ID of the owner of a Resource"
117+
Context: Resource
118118
* insert Meta
119119
* value[x] only $IdentifierTelematikID
120120
* valueIdentifier 1.. MS

‎src/fhir/input/fsh/profiles/HealthcareServiceDirectory.fsh

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ Description: """Defines the data structure for medical, regulatory and technical
55
organisations specific for german Healthcare and Telematics Infrastructure.
66
"""
77
* insert Meta
8-
* extension contains HolderIdEx named holderId 0..* MS
8+
* extension contains
9+
HolderIdEx named holderId 0..* MS and
10+
OwnerTelematikIdEx named ownerTelematikId 0..1 MS
911
* meta.tag 1.. MS
1012
* ^slicing.discriminator.type = #pattern
1113
* ^slicing.discriminator.path = "system"

‎src/fhir/input/fsh/profiles/PractitionerRoleDirectory.fsh

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ Profile: PractitionerRoleDirectory
22
Parent: PractitionerRole
33
Title: "PractitionerRole in gematik Directory"
44
* insert Meta
5-
* extension contains HolderIdEx named holderId 0..* MS
5+
* extension contains
6+
HolderIdEx named holderId 0..* MS and
7+
OwnerTelematikIdEx named ownerTelematikId 0..1 MS
68
* meta.tag 1.. MS
79
* ^slicing.discriminator.type = #pattern
810
* ^slicing.discriminator.path = "system"

‎src/fhir/input/fsh/searchParameter.fsh

+6-6
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,13 @@ Usage: #definition
9999
* type = #token
100100
* expression = "HealthcareService.extension.where(url='https://gematik.de/fhir/directory/StructureDefinition/holder-id-ex').value | PractitionerRole.extension.where(url='https://gematik.de/fhir/directory/StructureDefinition/holder-id-ex').value"
101101

102-
Instance: EndpointOwnerTelematikIdSP
102+
Instance: OwnerTelematikIdSP
103103
InstanceOf: SearchParameter
104104
Usage: #definition
105105
* insert MetaInstance
106-
* name = "endpoint-owner-telematik-id"
107-
* description = "SearchParameter for the Telematik ID of the owner of an Endpoint"
108-
* code = #endpoint-owner-telematik-id
109-
* base = #Endpoint
106+
* name = "owner-telematik-id"
107+
* description = "SearchParameter for the Telematik ID of the owner of a resource using the OwnerTelematikIdEx extension"
108+
* code = #owner-telematik-id
109+
* base = #Resource
110110
* type = #token
111-
* expression = "Endpoint.extension.where(url='https://gematik.de/fhir/directory/StructureDefinition/EndpointOwnerTelematikIdEx').value"
111+
* expression = "Resource.extension.where(url='https://gematik.de/fhir/directory/StructureDefinition/OwnerTelematikIdEx').value"

0 commit comments

Comments
 (0)