Skip to content

Commit 39401bd

Browse files
florianschoffkeflorianschoffke
authored
Merge pull request #55 from gematik/release/1.4.1
Release/1.4.1
2 parents 94de401 + b27b251 commit 39401bd

File tree

50 files changed

+287
-222
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+287
-222
lines changed

‎.github/workflows/main.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,11 @@ jobs:
5252
JAVA_VALIDATION_ENABLED: true
5353
OUTPUT_FORMAT: RAW
5454
JAVA_VALIDATION_OPTIONS: -allow-example-urls true
55-
JAVA_VALIDATOR_VERSION: 6.0.11
55+
JAVA_VALIDATOR_VERSION: 6.3.15
5656
SIMPLIFIER_USERNAME: ${{ secrets.SIMPLIFIER_USERNAME }}
5757
SIMPLIFIER_PASSWORD: ${{ secrets.SIMPLIFIER_PASSWORD }}
5858
SUSHI_ENABLED: true
59-
SUSHI_VERSION: 3.5.0
59+
SUSHI_VERSION: 3.11.0
6060
SUSHI_OPTIONS: Resources/
6161
EXPECTED_FAILS: VALIDATION_CONFORMANCE_DOTNET VALIDATION_CONFORMANCE_JAVA VALIDATION_EXAMPLES_JAVA
6262

