Skip to content

Commit

Permalink
Merge pull request #55 from gematik/release/1.4.1
Browse files Browse the repository at this point in the history 
Release/1.4.1
  • Loading branch information
@florianschoffke
florianschoffke authored Aug 23, 2024
2 parents 94de401 + b27b251 commit 39401bd
Show file tree
Hide file tree
Showing 50 changed files with 287 additions and 222 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,11 @@ jobs:
JAVA_VALIDATION_ENABLED: true
OUTPUT_FORMAT: RAW
JAVA_VALIDATION_OPTIONS: -allow-example-urls true
JAVA_VALIDATOR_VERSION: 6.0.11
JAVA_VALIDATOR_VERSION: 6.3.15
SIMPLIFIER_USERNAME: ${{ secrets.SIMPLIFIER_USERNAME }}
SIMPLIFIER_PASSWORD: ${{ secrets.SIMPLIFIER_PASSWORD }}
SUSHI_ENABLED: true
SUSHI_VERSION: 3.5.0
SUSHI_VERSION: 3.11.0
SUSHI_OPTIONS: Resources/
EXPECTED_FAILS: VALIDATION_CONFORMANCE_DOTNET VALIDATION_CONFORMANCE_JAVA VALIDATION_EXAMPLES_JAVA

Expand Down
6 changes: 3 additions & 3 deletions Resources/fsh-generated/fsh-index.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@
"fshType": "Extension",
"fshFile": "extensions/GEM_ERP_EX_DeepLink.fsh",
"startLine": 1,
"endLine": 7
"endLine": 8
},
{
"outputFile": "StructureDefinition-GEM-ERP-EX-ExpiryDate.json",
Expand Down Expand Up @@ -541,7 +541,7 @@
"fshType": "Extension",
"fshFile": "extensions/GEM_ERP_EX_RedeemCode.fsh",
"startLine": 1,
"endLine": 8
"endLine": 9
},
{
"outputFile": "StructureDefinition-GEM-ERP-EX-SubstitutionAllowedType.json",
Expand Down Expand Up @@ -621,7 +621,7 @@
"fshType": "Profile",
"fshFile": "profiles/GEM_ERP_PR_Communication_InfoReq.fsh",
"startLine": 1,
"endLine": 54
"endLine": 53
},
{
"outputFile": "StructureDefinition-GEM-ERP-PR-Communication-Reply.json",
Expand Down
6 changes: 3 additions & 3 deletions Resources/fsh-generated/fsh-index.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,13 @@ Provenance-64d5081e-8d65-11ec-b909-0242ac120002.json
StructureDefinition-GEM-ERP-EX-AcceptDate.json GEM_ERP_EX_AcceptDate Extension extensions/GEM_ERP_EX_AcceptDate.fsh 1 - 10
StructureDefinition-GEM-ERP-EX-AvailabilityState.json GEM_ERP_EX_AvailabilityState Extension extensions/GEM_ERP_EX_AvailabilityState.fsh 1 - 10
StructureDefinition-GEM-ERP-EX-Beneficiary.json GEM_ERP_EX_Beneficiary Extension extensions/GEM_ERP_EX_Beneficiary.fsh 1 - 8
StructureDefinition-GEM-ERP-EX-DeepLink.json GEM_ERP_EX_DeepLink Extension extensions/GEM_ERP_EX_DeepLink.fsh 1 - 7
StructureDefinition-GEM-ERP-EX-DeepLink.json GEM_ERP_EX_DeepLink Extension extensions/GEM_ERP_EX_DeepLink.fsh 1 - 8
StructureDefinition-GEM-ERP-EX-ExpiryDate.json GEM_ERP_EX_ExpiryDate Extension extensions/GEM_ERP_EX_ExpiryDate.fsh 1 - 10
StructureDefinition-GEM-ERP-EX-InsuranceProvider.json GEM_ERP_EX_InsuranceProvider Extension extensions/GEM_ERP_EX_InsuranceProvider.fsh 1 - 7
StructureDefinition-GEM-ERP-EX-LastMedicationDispense.json GEM_ERP_EX_LastMedicationDispense Extension extensions/GEM_ERP_EX_LastMedicationDispense.fsh 1 - 12
StructureDefinition-GEM-ERP-EX-PackageQuantity.json GEM_ERP_EX_PackageQuantity Extension extensions/GEM_ERP_EX_PackageQuantity.fsh 1 - 8
StructureDefinition-GEM-ERP-EX-PrescriptionType.json GEM_ERP_EX_PrescriptionType Extension extensions/GEM_ERP_EX_PrescriptionType.fsh 1 - 16
StructureDefinition-GEM-ERP-EX-RedeemCode.json GEM_ERP_EX_RedeemCode Extension extensions/GEM_ERP_EX_RedeemCode.fsh 1 - 8
StructureDefinition-GEM-ERP-EX-RedeemCode.json GEM_ERP_EX_RedeemCode Extension extensions/GEM_ERP_EX_RedeemCode.fsh 1 - 9
StructureDefinition-GEM-ERP-EX-SubstitutionAllowedType.json GEM_ERP_EX_SubstitutionAllowedType Extension extensions/GEM_ERP_EX_SubstitutionAllowedType.fsh 1 - 11
StructureDefinition-GEM-ERP-EX-SupplyOptionsType.json GEM_ERP_EX_SupplyOptionsType Extension extensions/GEM_ERP_EX_SupplyOptionsType.fsh 1 - 26
StructureDefinition-GEM-ERP-PR-AccessCode.json GEM_ERP_PR_AccessCode Profile profiles/GEM_ERP_PR_AccessCode.fsh 1 - 11
Expand All @@ -76,7 +76,7 @@ StructureDefinition-GEM-ERP-PR-Binary.json
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
StructureDefinition-GEM-ERP-PR-Bundle.json GEM_ERP_PR_Bundle Profile profiles/GEM_ERP_PR_Bundle.fsh 1 - 49
StructureDefinition-GEM-ERP-PR-Communication-DispReq.json GEM_ERP_PR_Communication_DispReq Profile profiles/GEM_ERP_PR_Communication_DispReq.fsh 1 - 40
StructureDefinition-GEM-ERP-PR-Communication-InfoReq.json GEM_ERP_PR_Communication_InfoReq Profile profiles/GEM_ERP_PR_Communication_InfoReq.fsh 1 - 54
StructureDefinition-GEM-ERP-PR-Communication-InfoReq.json GEM_ERP_PR_Communication_InfoReq Profile profiles/GEM_ERP_PR_Communication_InfoReq.fsh 1 - 53
StructureDefinition-GEM-ERP-PR-Communication-Reply.json GEM_ERP_PR_Communication_Reply Profile profiles/GEM_ERP_PR_Communication_Reply.fsh 1 - 51
StructureDefinition-GEM-ERP-PR-Communication-Representative.json GEM_ERP_PR_Communication_Representative Profile profiles/GEM_ERP_PR_Communication_Representative.fsh 1 - 34
StructureDefinition-GEM-ERP-PR-Composition.json GEM_ERP_PR_Composition Profile profiles/GEM_ERP_PR_Composition.fsh 1 - 44
Expand Down
12 changes: 6 additions & 6 deletions Resources/fsh-generated/resources/Bundle-Bundle-AcceptOperation.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,12 @@
"value": "777bea0e13cc9c42ceec14aec3ddee2263325dc2c6c699db115f58fe423607ea"
}
],
"for": {
"identifier": {
"system": "http://fhir.de/sid/gkv/kvid-10",
"value": "X123456789"
}
},
"input": [
{
"type": {
Expand Down Expand Up @@ -86,12 +92,6 @@
]
}
],
"for": {
"identifier": {
"system": "http://fhir.de/sid/gkv/kvid-10",
"value": "X123456789"
}
},
"lastModified": "2022-03-18T15:28:00+00:00"
},
"fullUrl": "https://erp-ref.zentral.erp.splitdns.ti-dienste.de/Task/d70932d1-9e1c-483c-b2d4-b7dced09b35e"
Expand Down
4 changes: 2 additions & 2 deletions Resources/fsh-generated/resources/Bundle-dffbfd6a-5712-4798-bdc8-07201eb77ab8.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
]
},
"status": "active",
"serialNumber": "1.4.0",
"serialNumber": "1.14.0",
"deviceName": [
{
"name": "E-Rezept-Fachdienst",
Expand All @@ -107,7 +107,7 @@
],
"version": [
{
"value": "1.4.0"
"value": "1.14.0"
}
],
"contact": [
Expand Down
10 changes: 5 additions & 5 deletions Resources/fsh-generated/resources/Communication-2be1c6ac-5d10-47f6-84ee-8318b2c22c76.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,16 @@
}
}
],
"basedOn": [
{
"reference": "Task/162.000.033.491.280.78/$accept?ac=777bea0e13cc9c42ceec14aec3ddee2263325dc2c6c699db115f58fe423607ea"
}
],
"sender": {
"identifier": {
"system": "http://fhir.de/sid/gkv/kvid-10",
"value": "X234567890"
}
},
"basedOn": [
{
"reference": "Task/162.000.033.491.280.78/$accept?ac=777bea0e13cc9c42ceec14aec3ddee2263325dc2c6c699db115f58fe423607ea"
}
],
"sent": "2020-04-29T13:44:30.128+02:00"
}
16 changes: 8 additions & 8 deletions Resources/fsh-generated/resources/Communication-7977a4ab-97a9-4d95-afb3-6c4c1e2ac596.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,14 @@
]
},
"status": "unknown",
"recipient": [
{
"identifier": {
"system": "http://fhir.de/sid/gkv/kvid-10",
"value": "X234567890"
}
}
],
"payload": [
{
"extension": [
Expand Down Expand Up @@ -54,13 +62,5 @@
"value": "3-SMC-B-Testkarte-883110000123465"
}
},
"recipient": [
{
"identifier": {
"system": "http://fhir.de/sid/gkv/kvid-10",
"value": "X234567890"
}
}
],
"sent": "2020-04-29T13:46:30.128+02:00"
}
12 changes: 6 additions & 6 deletions Resources/fsh-generated/resources/Communication-8ca3c379-ac86-470f-bc12-178c9008f5c9.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,12 @@
"contentString": "U.N.V.E.U."
}
],
"sender": {
"identifier": {
"system": "http://fhir.de/sid/gkv/kvid-10",
"value": "X234567890"
}
},
"contained": [
{
"resourceType": "Medication",
Expand Down Expand Up @@ -139,11 +145,5 @@
"reference": "#SumatripanMedication"
}
],
"sender": {
"identifier": {
"system": "http://fhir.de/sid/gkv/kvid-10",
"value": "X234567890"
}
},
"sent": "2020-04-29T13:43:30.128+02:00"
}
10 changes: 5 additions & 5 deletions Resources/fsh-generated/resources/Communication-a218a36e-f2fd-4603-ba67-c827acfef01b.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,17 @@
}
}
],
"basedOn": [
{
"reference": "Task/160.000.033.491.280.78/$accept?ac=777bea0e13cc9c42ceec14aec3ddee2263325dc2c6c699db115f58fe423607ea"
}
],
"sender": {
"identifier": {
"system": "http://fhir.de/sid/gkv/kvid-10",
"value": "X234567890"
}
},
"basedOn": [
{
"reference": "Task/160.000.033.491.280.78/$accept?ac=777bea0e13cc9c42ceec14aec3ddee2263325dc2c6c699db115f58fe423607ea"
}
],
"sent": "2020-04-29T13:44:30.128+02:00",
"payload": [
{
Expand Down
20 changes: 10 additions & 10 deletions .../fsh-generated/resources/MedicationDispense-Example-MedicationDispense-DiGA-DeepLink.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,13 @@
}
],
"status": "completed",
"medicationReference": {
"identifier": {
"system": "http://fhir.de/CodeSystem/ifa/pzn",
"value": "12345678"
},
"display": "Gematico Diabetestherapie"
},
"subject": {
"identifier": {
"system": "http://fhir.de/sid/gkv/kvid-10",
Expand All @@ -31,20 +38,13 @@
],
"extension": [
{
"url": "https://gematik.de/fhir/erp/StructureDefinition/GEM-ERP-EX-RedeemCode",
"url": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_RedeemCode",
"valueString": "DE12345678901234"
},
{
"url": "https://gematik.de/fhir/erp/StructureDefinition/GEM-ERP-EX-DeepLink",
"url": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_DeepLink",
"valueUrl": "https://gematico.de?redeemCode=DE12345678901234"
}
],
"whenHandedOver": "2024-04-03",
"medicationReference": {
"display": "Gematico Diabetestherapie",
"identifier": {
"system": "https://example.de/fhir/identifier-for-diga",
"value": "12345678"
}
}
"whenHandedOver": "2024-04-03"
}
18 changes: 9 additions & 9 deletions ...-generated/resources/MedicationDispense-Example-MedicationDispense-DiGA-Name-And-PZN.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,13 @@
}
],
"status": "completed",
"medicationReference": {
"identifier": {
"system": "http://fhir.de/CodeSystem/ifa/pzn",
"value": "12345678"
},
"display": "Gematico Diabetestherapie"
},
"subject": {
"identifier": {
"system": "http://fhir.de/sid/gkv/kvid-10",
Expand All @@ -31,16 +38,9 @@
],
"extension": [
{
"url": "https://gematik.de/fhir/erp/StructureDefinition/GEM-ERP-EX-RedeemCode",
"url": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_RedeemCode",
"valueString": "DE12345678901234"
}
],
"whenHandedOver": "2024-04-03",
"medicationReference": {
"display": "Gematico Diabetestherapie",
"identifier": {
"system": "https://example.de/fhir/identifier-for-diga",
"value": "12345678"
}
}
"whenHandedOver": "2024-04-03"
}
18 changes: 9 additions & 9 deletions Resources/fsh-generated/resources/Parameters-ExampleOperationCloseInputParametersDiGA.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,13 @@
}
],
"status": "completed",
"medicationReference": {
"identifier": {
"system": "http://fhir.de/CodeSystem/ifa/pzn",
"value": "12345678"
},
"display": "Gematico Diabetestherapie"
},
"subject": {
"identifier": {
"system": "http://fhir.de/sid/gkv/kvid-10",
Expand All @@ -45,18 +52,11 @@
],
"extension": [
{
"url": "https://gematik.de/fhir/erp/StructureDefinition/GEM-ERP-EX-RedeemCode",
"url": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_RedeemCode",
"valueString": "DE12345678901234"
}
],
"whenHandedOver": "2024-04-03",
"medicationReference": {
"display": "Gematico Diabetestherapie",
"identifier": {
"system": "https://example.de/fhir/identifier-for-diga",
"value": "12345678"
}
}
"whenHandedOver": "2024-04-03"
}
}
]
Expand Down
Loading

0 comments on commit 39401bd

Please sign in to comment.