‎Resources/fsh-generated/fsh-index.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,7 @@
493493
"fshType": "Extension",
494494
"fshFile": "extensions/GEM_ERP_EX_DeepLink.fsh",
495495
"startLine": 1,
496-
"endLine": 7
496+
"endLine": 8
497497
},
498498
{
499499
"outputFile": "StructureDefinition-GEM-ERP-EX-ExpiryDate.json",
@@ -541,7 +541,7 @@
541541
"fshType": "Extension",
542542
"fshFile": "extensions/GEM_ERP_EX_RedeemCode.fsh",
543543
"startLine": 1,
544-
"endLine": 8
544+
"endLine": 9
545545
},
546546
{
547547
"outputFile": "StructureDefinition-GEM-ERP-EX-SubstitutionAllowedType.json",
@@ -621,7 +621,7 @@
621621
"fshType": "Profile",
622622
"fshFile": "profiles/GEM_ERP_PR_Communication_InfoReq.fsh",
623623
"startLine": 1,
624-
"endLine": 54
624+
"endLine": 53
625625
},
626626
{
627627
"outputFile": "StructureDefinition-GEM-ERP-PR-Communication-Reply.json",

‎Resources/fsh-generated/fsh-index.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,13 @@ Provenance-64d5081e-8d65-11ec-b909-0242ac120002.json
6060
StructureDefinition-GEM-ERP-EX-AcceptDate.json GEM_ERP_EX_AcceptDate Extension extensions/GEM_ERP_EX_AcceptDate.fsh 1 - 10
6161
StructureDefinition-GEM-ERP-EX-AvailabilityState.json GEM_ERP_EX_AvailabilityState Extension extensions/GEM_ERP_EX_AvailabilityState.fsh 1 - 10
6262
StructureDefinition-GEM-ERP-EX-Beneficiary.json GEM_ERP_EX_Beneficiary Extension extensions/GEM_ERP_EX_Beneficiary.fsh 1 - 8
63-
StructureDefinition-GEM-ERP-EX-DeepLink.json GEM_ERP_EX_DeepLink Extension extensions/GEM_ERP_EX_DeepLink.fsh 1 - 7
63+
StructureDefinition-GEM-ERP-EX-DeepLink.json GEM_ERP_EX_DeepLink Extension extensions/GEM_ERP_EX_DeepLink.fsh 1 - 8
6464
StructureDefinition-GEM-ERP-EX-ExpiryDate.json GEM_ERP_EX_ExpiryDate Extension extensions/GEM_ERP_EX_ExpiryDate.fsh 1 - 10
6565
StructureDefinition-GEM-ERP-EX-InsuranceProvider.json GEM_ERP_EX_InsuranceProvider Extension extensions/GEM_ERP_EX_InsuranceProvider.fsh 1 - 7
6666
StructureDefinition-GEM-ERP-EX-LastMedicationDispense.json GEM_ERP_EX_LastMedicationDispense Extension extensions/GEM_ERP_EX_LastMedicationDispense.fsh 1 - 12
6767
StructureDefinition-GEM-ERP-EX-PackageQuantity.json GEM_ERP_EX_PackageQuantity Extension extensions/GEM_ERP_EX_PackageQuantity.fsh 1 - 8
6868
StructureDefinition-GEM-ERP-EX-PrescriptionType.json GEM_ERP_EX_PrescriptionType Extension extensions/GEM_ERP_EX_PrescriptionType.fsh 1 - 16
69-
StructureDefinition-GEM-ERP-EX-RedeemCode.json GEM_ERP_EX_RedeemCode Extension extensions/GEM_ERP_EX_RedeemCode.fsh 1 - 8
69+
StructureDefinition-GEM-ERP-EX-RedeemCode.json GEM_ERP_EX_RedeemCode Extension extensions/GEM_ERP_EX_RedeemCode.fsh 1 - 9
7070
StructureDefinition-GEM-ERP-EX-SubstitutionAllowedType.json GEM_ERP_EX_SubstitutionAllowedType Extension extensions/GEM_ERP_EX_SubstitutionAllowedType.fsh 1 - 11
7171
StructureDefinition-GEM-ERP-EX-SupplyOptionsType.json GEM_ERP_EX_SupplyOptionsType Extension extensions/GEM_ERP_EX_SupplyOptionsType.fsh 1 - 26
7272
StructureDefinition-GEM-ERP-PR-AccessCode.json GEM_ERP_PR_AccessCode Profile profiles/GEM_ERP_PR_AccessCode.fsh 1 - 11
@@ -76,7 +76,7 @@ StructureDefinition-GEM-ERP-PR-Binary.json
7676
StructureDefinition-GEM-ERP-PR-Bundle-OP-Accept.json GEM_ERP_PR_Bundle_OP_Accept Profile profiles/GEM_ERP_PR_Bundle_OP_Accept.fsh 1 - 16
7777
StructureDefinition-GEM-ERP-PR-Bundle.json GEM_ERP_PR_Bundle Profile profiles/GEM_ERP_PR_Bundle.fsh 1 - 49
7878
StructureDefinition-GEM-ERP-PR-Communication-DispReq.json GEM_ERP_PR_Communication_DispReq Profile profiles/GEM_ERP_PR_Communication_DispReq.fsh 1 - 40
79-
StructureDefinition-GEM-ERP-PR-Communication-InfoReq.json GEM_ERP_PR_Communication_InfoReq Profile profiles/GEM_ERP_PR_Communication_InfoReq.fsh 1 - 54
79+
StructureDefinition-GEM-ERP-PR-Communication-InfoReq.json GEM_ERP_PR_Communication_InfoReq Profile profiles/GEM_ERP_PR_Communication_InfoReq.fsh 1 - 53
8080
StructureDefinition-GEM-ERP-PR-Communication-Reply.json GEM_ERP_PR_Communication_Reply Profile profiles/GEM_ERP_PR_Communication_Reply.fsh 1 - 51
8181
StructureDefinition-GEM-ERP-PR-Communication-Representative.json GEM_ERP_PR_Communication_Representative Profile profiles/GEM_ERP_PR_Communication_Representative.fsh 1 - 34
8282
StructureDefinition-GEM-ERP-PR-Composition.json GEM_ERP_PR_Composition Profile profiles/GEM_ERP_PR_Composition.fsh 1 - 44

‎Resources/fsh-generated/resources/Bundle-Bundle-AcceptOperation.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,12 @@
5757
"value": "777bea0e13cc9c42ceec14aec3ddee2263325dc2c6c699db115f58fe423607ea"
5858
}
5959
],
60+
"for": {
61+
"identifier": {
62+
"system": "http://fhir.de/sid/gkv/kvid-10",
63+
"value": "X123456789"
64+
}
65+
},
6066
"input": [
6167
{
6268
"type": {
@@ -86,12 +92,6 @@
8692
]
8793
}
8894
],
89-
"for": {
90-
"identifier": {
91-
"system": "http://fhir.de/sid/gkv/kvid-10",
92-
"value": "X123456789"
93-
}
94-
},
9595
"lastModified": "2022-03-18T15:28:00+00:00"
9696
},
9797
"fullUrl": "https://erp-ref.zentral.erp.splitdns.ti-dienste.de/Task/d70932d1-9e1c-483c-b2d4-b7dced09b35e"

‎Resources/fsh-generated/resources/Bundle-dffbfd6a-5712-4798-bdc8-07201eb77ab8.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
]
9999
},
100100
"status": "active",
101-
"serialNumber": "1.4.0",
101+
"serialNumber": "1.14.0",
102102
"deviceName": [
103103
{
104104
"name": "E-Rezept-Fachdienst",
@@ -107,7 +107,7 @@
107107
],
108108
"version": [
109109
{
110-
"value": "1.4.0"
110+
"value": "1.14.0"
111111
}
112112
],
113113
"contact": [

‎Resources/fsh-generated/resources/Communication-2be1c6ac-5d10-47f6-84ee-8318b2c22c76.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,16 @@
3030
}
3131
}
3232
],
33-
"basedOn": [
34-
{
35-
"reference": "Task/162.000.033.491.280.78/$accept?ac=777bea0e13cc9c42ceec14aec3ddee2263325dc2c6c699db115f58fe423607ea"
36-
}
37-
],
3833
"sender": {
3934
"identifier": {
4035
"system": "http://fhir.de/sid/gkv/kvid-10",
4136
"value": "X234567890"
4237
}
4338
},
39+
"basedOn": [
40+
{
41+
"reference": "Task/162.000.033.491.280.78/$accept?ac=777bea0e13cc9c42ceec14aec3ddee2263325dc2c6c699db115f58fe423607ea"
42+
}
43+
],
4444
"sent": "2020-04-29T13:44:30.128+02:00"
4545
}

‎Resources/fsh-generated/resources/Communication-7977a4ab-97a9-4d95-afb3-6c4c1e2ac596.json

+8-8
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,14 @@
1212
]
1313
},
1414
"status": "unknown",
15+
"recipient": [
16+
{
17+
"identifier": {
18+
"system": "http://fhir.de/sid/gkv/kvid-10",
19+
"value": "X234567890"
20+
}
21+
}
22+
],
1523
"payload": [
1624
{
1725
"extension": [
@@ -54,13 +62,5 @@
5462
"value": "3-SMC-B-Testkarte-883110000123465"
5563
}
5664
},
57-
"recipient": [
58-
{
59-
"identifier": {
60-
"system": "http://fhir.de/sid/gkv/kvid-10",
61-
"value": "X234567890"
62-
}
63-
}
64-
],
6565
"sent": "2020-04-29T13:46:30.128+02:00"
6666
}

‎Resources/fsh-generated/resources/Communication-8ca3c379-ac86-470f-bc12-178c9008f5c9.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,12 @@
6969
"contentString": "U.N.V.E.U."
7070
}
7171
],
72+
"sender": {
73+
"identifier": {
74+
"system": "http://fhir.de/sid/gkv/kvid-10",
75+
"value": "X234567890"
76+
}
77+
},
7278
"contained": [
7379
{
7480
"resourceType": "Medication",
@@ -139,11 +145,5 @@
139145
"reference": "#SumatripanMedication"
140146
}
141147
],
142-
"sender": {
143-
"identifier": {
144-
"system": "http://fhir.de/sid/gkv/kvid-10",
145-
"value": "X234567890"
146-
}
147-
},
148148
"sent": "2020-04-29T13:43:30.128+02:00"
149149
}

‎Resources/fsh-generated/resources/Communication-a218a36e-f2fd-4603-ba67-c827acfef01b.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,17 @@
3030
}
3131
}
3232
],
33-
"basedOn": [
34-
{
35-
"reference": "Task/160.000.033.491.280.78/$accept?ac=777bea0e13cc9c42ceec14aec3ddee2263325dc2c6c699db115f58fe423607ea"
36-
}
37-
],
3833
"sender": {
3934
"identifier": {
4035
"system": "http://fhir.de/sid/gkv/kvid-10",
4136
"value": "X234567890"
4237
}
4338
},
39+
"basedOn": [
40+
{
41+
"reference": "Task/160.000.033.491.280.78/$accept?ac=777bea0e13cc9c42ceec14aec3ddee2263325dc2c6c699db115f58fe423607ea"
42+
}
43+
],
4444
"sent": "2020-04-29T13:44:30.128+02:00",
4545
"payload": [
4646
{

‎Resources/fsh-generated/resources/MedicationDispense-Example-MedicationDispense-DiGA-DeepLink.json

+10-10
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,13 @@
1313
}
1414
],
1515
"status": "completed",
16+
"medicationReference": {
17+
"identifier": {
18+
"system": "http://fhir.de/CodeSystem/ifa/pzn",
19+
"value": "12345678"
20+
},
21+
"display": "Gematico Diabetestherapie"
22+
},
1623
"subject": {
1724
"identifier": {
1825
"system": "http://fhir.de/sid/gkv/kvid-10",
@@ -31,20 +38,13 @@
3138
],
3239
"extension": [
3340
{
34-
"url": "https://gematik.de/fhir/erp/StructureDefinition/GEM-ERP-EX-RedeemCode",
41+
"url": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_RedeemCode",
3542
"valueString": "DE12345678901234"
3643
},
3744
{
38-
"url": "https://gematik.de/fhir/erp/StructureDefinition/GEM-ERP-EX-DeepLink",
45+
"url": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_DeepLink",
3946
"valueUrl": "https://gematico.de?redeemCode=DE12345678901234"
4047
}
4148
],
42-
"whenHandedOver": "2024-04-03",
43-
"medicationReference": {
44-
"display": "Gematico Diabetestherapie",
45-
"identifier": {
46-
"system": "https://example.de/fhir/identifier-for-diga",
47-
"value": "12345678"
48-
}
49-
}
49+
"whenHandedOver": "2024-04-03"
5050
}

‎Resources/fsh-generated/resources/MedicationDispense-Example-MedicationDispense-DiGA-Name-And-PZN.json

+9-9
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,13 @@
1313
}
1414
],
1515
"status": "completed",
16+
"medicationReference": {
17+
"identifier": {
18+
"system": "http://fhir.de/CodeSystem/ifa/pzn",
19+
"value": "12345678"
20+
},
21+
"display": "Gematico Diabetestherapie"
22+
},
1623
"subject": {
1724
"identifier": {
1825
"system": "http://fhir.de/sid/gkv/kvid-10",
@@ -31,16 +38,9 @@
3138
],
3239
"extension": [
3340
{
34-
"url": "https://gematik.de/fhir/erp/StructureDefinition/GEM-ERP-EX-RedeemCode",
41+
"url": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_RedeemCode",
3542
"valueString": "DE12345678901234"
3643
}
3744
],
38-
"whenHandedOver": "2024-04-03",
39-
"medicationReference": {
40-
"display": "Gematico Diabetestherapie",
41-
"identifier": {
42-
"system": "https://example.de/fhir/identifier-for-diga",
43-
"value": "12345678"
44-
}
45-
}
45+
"whenHandedOver": "2024-04-03"
4646
}

‎Resources/fsh-generated/resources/Parameters-ExampleOperationCloseInputParametersDiGA.json

+9-9
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,13 @@
2727
}
2828
],
2929
"status": "completed",
30+
"medicationReference": {
31+
"identifier": {
32+
"system": "http://fhir.de/CodeSystem/ifa/pzn",
33+
"value": "12345678"
34+
},
35+
"display": "Gematico Diabetestherapie"
36+
},
3037
"subject": {
3138
"identifier": {
3239
"system": "http://fhir.de/sid/gkv/kvid-10",
@@ -45,18 +52,11 @@
4552
],
4653
"extension": [
4754
{
48-
"url": "https://gematik.de/fhir/erp/StructureDefinition/GEM-ERP-EX-RedeemCode",
55+
"url": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_RedeemCode",
4956
"valueString": "DE12345678901234"
5057
}
5158
],
52-
"whenHandedOver": "2024-04-03",
53-
"medicationReference": {
54-
"display": "Gematico Diabetestherapie",
55-
"identifier": {
56-
"system": "https://example.de/fhir/identifier-for-diga",
57-
"value": "12345678"
58-
}
59-
}
59+
"whenHandedOver": "2024-04-03"
6060
}
6161
}
6262
]

0 commit comments

Comments
 (0)