From 827ebd3257201437666d099f24e28733a992f30d Mon Sep 17 00:00:00 2001 From: florianschoffke Date: Mon, 2 Sep 2024 08:52:07 +0200 Subject: [PATCH 01/19] Improve description for MedicationDispense --- .../StructureDefinition-GEM-ERP-PR-MedicationDispense.json | 2 +- Resources/input/fsh/profiles/GEM_ERP_PR_MedicationDispense.fsh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-MedicationDispense.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-MedicationDispense.json index 5280e151..cd11597f 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-MedicationDispense.json +++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-MedicationDispense.json @@ -61,7 +61,7 @@ { "id": "MedicationDispense.medication[x]", "path": "MedicationDispense.medication[x]", - "definition": "The MedicationDispense shows a contained medication which was dispensed", + "definition": "The MedicationDispense references a medication which was dispensed", "type": [ { "code": "Reference", diff --git a/Resources/input/fsh/profiles/GEM_ERP_PR_MedicationDispense.fsh b/Resources/input/fsh/profiles/GEM_ERP_PR_MedicationDispense.fsh index 7a713334..18f05476 100644 --- a/Resources/input/fsh/profiles/GEM_ERP_PR_MedicationDispense.fsh +++ b/Resources/input/fsh/profiles/GEM_ERP_PR_MedicationDispense.fsh @@ -14,7 +14,7 @@ Description: "Handles information about the redeem of the prescription and the s * medication[x] only Reference(GEM_ERP_PR_Medication) * medication[x] MS -* medication[x] ^definition = "The MedicationDispense shows a contained medication which was dispensed" +* medication[x] ^definition = "The MedicationDispense references a medication which was dispensed" * performer 1..1 * performer.actor.identifier 1.. From 2b61736c071abe1809790c87d5ba2e90355af34c Mon Sep 17 00:00:00 2001 From: florianschoffke Date: Tue, 3 Sep 2024 09:39:40 +0200 Subject: [PATCH 02/19] Fix constraints for DiGA --- ...tructureDefinition-GEM-ERP-PR-MedicationDispense-DiGA.json | 4 ++-- .../input/fsh/profiles/GEM_ERP_PR_MedicationDispense_DiGA.fsh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-MedicationDispense-DiGA.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-MedicationDispense-DiGA.json index 0864fe6e..e81f210b 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-MedicationDispense-DiGA.json +++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-MedicationDispense-DiGA.json @@ -31,14 +31,14 @@ "key": "workflow-medicationdispense-redeemcode-2", "severity": "error", "human": "The data absent reason was not found, but is mandatory if no redeem code is provided.", - "expression": "extension.where(url = 'https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_RedeemCode').empty() implies medicationReference.extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists()", + "expression": "extension.where(url = 'https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_RedeemCode').empty() implies medication.extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists()", "source": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_MedicationDispense_DiGA" }, { "key": "workflow-medicationdispense-redeemcode-3", "severity": "error", "human": "Name and identifier of the DiGA was not found, but is mandatory if a redeem code is provided.", - "expression": "extension.where(url = 'https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_RedeemCode').exists() implies (medicationReference.display.exists() and medicationReference.identifier.exists())", + "expression": "extension.where(url = 'https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_RedeemCode').exists() implies (medication.display.exists() and medication.identifier.exists())", "source": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_MedicationDispense_DiGA" } ] diff --git a/Resources/input/fsh/profiles/GEM_ERP_PR_MedicationDispense_DiGA.fsh b/Resources/input/fsh/profiles/GEM_ERP_PR_MedicationDispense_DiGA.fsh index 59f529ac..0b6d6f33 100644 --- a/Resources/input/fsh/profiles/GEM_ERP_PR_MedicationDispense_DiGA.fsh +++ b/Resources/input/fsh/profiles/GEM_ERP_PR_MedicationDispense_DiGA.fsh @@ -63,10 +63,10 @@ Severity: #error Invariant: workflow-medicationdispense-redeemcode-2 Description: "The data absent reason was not found, but is mandatory if no redeem code is provided." -Expression: "extension.where(url = 'https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_RedeemCode').empty() implies medicationReference.extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists()" +Expression: "extension.where(url = 'https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_RedeemCode').empty() implies medication.extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists()" Severity: #error Invariant: workflow-medicationdispense-redeemcode-3 Description: "Name and identifier of the DiGA was not found, but is mandatory if a redeem code is provided." -Expression: "extension.where(url = 'https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_RedeemCode').exists() implies (medicationReference.display.exists() and medicationReference.identifier.exists())" +Expression: "extension.where(url = 'https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_RedeemCode').exists() implies (medication.display.exists() and medication.identifier.exists())" Severity: #error From 501b86b3646e09a65081dd14fad6f01c2773132b Mon Sep 17 00:00:00 2001 From: florianschoffke Date: Tue, 3 Sep 2024 09:57:31 +0200 Subject: [PATCH 03/19] Set constraints for Parameters and add invalid example --- Resources/fsh-generated/fsh-index.json | 50 +++++++++++-------- Resources/fsh-generated/fsh-index.txt | 21 ++++---- ...MedicationDispense-Without-Medication.json | 36 +++++++++++++ ...loseInputParametersWithoutMedication.json} | 4 +- ...-GEM-ERP-PR-PAR-Close-Operation-Input.json | 11 +++- .../examples/Example_MedicationDispense.fsh | 15 +++++- .../fsh/examples/Example_Operation_Close.fsh | 20 ++++---- .../GEM_ERP_PR_PAR_CloseOperation_Input.fsh | 14 +++++- 8 files changed, 125 insertions(+), 46 deletions(-) create mode 100644 Resources/fsh-generated/resources/MedicationDispense-Example-MedicationDispense-Without-Medication.json rename Resources/fsh-generated/resources/{Parameters-ExampleOperationCloseInputParametersWithoutMedication.json => Parameters-INVALID-ExampleOperationCloseInputParametersWithoutMedication.json} (91%) diff --git a/Resources/fsh-generated/fsh-index.json b/Resources/fsh-generated/fsh-index.json index e977bc0f..30be28f0 100644 --- a/Resources/fsh-generated/fsh-index.json +++ b/Resources/fsh-generated/fsh-index.json @@ -188,8 +188,8 @@ "fshName": "Example-MedicationDispense-2", "fshType": "Instance", "fshFile": "examples/Example_MedicationDispense.fsh", - "startLine": 16, - "endLine": 28 + "startLine": 29, + "endLine": 41 }, { "outputFile": "MedicationDispense-Example-MedicationDispense-DiGA-DeepLink.json", @@ -220,24 +220,32 @@ "fshName": "Example-MedicationDispense-Kombipackung", "fshType": "Instance", "fshFile": "examples/Example_MedicationDispense.fsh", - "startLine": 30, - "endLine": 42 + "startLine": 43, + "endLine": 55 }, { "outputFile": "MedicationDispense-Example-MedicationDispense-Rezeptur.json", "fshName": "Example-MedicationDispense-Rezeptur", "fshType": "Instance", "fshFile": "examples/Example_MedicationDispense.fsh", - "startLine": 44, - "endLine": 56 + "startLine": 57, + "endLine": 69 + }, + { + "outputFile": "MedicationDispense-Example-MedicationDispense-Without-Medication.json", + "fshName": "Example-MedicationDispense-Without-Medication", + "fshType": "Instance", + "fshFile": "examples/Example_MedicationDispense.fsh", + "startLine": 15, + "endLine": 27 }, { "outputFile": "MedicationDispense-Example-MedicationDispense.json", "fshName": "Example-MedicationDispense", "fshType": "Instance", "fshFile": "examples/Example_MedicationDispense.fsh", - "startLine": 2, - "endLine": 14 + "startLine": 1, + "endLine": 13 }, { "outputFile": "OperationDefinition-AbortOperation.json", @@ -412,40 +420,40 @@ "fshName": "ExampleOperationCloseInputParametersDiGA", "fshType": "Instance", "fshFile": "examples/Example_Operation_Close.fsh", - "startLine": 71, - "endLine": 79 + "startLine": 61, + "endLine": 69 }, { "outputFile": "Parameters-ExampleOperationCloseInputParametersKombipackung.json", "fshName": "ExampleOperationCloseInputParametersKombipackung", "fshType": "Instance", "fshFile": "examples/Example_Operation_Close.fsh", - "startLine": 45, - "endLine": 56 + "startLine": 35, + "endLine": 46 }, { "outputFile": "Parameters-ExampleOperationCloseInputParametersMultipleMedicationDispenses.json", "fshName": "ExampleOperationCloseInputParametersMultipleMedicationDispenses", "fshType": "Instance", "fshFile": "examples/Example_Operation_Close.fsh", - "startLine": 24, - "endLine": 43 + "startLine": 14, + "endLine": 33 }, { "outputFile": "Parameters-ExampleOperationCloseInputParametersRezeptur.json", "fshName": "ExampleOperationCloseInputParametersRezeptur", "fshType": "Instance", "fshFile": "examples/Example_Operation_Close.fsh", - "startLine": 58, - "endLine": 69 + "startLine": 48, + "endLine": 59 }, { - "outputFile": "Parameters-ExampleOperationCloseInputParametersWithoutMedication.json", - "fshName": "ExampleOperationCloseInputParametersWithoutMedication", + "outputFile": "Parameters-INVALID-ExampleOperationCloseInputParametersWithoutMedication.json", + "fshName": "INVALID-ExampleOperationCloseInputParametersWithoutMedication", "fshType": "Instance", "fshFile": "examples/Example_Operation_Close.fsh", - "startLine": 14, - "endLine": 22 + "startLine": 71, + "endLine": 79 }, { "outputFile": "Parameters-OperationCreateParametersInputExample.json", @@ -717,7 +725,7 @@ "fshType": "Profile", "fshFile": "parameters/GEM_ERP_PR_PAR_CloseOperation_Input.fsh", "startLine": 1, - "endLine": 41 + "endLine": 42 }, { "outputFile": "StructureDefinition-GEM-ERP-PR-PAR-Close-Operation-Output.json", diff --git a/Resources/fsh-generated/fsh-index.txt b/Resources/fsh-generated/fsh-index.txt index 0188cec4..dd4953bd 100644 --- a/Resources/fsh-generated/fsh-index.txt +++ b/Resources/fsh-generated/fsh-index.txt @@ -22,13 +22,14 @@ Medication-MedicationHydrocortison-FD.json Medication-MedicationHydrocortison.json MedicationHydrocortison Instance examples/Example_Medication_Rezeptur.fsh 43 - 51 Medication-NasenSpray.json NasenSpray Instance examples/Example_Medication_Kombipackung.fsh 39 - 57 Medication-SumatripanMedication.json SumatripanMedication Instance examples/Example_Medication.fsh 2 - 23 -MedicationDispense-Example-MedicationDispense-2.json Example-MedicationDispense-2 Instance examples/Example_MedicationDispense.fsh 16 - 28 +MedicationDispense-Example-MedicationDispense-2.json Example-MedicationDispense-2 Instance examples/Example_MedicationDispense.fsh 29 - 41 MedicationDispense-Example-MedicationDispense-DiGA-DeepLink.json Example-MedicationDispense-DiGA-DeepLink Instance examples/Example_MedicationDispense_DiGA.fsh 18 - 34 MedicationDispense-Example-MedicationDispense-DiGA-Name-And-PZN.json Example-MedicationDispense-DiGA-Name-And-PZN Instance examples/Example_MedicationDispense_DiGA.fsh 1 - 16 MedicationDispense-Example-MedicationDispense-DiGA-NoRedeemCode.json Example-MedicationDispense-DiGA-NoRedeemCode Instance examples/Example_MedicationDispense_DiGA.fsh 36 - 49 -MedicationDispense-Example-MedicationDispense-Kombipackung.json Example-MedicationDispense-Kombipackung Instance examples/Example_MedicationDispense.fsh 30 - 42 -MedicationDispense-Example-MedicationDispense-Rezeptur.json Example-MedicationDispense-Rezeptur Instance examples/Example_MedicationDispense.fsh 44 - 56 -MedicationDispense-Example-MedicationDispense.json Example-MedicationDispense Instance examples/Example_MedicationDispense.fsh 2 - 14 +MedicationDispense-Example-MedicationDispense-Kombipackung.json Example-MedicationDispense-Kombipackung Instance examples/Example_MedicationDispense.fsh 43 - 55 +MedicationDispense-Example-MedicationDispense-Rezeptur.json Example-MedicationDispense-Rezeptur Instance examples/Example_MedicationDispense.fsh 57 - 69 +MedicationDispense-Example-MedicationDispense-Without-Medication.json Example-MedicationDispense-Without-Medication Instance examples/Example_MedicationDispense.fsh 15 - 27 +MedicationDispense-Example-MedicationDispense.json Example-MedicationDispense Instance examples/Example_MedicationDispense.fsh 1 - 13 OperationDefinition-AbortOperation.json AbortOperation Instance operationdefinitions/GEM_ERP_OP_Abort.fsh 1 - 23 OperationDefinition-AcceptOperation.json AcceptOperation Instance operationdefinitions/GEM_ERP_OP_Accept.fsh 1 - 25 OperationDefinition-ActivateOperation.json ActivateOperation Instance operationdefinitions/GEM_ERP_OP_Activate.fsh 1 - 26 @@ -50,11 +51,11 @@ Parameters-ExampleDispenseOutputParametersError.json Parameters-ExampleDispenseOutputParametersSuccess.json ExampleDispenseOutputParametersSuccess Instance examples/Example_Operation_Dispense.fsh 48 - 59 Parameters-ExampleOperationActivateParametersInput.json ExampleOperationActivateParametersInput Instance examples/Example_Operation_Activate.fsh 1 - 6 Parameters-ExampleOperationCloseInputParameters.json ExampleOperationCloseInputParameters Instance examples/Example_Operation_Close.fsh 1 - 12 -Parameters-ExampleOperationCloseInputParametersDiGA.json ExampleOperationCloseInputParametersDiGA Instance examples/Example_Operation_Close.fsh 71 - 79 -Parameters-ExampleOperationCloseInputParametersKombipackung.json ExampleOperationCloseInputParametersKombipackung Instance examples/Example_Operation_Close.fsh 45 - 56 -Parameters-ExampleOperationCloseInputParametersMultipleMedicationDispenses.json ExampleOperationCloseInputParametersMultipleMedicationDispenses Instance examples/Example_Operation_Close.fsh 24 - 43 -Parameters-ExampleOperationCloseInputParametersRezeptur.json ExampleOperationCloseInputParametersRezeptur Instance examples/Example_Operation_Close.fsh 58 - 69 -Parameters-ExampleOperationCloseInputParametersWithoutMedication.json ExampleOperationCloseInputParametersWithoutMedication Instance examples/Example_Operation_Close.fsh 14 - 22 +Parameters-ExampleOperationCloseInputParametersDiGA.json ExampleOperationCloseInputParametersDiGA Instance examples/Example_Operation_Close.fsh 61 - 69 +Parameters-ExampleOperationCloseInputParametersKombipackung.json ExampleOperationCloseInputParametersKombipackung Instance examples/Example_Operation_Close.fsh 35 - 46 +Parameters-ExampleOperationCloseInputParametersMultipleMedicationDispenses.json ExampleOperationCloseInputParametersMultipleMedicationDispenses Instance examples/Example_Operation_Close.fsh 14 - 33 +Parameters-ExampleOperationCloseInputParametersRezeptur.json ExampleOperationCloseInputParametersRezeptur Instance examples/Example_Operation_Close.fsh 48 - 59 +Parameters-INVALID-ExampleOperationCloseInputParametersWithoutMedication.json INVALID-ExampleOperationCloseInputParametersWithoutMedication Instance examples/Example_Operation_Close.fsh 71 - 79 Parameters-OperationCreateParametersInputExample.json OperationCreateParametersInputExample Instance examples/Example_Operation_Create.fsh 1 - 6 Provenance-64d5081e-8d65-11ec-b909-0242ac120002.json PractitionersNarcoticsApproval Instance examples/Example_Provenance.fsh 2 - 21 StructureDefinition-GEM-ERP-EX-AcceptDate.json GEM_ERP_EX_AcceptDate Extension extensions/GEM_ERP_EX_AcceptDate.fsh 1 - 10 @@ -88,7 +89,7 @@ StructureDefinition-GEM-ERP-PR-MedicationDispense.json StructureDefinition-GEM-ERP-PR-PAR-Accept-Operation-Output.json GEM_ERP_PR_PAR_AcceptOperation_Output Profile parameters/GEM_ERP_PR_PAR_AcceptOperation_Output.fsh 1 - 22 StructureDefinition-GEM-ERP-PR-PAR-Activate-Operation-Input.json GEM_ERP_PR_PAR_ActivateOperation_Input Profile parameters/GEM_ERP_PR_PAR_ActivateOperation_Input.fsh 1 - 20 StructureDefinition-GEM-ERP-PR-PAR-Activate-Operation-Output.json GEM_ERP_PR_PAR_ActivateOperation_Output Profile parameters/GEM_ERP_PR_PAR_ActivateOperation_Output.fsh 1 - 22 -StructureDefinition-GEM-ERP-PR-PAR-Close-Operation-Input.json GEM_ERP_PR_PAR_CloseOperation_Input Profile parameters/GEM_ERP_PR_PAR_CloseOperation_Input.fsh 1 - 41 +StructureDefinition-GEM-ERP-PR-PAR-Close-Operation-Input.json GEM_ERP_PR_PAR_CloseOperation_Input Profile parameters/GEM_ERP_PR_PAR_CloseOperation_Input.fsh 1 - 42 StructureDefinition-GEM-ERP-PR-PAR-Close-Operation-Output.json GEM_ERP_PR_PAR_CloseOperation_Output Profile parameters/GEM_ERP_PR_PAR_CloseOperation_Output.fsh 1 - 22 StructureDefinition-GEM-ERP-PR-PAR-Create-Operation-Input.json GEM_ERP_PR_PAR_CreateOperation_Input Profile parameters/GEM_ERP_PR_PAR_CreateOperation_Input.fsh 1 - 20 StructureDefinition-GEM-ERP-PR-PAR-Create-Operation-Output.json GEM_ERP_PR_PAR_CreateOperation_Output Profile parameters/GEM_ERP_PR_PAR_CreateOperation_Output.fsh 1 - 22 diff --git a/Resources/fsh-generated/resources/MedicationDispense-Example-MedicationDispense-Without-Medication.json b/Resources/fsh-generated/resources/MedicationDispense-Example-MedicationDispense-Without-Medication.json new file mode 100644 index 00000000..5f536819 --- /dev/null +++ b/Resources/fsh-generated/resources/MedicationDispense-Example-MedicationDispense-Without-Medication.json @@ -0,0 +1,36 @@ +{ + "resourceType": "MedicationDispense", + "id": "Example-MedicationDispense-Without-Medication", + "meta": { + "profile": [ + "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_MedicationDispense|1.4" + ] + }, + "identifier": [ + { + "system": "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_PrescriptionId", + "value": "160.000.033.491.280.78" + } + ], + "status": "completed", + "subject": { + "identifier": { + "system": "http://fhir.de/sid/gkv/kvid-10", + "value": "X123456789" + } + }, + "performer": [ + { + "actor": { + "identifier": { + "system": "https://gematik.de/fhir/sid/telematik-id", + "value": "3-SMC-B-Testkarte-883110000095957" + } + } + } + ], + "whenHandedOver": "2024-04-03", + "medicationReference": { + "reference": "Medication/SumatripanMedication" + } +} diff --git a/Resources/fsh-generated/resources/Parameters-ExampleOperationCloseInputParametersWithoutMedication.json b/Resources/fsh-generated/resources/Parameters-INVALID-ExampleOperationCloseInputParametersWithoutMedication.json similarity index 91% rename from Resources/fsh-generated/resources/Parameters-ExampleOperationCloseInputParametersWithoutMedication.json rename to Resources/fsh-generated/resources/Parameters-INVALID-ExampleOperationCloseInputParametersWithoutMedication.json index 5dab5284..b92135fc 100644 --- a/Resources/fsh-generated/resources/Parameters-ExampleOperationCloseInputParametersWithoutMedication.json +++ b/Resources/fsh-generated/resources/Parameters-INVALID-ExampleOperationCloseInputParametersWithoutMedication.json @@ -1,6 +1,6 @@ { "resourceType": "Parameters", - "id": "ExampleOperationCloseInputParametersWithoutMedication", + "id": "INVALID-ExampleOperationCloseInputParametersWithoutMedication", "meta": { "profile": [ "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_PAR_CloseOperation_Input|1.4" @@ -14,7 +14,7 @@ "name": "medicationDispense", "resource": { "resourceType": "MedicationDispense", - "id": "Example-MedicationDispense", + "id": "Example-MedicationDispense-Without-Medication", "meta": { "profile": [ "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_MedicationDispense|1.4" diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-PAR-Close-Operation-Input.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-PAR-Close-Operation-Input.json index eb51ef5b..7169aba6 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-PAR-Close-Operation-Input.json +++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-PAR-Close-Operation-Input.json @@ -46,7 +46,16 @@ "path": "Parameters.parameter", "sliceName": "rxDispensation", "min": 0, - "max": "*" + "max": "*", + "constraint": [ + { + "key": "workflow-parameters-close-medication-exists", + "severity": "error", + "human": "If a reference from a MedicationDispense to a Medication exists, a Medication resource must exist.", + "expression": "part.where(name = 'medicationDispense').resource.medication.reference.exists() implies part.where(name = 'medication').exists()", + "source": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_PAR_CloseOperation_Input" + } + ] }, { "id": "Parameters.parameter:rxDispensation.name", diff --git a/Resources/input/fsh/examples/Example_MedicationDispense.fsh b/Resources/input/fsh/examples/Example_MedicationDispense.fsh index f182598d..d5b8381c 100644 --- a/Resources/input/fsh/examples/Example_MedicationDispense.fsh +++ b/Resources/input/fsh/examples/Example_MedicationDispense.fsh @@ -1,4 +1,3 @@ - Instance: Example-MedicationDispense InstanceOf: GEM_ERP_PR_MedicationDispense Usage: #example @@ -13,6 +12,20 @@ Description: "Example of a Medication Dispense." * whenHandedOver = "2024-04-03" * medicationReference = Reference(SumatripanMedication) +Instance: Example-MedicationDispense-Without-Medication +InstanceOf: GEM_ERP_PR_MedicationDispense +Usage: #example +Title: "Example Medication Dispense" +Description: "Example of a Medication Dispense." +* identifier[prescriptionID].system = "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_PrescriptionId" +* identifier[prescriptionID].value = "160.000.033.491.280.78" +* subject.identifier.system = $identifier-kvid-10 +* subject.identifier.value = "X123456789" +* performer.actor.identifier.system = $identifier-telematik-id +* performer.actor.identifier.value = "3-SMC-B-Testkarte-883110000095957" +* whenHandedOver = "2024-04-03" +* medicationReference = Reference(SumatripanMedication) + Instance: Example-MedicationDispense-2 InstanceOf: GEM_ERP_PR_MedicationDispense Usage: #example diff --git a/Resources/input/fsh/examples/Example_Operation_Close.fsh b/Resources/input/fsh/examples/Example_Operation_Close.fsh index 650e1ce7..f6b841fb 100644 --- a/Resources/input/fsh/examples/Example_Operation_Close.fsh +++ b/Resources/input/fsh/examples/Example_Operation_Close.fsh @@ -11,16 +11,6 @@ Title: "Example Close Parameters" * name = "medication" * resource = SumatripanMedication -Instance: ExampleOperationCloseInputParametersWithoutMedication -InstanceOf: GEM_ERP_PR_PAR_CloseOperation_Input -Usage: #example -Title: "Example Close Parameters" -* parameter[rxDispensation] - * name = "rxDispensation" - * part[medicationDispense] - * name = "medicationDispense" - * resource = Example-MedicationDispense - Instance: ExampleOperationCloseInputParametersMultipleMedicationDispenses InstanceOf: GEM_ERP_PR_PAR_CloseOperation_Input Usage: #example @@ -78,6 +68,16 @@ Title: "Example Close Parameters" * name = "medicationDispense" * resource = Example-MedicationDispense-DiGA-Name-And-PZN +Instance: INVALID-ExampleOperationCloseInputParametersWithoutMedication +InstanceOf: GEM_ERP_PR_PAR_CloseOperation_Input +Usage: #example +Title: "Example Close Parameters" +* parameter[rxDispensation] + * name = "rxDispensation" + * part[medicationDispense] + * name = "medicationDispense" + * resource = Example-MedicationDispense-Without-Medication + Instance: ExampleOperationCloseError InstanceOf: OperationOutcome Title: "Example Close operation error response" diff --git a/Resources/input/fsh/parameters/GEM_ERP_PR_PAR_CloseOperation_Input.fsh b/Resources/input/fsh/parameters/GEM_ERP_PR_PAR_CloseOperation_Input.fsh index 9ec431e2..c53bd98e 100644 --- a/Resources/input/fsh/parameters/GEM_ERP_PR_PAR_CloseOperation_Input.fsh +++ b/Resources/input/fsh/parameters/GEM_ERP_PR_PAR_CloseOperation_Input.fsh @@ -18,6 +18,7 @@ Description: "This profile defines the parameters for closing a workflow for a p * name = "rxDispensation" * value[x] 0..0 * resource 0..0 + * obeys workflow-parameters-close-medication-exists * part MS * ^slicing.discriminator.type = #pattern * ^slicing.discriminator.path = "name" @@ -38,4 +39,15 @@ Description: "This profile defines the parameters for closing a workflow for a p * value[x] 0..0 * resource 1..1 * resource only GEM_ERP_PR_Medication - * part 0..0 \ No newline at end of file + * part 0..0 + +Invariant: workflow-parameters-close-medication-exists +Description: "If a reference from a MedicationDispense to a Medication exists, a Medication resource must exist." +Expression: "part.where(name = 'medicationDispense').resource.medication.reference.exists() implies part.where(name = 'medication').exists()" +Severity: #error + +Invariant: workflow-parameters-close-medication-references +Description: "If a reference from a MedicationDispense to a Medication exists, the reference must resolve to the Medication." +Expression: "part.where(name = 'medicationDispense').resource.medication.reference.exists() implies part.where(name = 'medicationDispense').resource.medication.reference.endsWith(part.where(name = 'medication').resource.id)" +Severity: #error + From 6f6f863c9461ccfe7170d712b99ce3b2138b4d25 Mon Sep 17 00:00:00 2001 From: florianschoffke Date: Tue, 3 Sep 2024 11:23:23 +0200 Subject: [PATCH 04/19] add simple medication example --- .../resources/Medication-SimpleMedication.json | 17 +++++++++++++++++ .../input/fsh/examples/Example_Medication.fsh | 14 +++++++------- 2 files changed, 24 insertions(+), 7 deletions(-) create mode 100644 Resources/fsh-generated/resources/Medication-SimpleMedication.json diff --git a/Resources/fsh-generated/resources/Medication-SimpleMedication.json b/Resources/fsh-generated/resources/Medication-SimpleMedication.json new file mode 100644 index 00000000..f2b3cf3a --- /dev/null +++ b/Resources/fsh-generated/resources/Medication-SimpleMedication.json @@ -0,0 +1,17 @@ +{ + "resourceType": "Medication", + "id": "SimpleMedication", + "meta": { + "profile": [ + "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_Medication|1.4" + ] + }, + "code": { + "coding": [ + { + "system": "http://fhir.de/CodeSystem/ifa/pzn", + "code": "06313728" + } + ] + } +} diff --git a/Resources/input/fsh/examples/Example_Medication.fsh b/Resources/input/fsh/examples/Example_Medication.fsh index f91e4132..cd8869b9 100644 --- a/Resources/input/fsh/examples/Example_Medication.fsh +++ b/Resources/input/fsh/examples/Example_Medication.fsh @@ -22,6 +22,13 @@ Usage: #example * amount.numerator.extension[totalQuantity].valueString = "20 St." * amount.denominator.value = 1 +Instance: SimpleMedication +InstanceOf: GEM_ERP_PR_Medication +Title: "Sample Simple Medication" +Usage: #example +* code.coding[pzn].system = "http://fhir.de/CodeSystem/ifa/pzn" +* code.coding[pzn].code = #06313728 + // Medication without system and code for ingredient.strengh.numerator/denominator Instance: Medication-Without-Strength-Code InstanceOf: GEM_ERP_PR_Medication @@ -61,10 +68,3 @@ Usage: #example * strength.denominator.value = 1 * strength.denominator.system.extension[dataAbsentReason].valueCode = #unknown * strength.denominator.code.extension[dataAbsentReason].valueCode = #unknown - - - - - - - \ No newline at end of file From 5ce0d8c7c2e2d6ace54f381c7fbc9658e74d1100 Mon Sep 17 00:00:00 2001 From: florianschoffke Date: Tue, 3 Sep 2024 11:23:39 +0200 Subject: [PATCH 05/19] rename parameters examples --- ...ameters.json => Parameters-ExampleCloseInputParameters.json} | 2 +- ...iGA.json => Parameters-ExampleCloseInputParametersDiGA.json} | 2 +- ... => Parameters-ExampleCloseInputParametersKombipackung.json} | 2 +- ...ExampleCloseInputParametersMultipleMedicationDispenses.json} | 2 +- ...json => Parameters-ExampleCloseInputParametersRezeptur.json} | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename Resources/fsh-generated/resources/{Parameters-ExampleOperationCloseInputParameters.json => Parameters-ExampleCloseInputParameters.json} (98%) rename Resources/fsh-generated/resources/{Parameters-ExampleOperationCloseInputParametersDiGA.json => Parameters-ExampleCloseInputParametersDiGA.json} (97%) rename Resources/fsh-generated/resources/{Parameters-ExampleOperationCloseInputParametersKombipackung.json => Parameters-ExampleCloseInputParametersKombipackung.json} (99%) rename Resources/fsh-generated/resources/{Parameters-ExampleOperationCloseInputParametersMultipleMedicationDispenses.json => Parameters-ExampleCloseInputParametersMultipleMedicationDispenses.json} (99%) rename Resources/fsh-generated/resources/{Parameters-ExampleOperationCloseInputParametersRezeptur.json => Parameters-ExampleCloseInputParametersRezeptur.json} (99%) diff --git a/Resources/fsh-generated/resources/Parameters-ExampleOperationCloseInputParameters.json b/Resources/fsh-generated/resources/Parameters-ExampleCloseInputParameters.json similarity index 98% rename from Resources/fsh-generated/resources/Parameters-ExampleOperationCloseInputParameters.json rename to Resources/fsh-generated/resources/Parameters-ExampleCloseInputParameters.json index f7203e93..257d486e 100644 --- a/Resources/fsh-generated/resources/Parameters-ExampleOperationCloseInputParameters.json +++ b/Resources/fsh-generated/resources/Parameters-ExampleCloseInputParameters.json @@ -1,6 +1,6 @@ { "resourceType": "Parameters", - "id": "ExampleOperationCloseInputParameters", + "id": "ExampleCloseInputParameters", "meta": { "profile": [ "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_PAR_CloseOperation_Input|1.4" diff --git a/Resources/fsh-generated/resources/Parameters-ExampleOperationCloseInputParametersDiGA.json b/Resources/fsh-generated/resources/Parameters-ExampleCloseInputParametersDiGA.json similarity index 97% rename from Resources/fsh-generated/resources/Parameters-ExampleOperationCloseInputParametersDiGA.json rename to Resources/fsh-generated/resources/Parameters-ExampleCloseInputParametersDiGA.json index 817740fa..f3db11d0 100644 --- a/Resources/fsh-generated/resources/Parameters-ExampleOperationCloseInputParametersDiGA.json +++ b/Resources/fsh-generated/resources/Parameters-ExampleCloseInputParametersDiGA.json @@ -1,6 +1,6 @@ { "resourceType": "Parameters", - "id": "ExampleOperationCloseInputParametersDiGA", + "id": "ExampleCloseInputParametersDiGA", "meta": { "profile": [ "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_PAR_CloseOperation_Input|1.4" diff --git a/Resources/fsh-generated/resources/Parameters-ExampleOperationCloseInputParametersKombipackung.json b/Resources/fsh-generated/resources/Parameters-ExampleCloseInputParametersKombipackung.json similarity index 99% rename from Resources/fsh-generated/resources/Parameters-ExampleOperationCloseInputParametersKombipackung.json rename to Resources/fsh-generated/resources/Parameters-ExampleCloseInputParametersKombipackung.json index b5ec4c2e..d6dfc592 100644 --- a/Resources/fsh-generated/resources/Parameters-ExampleOperationCloseInputParametersKombipackung.json +++ b/Resources/fsh-generated/resources/Parameters-ExampleCloseInputParametersKombipackung.json @@ -1,6 +1,6 @@ { "resourceType": "Parameters", - "id": "ExampleOperationCloseInputParametersKombipackung", + "id": "ExampleCloseInputParametersKombipackung", "meta": { "profile": [ "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_PAR_CloseOperation_Input|1.4" diff --git a/Resources/fsh-generated/resources/Parameters-ExampleOperationCloseInputParametersMultipleMedicationDispenses.json b/Resources/fsh-generated/resources/Parameters-ExampleCloseInputParametersMultipleMedicationDispenses.json similarity index 99% rename from Resources/fsh-generated/resources/Parameters-ExampleOperationCloseInputParametersMultipleMedicationDispenses.json rename to Resources/fsh-generated/resources/Parameters-ExampleCloseInputParametersMultipleMedicationDispenses.json index 6d7267f8..bc2acf96 100644 --- a/Resources/fsh-generated/resources/Parameters-ExampleOperationCloseInputParametersMultipleMedicationDispenses.json +++ b/Resources/fsh-generated/resources/Parameters-ExampleCloseInputParametersMultipleMedicationDispenses.json @@ -1,6 +1,6 @@ { "resourceType": "Parameters", - "id": "ExampleOperationCloseInputParametersMultipleMedicationDispenses", + "id": "ExampleCloseInputParametersMultipleMedicationDispenses", "meta": { "profile": [ "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_PAR_CloseOperation_Input|1.4" diff --git a/Resources/fsh-generated/resources/Parameters-ExampleOperationCloseInputParametersRezeptur.json b/Resources/fsh-generated/resources/Parameters-ExampleCloseInputParametersRezeptur.json similarity index 99% rename from Resources/fsh-generated/resources/Parameters-ExampleOperationCloseInputParametersRezeptur.json rename to Resources/fsh-generated/resources/Parameters-ExampleCloseInputParametersRezeptur.json index 7a5bbaed..9d54cc67 100644 --- a/Resources/fsh-generated/resources/Parameters-ExampleOperationCloseInputParametersRezeptur.json +++ b/Resources/fsh-generated/resources/Parameters-ExampleCloseInputParametersRezeptur.json @@ -1,6 +1,6 @@ { "resourceType": "Parameters", - "id": "ExampleOperationCloseInputParametersRezeptur", + "id": "ExampleCloseInputParametersRezeptur", "meta": { "profile": [ "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_PAR_CloseOperation_Input|1.4" From d3b7e70f440d0e12808dc6562ec6860eeab49664 Mon Sep 17 00:00:00 2001 From: florianschoffke Date: Tue, 3 Sep 2024 11:23:53 +0200 Subject: [PATCH 06/19] set constraints --- ...ureDefinition-GEM-ERP-PR-PAR-Close-Operation-Input.json | 7 +++++++ .../fsh/parameters/GEM_ERP_PR_PAR_CloseOperation_Input.fsh | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-PAR-Close-Operation-Input.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-PAR-Close-Operation-Input.json index 7169aba6..e350d568 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-PAR-Close-Operation-Input.json +++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-PAR-Close-Operation-Input.json @@ -54,6 +54,13 @@ "human": "If a reference from a MedicationDispense to a Medication exists, a Medication resource must exist.", "expression": "part.where(name = 'medicationDispense').resource.medication.reference.exists() implies part.where(name = 'medication').exists()", "source": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_PAR_CloseOperation_Input" + }, + { + "key": "workflow-parameters-close-medication-references", + "severity": "error", + "human": "If a reference from a MedicationDispense to a Medication exists, the reference must resolve to the Medication.", + "expression": "part.where(name = 'medicationDispense').resource.medication.reference.exists() implies ((part.where(name = 'medicationDispense').resource.medication.reference.split('/').last().split(':').last()) = (part.where(name = 'medication').resource.id))", + "source": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_PAR_CloseOperation_Input" } ] }, diff --git a/Resources/input/fsh/parameters/GEM_ERP_PR_PAR_CloseOperation_Input.fsh b/Resources/input/fsh/parameters/GEM_ERP_PR_PAR_CloseOperation_Input.fsh index c53bd98e..26463c1a 100644 --- a/Resources/input/fsh/parameters/GEM_ERP_PR_PAR_CloseOperation_Input.fsh +++ b/Resources/input/fsh/parameters/GEM_ERP_PR_PAR_CloseOperation_Input.fsh @@ -19,6 +19,7 @@ Description: "This profile defines the parameters for closing a workflow for a p * value[x] 0..0 * resource 0..0 * obeys workflow-parameters-close-medication-exists + * obeys workflow-parameters-close-medication-references * part MS * ^slicing.discriminator.type = #pattern * ^slicing.discriminator.path = "name" @@ -48,6 +49,6 @@ Severity: #error Invariant: workflow-parameters-close-medication-references Description: "If a reference from a MedicationDispense to a Medication exists, the reference must resolve to the Medication." -Expression: "part.where(name = 'medicationDispense').resource.medication.reference.exists() implies part.where(name = 'medicationDispense').resource.medication.reference.endsWith(part.where(name = 'medication').resource.id)" +Expression: "part.where(name = 'medicationDispense').resource.medication.reference.exists() implies ((part.where(name = 'medicationDispense').resource.medication.reference.split('/').last().split(':').last()) = (part.where(name = 'medication').resource.id))" Severity: #error From b70762c3190bf49e3cc78d9118548e6f0e7bfcc0 Mon Sep 17 00:00:00 2001 From: florianschoffke Date: Tue, 3 Sep 2024 11:23:58 +0200 Subject: [PATCH 07/19] build --- Resources/fsh-generated/fsh-index.json | 110 ++++----- Resources/fsh-generated/fsh-index.txt | 228 +++++++++--------- ...CloseInputParametersWithoutMedication.json | 55 ----- .../fsh/examples/Example_Operation_Close.fsh | 80 ------ .../Example_Parameters_CloseInput.fsh | 94 ++++++++ 5 files changed, 263 insertions(+), 304 deletions(-) delete mode 100644 Resources/fsh-generated/resources/Parameters-INVALID-ExampleOperationCloseInputParametersWithoutMedication.json create mode 100644 Resources/input/fsh/examples/parameters_examples/Example_Parameters_CloseInput.fsh diff --git a/Resources/fsh-generated/fsh-index.json b/Resources/fsh-generated/fsh-index.json index 30be28f0..f1364963 100644 --- a/Resources/fsh-generated/fsh-index.json +++ b/Resources/fsh-generated/fsh-index.json @@ -124,16 +124,16 @@ "fshName": "Medication-Without-Strength-Code", "fshType": "Instance", "fshFile": "examples/Example_Medication.fsh", - "startLine": 26, - "endLine": 43 + "startLine": 33, + "endLine": 50 }, { "outputFile": "Medication-Medication-Without-Strength-Numerator.json", "fshName": "Medication-Without-Strength-Numerator", "fshType": "Instance", "fshFile": "examples/Example_Medication.fsh", - "startLine": 45, - "endLine": 63 + "startLine": 52, + "endLine": 70 }, { "outputFile": "Medication-MedicationDexpanthenol-FD.json", @@ -175,6 +175,14 @@ "startLine": 39, "endLine": 57 }, + { + "outputFile": "Medication-SimpleMedication.json", + "fshName": "SimpleMedication", + "fshType": "Instance", + "fshFile": "examples/Example_Medication.fsh", + "startLine": 25, + "endLine": 30 + }, { "outputFile": "Medication-SumatripanMedication.json", "fshName": "SumatripanMedication", @@ -340,8 +348,8 @@ "fshName": "ExampleOperationCloseError", "fshType": "Instance", "fshFile": "examples/Example_Operation_Close.fsh", - "startLine": 81, - "endLine": 89 + "startLine": 1, + "endLine": 9 }, { "outputFile": "OperationOutcome-ExampleOperationCreateError.json", @@ -359,6 +367,46 @@ "startLine": 1, "endLine": 8 }, + { + "outputFile": "Parameters-ExampleCloseInputParameters.json", + "fshName": "ExampleCloseInputParameters", + "fshType": "Instance", + "fshFile": "examples/parameters_examples/Example_Parameters_CloseInput.fsh", + "startLine": 1, + "endLine": 12 + }, + { + "outputFile": "Parameters-ExampleCloseInputParametersDiGA.json", + "fshName": "ExampleCloseInputParametersDiGA", + "fshType": "Instance", + "fshFile": "examples/parameters_examples/Example_Parameters_CloseInput.fsh", + "startLine": 61, + "endLine": 69 + }, + { + "outputFile": "Parameters-ExampleCloseInputParametersKombipackung.json", + "fshName": "ExampleCloseInputParametersKombipackung", + "fshType": "Instance", + "fshFile": "examples/parameters_examples/Example_Parameters_CloseInput.fsh", + "startLine": 35, + "endLine": 46 + }, + { + "outputFile": "Parameters-ExampleCloseInputParametersMultipleMedicationDispenses.json", + "fshName": "ExampleCloseInputParametersMultipleMedicationDispenses", + "fshType": "Instance", + "fshFile": "examples/parameters_examples/Example_Parameters_CloseInput.fsh", + "startLine": 14, + "endLine": 33 + }, + { + "outputFile": "Parameters-ExampleCloseInputParametersRezeptur.json", + "fshName": "ExampleCloseInputParametersRezeptur", + "fshType": "Instance", + "fshFile": "examples/parameters_examples/Example_Parameters_CloseInput.fsh", + "startLine": 48, + "endLine": 59 + }, { "outputFile": "Parameters-ExampleDispenseInputParameters.json", "fshName": "ExampleDispenseInputParameters", @@ -407,54 +455,6 @@ "startLine": 1, "endLine": 6 }, - { - "outputFile": "Parameters-ExampleOperationCloseInputParameters.json", - "fshName": "ExampleOperationCloseInputParameters", - "fshType": "Instance", - "fshFile": "examples/Example_Operation_Close.fsh", - "startLine": 1, - "endLine": 12 - }, - { - "outputFile": "Parameters-ExampleOperationCloseInputParametersDiGA.json", - "fshName": "ExampleOperationCloseInputParametersDiGA", - "fshType": "Instance", - "fshFile": "examples/Example_Operation_Close.fsh", - "startLine": 61, - "endLine": 69 - }, - { - "outputFile": "Parameters-ExampleOperationCloseInputParametersKombipackung.json", - "fshName": "ExampleOperationCloseInputParametersKombipackung", - "fshType": "Instance", - "fshFile": "examples/Example_Operation_Close.fsh", - "startLine": 35, - "endLine": 46 - }, - { - "outputFile": "Parameters-ExampleOperationCloseInputParametersMultipleMedicationDispenses.json", - "fshName": "ExampleOperationCloseInputParametersMultipleMedicationDispenses", - "fshType": "Instance", - "fshFile": "examples/Example_Operation_Close.fsh", - "startLine": 14, - "endLine": 33 - }, - { - "outputFile": "Parameters-ExampleOperationCloseInputParametersRezeptur.json", - "fshName": "ExampleOperationCloseInputParametersRezeptur", - "fshType": "Instance", - "fshFile": "examples/Example_Operation_Close.fsh", - "startLine": 48, - "endLine": 59 - }, - { - "outputFile": "Parameters-INVALID-ExampleOperationCloseInputParametersWithoutMedication.json", - "fshName": "INVALID-ExampleOperationCloseInputParametersWithoutMedication", - "fshType": "Instance", - "fshFile": "examples/Example_Operation_Close.fsh", - "startLine": 71, - "endLine": 79 - }, { "outputFile": "Parameters-OperationCreateParametersInputExample.json", "fshName": "OperationCreateParametersInputExample", @@ -725,7 +725,7 @@ "fshType": "Profile", "fshFile": "parameters/GEM_ERP_PR_PAR_CloseOperation_Input.fsh", "startLine": 1, - "endLine": 42 + "endLine": 43 }, { "outputFile": "StructureDefinition-GEM-ERP-PR-PAR-Close-Operation-Output.json", diff --git a/Resources/fsh-generated/fsh-index.txt b/Resources/fsh-generated/fsh-index.txt index dd4953bd..28f04169 100644 --- a/Resources/fsh-generated/fsh-index.txt +++ b/Resources/fsh-generated/fsh-index.txt @@ -1,114 +1,114 @@ -Output File Name Type FSH File Lines -AuditEvent-9361863d-fec0-4ba9-8776-7905cf1b0cfa.json AuditEventSample Instance examples/Example_AuditEvent.fsh 2 - 32 -Bundle-Bundle-AcceptOperation.json Bundle-AcceptOperation Instance examples/Example_Bundle.fsh 34 - 45 -Bundle-dffbfd6a-5712-4798-bdc8-07201eb77ab8.json ReceiptBundleQuittung Instance examples/Example_Bundle.fsh 10 - 32 -CodeSystem-GEM-ERP-CS-AvailabilityStatus.json GEM_ERP_CS_AvailabilityStatus CodeSystem codesystems/GEM_ERP_CS_AvailabilityStatus.fsh 1 - 12 -CodeSystem-GEM-ERP-CS-DocumentType.json GEM_ERP_CS_DocumentType CodeSystem codesystems/GEM_ERP_CS_DocumentType.fsh 1 - 10 -CodeSystem-GEM-ERP-CS-FlowType.json GEM_ERP_CS_FlowType CodeSystem codesystems/GEM_ERP_CS_FlowType.fsh 1 - 16 -CodeSystem-GEM-ERP-CS-OrganizationType.json GEM_ERP_CS_OrganizationType CodeSystem codesystems/GEM_ERP_CS_OrganizationType.fsh 1 - 8 -Communication-2be1c6ac-5d10-47f6-84ee-8318b2c22c76.json Communication_DispenseRequest_DiGA Instance examples/Example_Communication_DispReq.fsh 20 - 35 -Communication-7977a4ab-97a9-4d95-afb3-6c4c1e2ac596.json Communication_Reply Instance examples/Example_Communication_Reply.fsh 2 - 26 -Communication-8ca3c379-ac86-470f-bc12-178c9008f5c9.json Communication_InformationRequest Instance examples/Example_Communication_InfoReq.fsh 1 - 35 -Communication-a218a36e-f2fd-4603-ba67-c827acfef01b.json Communication_DispenseRequest Instance examples/Example_Communication_DispReq.fsh 2 - 18 -Medication-Augentropfen.json Augentropfen Instance examples/Example_Medication_Kombipackung.fsh 19 - 37 -Medication-Medication-Kombipackung.json Medication-Kombipackung Instance examples/Example_Medication_Kombipackung.fsh 2 - 17 -Medication-Medication-Rezeptur-FD.json Medication-Rezeptur-FD Instance examples/Example_Medication_Rezeptur_FD.fsh 2 - 45 -Medication-Medication-Rezeptur.json Medication-Rezeptur Instance examples/Example_Medication_Rezeptur.fsh 2 - 41 -Medication-Medication-Without-Strength-Code.json Medication-Without-Strength-Code Instance examples/Example_Medication.fsh 26 - 43 -Medication-Medication-Without-Strength-Numerator.json Medication-Without-Strength-Numerator Instance examples/Example_Medication.fsh 45 - 63 -Medication-MedicationDexpanthenol-FD.json MedicationDexpanthenol-FD Instance examples/Example_Medication_Rezeptur_FD.fsh 57 - 65 -Medication-MedicationDexpanthenol.json MedicationDexpanthenol Instance examples/Example_Medication_Rezeptur.fsh 53 - 61 -Medication-MedicationHydrocortison-FD.json MedicationHydrocortison-FD Instance examples/Example_Medication_Rezeptur_FD.fsh 47 - 55 -Medication-MedicationHydrocortison.json MedicationHydrocortison Instance examples/Example_Medication_Rezeptur.fsh 43 - 51 -Medication-NasenSpray.json NasenSpray Instance examples/Example_Medication_Kombipackung.fsh 39 - 57 -Medication-SumatripanMedication.json SumatripanMedication Instance examples/Example_Medication.fsh 2 - 23 -MedicationDispense-Example-MedicationDispense-2.json Example-MedicationDispense-2 Instance examples/Example_MedicationDispense.fsh 29 - 41 -MedicationDispense-Example-MedicationDispense-DiGA-DeepLink.json Example-MedicationDispense-DiGA-DeepLink Instance examples/Example_MedicationDispense_DiGA.fsh 18 - 34 -MedicationDispense-Example-MedicationDispense-DiGA-Name-And-PZN.json Example-MedicationDispense-DiGA-Name-And-PZN Instance examples/Example_MedicationDispense_DiGA.fsh 1 - 16 -MedicationDispense-Example-MedicationDispense-DiGA-NoRedeemCode.json Example-MedicationDispense-DiGA-NoRedeemCode Instance examples/Example_MedicationDispense_DiGA.fsh 36 - 49 -MedicationDispense-Example-MedicationDispense-Kombipackung.json Example-MedicationDispense-Kombipackung Instance examples/Example_MedicationDispense.fsh 43 - 55 -MedicationDispense-Example-MedicationDispense-Rezeptur.json Example-MedicationDispense-Rezeptur Instance examples/Example_MedicationDispense.fsh 57 - 69 -MedicationDispense-Example-MedicationDispense-Without-Medication.json Example-MedicationDispense-Without-Medication Instance examples/Example_MedicationDispense.fsh 15 - 27 -MedicationDispense-Example-MedicationDispense.json Example-MedicationDispense Instance examples/Example_MedicationDispense.fsh 1 - 13 -OperationDefinition-AbortOperation.json AbortOperation Instance operationdefinitions/GEM_ERP_OP_Abort.fsh 1 - 23 -OperationDefinition-AcceptOperation.json AcceptOperation Instance operationdefinitions/GEM_ERP_OP_Accept.fsh 1 - 25 -OperationDefinition-ActivateOperation.json ActivateOperation Instance operationdefinitions/GEM_ERP_OP_Activate.fsh 1 - 26 -OperationDefinition-CloseOperation.json CloseOperation Instance operationdefinitions/GEM_ERP_OP_Close.fsh 1 - 51 -OperationDefinition-CreateOperation.json CreateOperation Instance operationdefinitions/GEM_ERP_OP_Create.fsh 1 - 28 -OperationDefinition-DispenseOperation.json DispenseOperation Instance operationdefinitions/GEM_ERP_OP_Dispense.fsh 1 - 69 -OperationDefinition-RejectOperation.json RejectOperation Instance operationdefinitions/GEM_ERP_OP_Reject.fsh 1 - 15 -OperationOutcome-ExampleOperationAbortErrorAVS.json ExampleOperationAbortErrorAVS Instance examples/Example_Operation_Abort.fsh 1 - 8 -OperationOutcome-ExampleOperationAbortErrorPVS.json ExampleOperationAbortErrorPVS Instance examples/Example_Operation_Abort.fsh 10 - 17 -OperationOutcome-ExampleOperationAcceptError.json ExampleOperationAcceptError Instance examples/Example_Operation_Accept.fsh 1 - 8 -OperationOutcome-ExampleOperationActivateError.json ExampleOperationActivateError Instance examples/Example_Operation_Activate.fsh 8 - 16 -OperationOutcome-ExampleOperationCloseError.json ExampleOperationCloseError Instance examples/Example_Operation_Close.fsh 81 - 89 -OperationOutcome-ExampleOperationCreateError.json ExampleOperationCreateError Instance examples/Example_Operation_Create.fsh 8 - 16 -OperationOutcome-ExampleOperationRejectError.json ExampleOperationRejectError Instance examples/Example_Operation_Reject.fsh 1 - 8 -Parameters-ExampleDispenseInputParameters.json ExampleDispenseInputParameters Instance examples/Example_Operation_Dispense.fsh 1 - 12 -Parameters-ExampleDispenseInputParametersKombipackung.json ExampleDispenseInputParametersKombipackung Instance examples/Example_Operation_Dispense.fsh 35 - 46 -Parameters-ExampleDispenseInputParametersMultipleMedicationDispenses.json ExampleDispenseInputParametersMultipleMedicationDispenses Instance examples/Example_Operation_Dispense.fsh 14 - 33 -Parameters-ExampleDispenseOutputParametersError.json ExampleDispenseOutputParametersError Instance examples/Example_Operation_Dispense.fsh 61 - 69 -Parameters-ExampleDispenseOutputParametersSuccess.json ExampleDispenseOutputParametersSuccess Instance examples/Example_Operation_Dispense.fsh 48 - 59 -Parameters-ExampleOperationActivateParametersInput.json ExampleOperationActivateParametersInput Instance examples/Example_Operation_Activate.fsh 1 - 6 -Parameters-ExampleOperationCloseInputParameters.json ExampleOperationCloseInputParameters Instance examples/Example_Operation_Close.fsh 1 - 12 -Parameters-ExampleOperationCloseInputParametersDiGA.json ExampleOperationCloseInputParametersDiGA Instance examples/Example_Operation_Close.fsh 61 - 69 -Parameters-ExampleOperationCloseInputParametersKombipackung.json ExampleOperationCloseInputParametersKombipackung Instance examples/Example_Operation_Close.fsh 35 - 46 -Parameters-ExampleOperationCloseInputParametersMultipleMedicationDispenses.json ExampleOperationCloseInputParametersMultipleMedicationDispenses Instance examples/Example_Operation_Close.fsh 14 - 33 -Parameters-ExampleOperationCloseInputParametersRezeptur.json ExampleOperationCloseInputParametersRezeptur Instance examples/Example_Operation_Close.fsh 48 - 59 -Parameters-INVALID-ExampleOperationCloseInputParametersWithoutMedication.json INVALID-ExampleOperationCloseInputParametersWithoutMedication Instance examples/Example_Operation_Close.fsh 71 - 79 -Parameters-OperationCreateParametersInputExample.json OperationCreateParametersInputExample Instance examples/Example_Operation_Create.fsh 1 - 6 -Provenance-64d5081e-8d65-11ec-b909-0242ac120002.json PractitionersNarcoticsApproval Instance examples/Example_Provenance.fsh 2 - 21 -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 - 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 - 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 -StructureDefinition-GEM-ERP-PR-AuditEvent.json GEM_ERP_PR_AuditEvent Profile profiles/GEM_ERP_PR_AuditEvent.fsh 1 - 32 -StructureDefinition-GEM-ERP-PR-BfArMApproval.json GEM_ERP_PR_BfArMApproval Profile profiles/GEM_ERP_PR_BfArMApproval.fsh 1 - 71 -StructureDefinition-GEM-ERP-PR-Binary.json GEM_ERP_PR_Binary Profile profiles/GEM_ERP_PR_Binary.fsh 1 - 8 -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 - 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 -StructureDefinition-GEM-ERP-PR-Device.json GEM_ERP_PR_Device Profile profiles/GEM_ERP_PR_Device.fsh 1 - 11 -StructureDefinition-GEM-ERP-PR-Digest.json GEM_ERP_PR_Digest Profile profiles/GEM_ERP_PR_Digest.fsh 1 - 8 -StructureDefinition-GEM-ERP-PR-Medication.json GEM_ERP_PR_Medication Profile profiles/GEM_ERP_PR_Medication.fsh 1 - 23 -StructureDefinition-GEM-ERP-PR-MedicationDispense-DiGA.json GEM_ERP_PR_MedicationDispense_DiGA Profile profiles/GEM_ERP_PR_MedicationDispense_DiGA.fsh 1 - 57 -StructureDefinition-GEM-ERP-PR-MedicationDispense.json GEM_ERP_PR_MedicationDispense Profile profiles/GEM_ERP_PR_MedicationDispense.fsh 1 - 26 -StructureDefinition-GEM-ERP-PR-PAR-Accept-Operation-Output.json GEM_ERP_PR_PAR_AcceptOperation_Output Profile parameters/GEM_ERP_PR_PAR_AcceptOperation_Output.fsh 1 - 22 -StructureDefinition-GEM-ERP-PR-PAR-Activate-Operation-Input.json GEM_ERP_PR_PAR_ActivateOperation_Input Profile parameters/GEM_ERP_PR_PAR_ActivateOperation_Input.fsh 1 - 20 -StructureDefinition-GEM-ERP-PR-PAR-Activate-Operation-Output.json GEM_ERP_PR_PAR_ActivateOperation_Output Profile parameters/GEM_ERP_PR_PAR_ActivateOperation_Output.fsh 1 - 22 -StructureDefinition-GEM-ERP-PR-PAR-Close-Operation-Input.json GEM_ERP_PR_PAR_CloseOperation_Input Profile parameters/GEM_ERP_PR_PAR_CloseOperation_Input.fsh 1 - 42 -StructureDefinition-GEM-ERP-PR-PAR-Close-Operation-Output.json GEM_ERP_PR_PAR_CloseOperation_Output Profile parameters/GEM_ERP_PR_PAR_CloseOperation_Output.fsh 1 - 22 -StructureDefinition-GEM-ERP-PR-PAR-Create-Operation-Input.json GEM_ERP_PR_PAR_CreateOperation_Input Profile parameters/GEM_ERP_PR_PAR_CreateOperation_Input.fsh 1 - 20 -StructureDefinition-GEM-ERP-PR-PAR-Create-Operation-Output.json GEM_ERP_PR_PAR_CreateOperation_Output Profile parameters/GEM_ERP_PR_PAR_CreateOperation_Output.fsh 1 - 22 -StructureDefinition-GEM-ERP-PR-PAR-Dispense-Operation-Input.json GEM_ERP_PR_PAR_DispenseOperation_Input Profile parameters/GEM_ERP_PR_PAR_DispenseOperation_Input.fsh 1 - 41 -StructureDefinition-GEM-ERP-PR-PAR-Dispense-Operation-Output.json GEM_ERP_PR_PAR_DispenseOperation_Output Profile parameters/GEM_ERP_PR_PAR_DispenseOperation_Output.fsh 1 - 48 -StructureDefinition-GEM-ERP-PR-PrescriptionId.json GEM_ERP_PR_PrescriptionId Profile profiles/GEM_ERP_PR_PrescriptionId.fsh 1 - 13 -StructureDefinition-GEM-ERP-PR-Secret.json GEM_ERP_PR_Secret Profile profiles/GEM_ERP_PR_Secret.fsh 1 - 12 -StructureDefinition-GEM-ERP-PR-Signature.json GEM_ERP_PR_Signature Profile profiles/GEM_ERP_PR_Signature.fsh 1 - 23 -StructureDefinition-GEM-ERP-PR-Task.json GEM_ERP_PR_Task Profile profiles/GEM_ERP_PR_Task.fsh 1 - 77 -StructureDefinition-logMedDispense.json GEM_ERP_LOG_MedicationDispense Logical logicalmodels/logical-medication-dispense.fsh 1 - 114 -StructureDefinition-logMedDispenseDiGA.json GEM_ERP_LOG_MedicationDispense_DiGA Logical logicalmodels/logical-medication-dispense-diga.fsh 1 - 20 -Task-09330307-16ce-4cdc-810a-ca24ef80dde3.json TaskInClosedState Instance examples/Example_Task.fsh 144 - 173 -Task-607255ed-ce41-47fc-aad3-cfce1c39963f.json TaskInReadyState Instance examples/Example_Task.fsh 26 - 53 -Task-9b48f82c-9c11-4a57-aa72-a805f9537a82.json TaskIn-ProgressState-Dispensed Instance examples/Example_Task.fsh 82 - 111 -Task-b12eb5f7-91ce-4887-93c7-800454601377.json TaskInCreatedState Instance examples/Example_Task.fsh 2 - 24 -Task-d70932d1-9e1c-483c-b2d4-b7dced09b35e.json TaskIn-ProgressState Instance examples/Example_Task.fsh 55 - 80 -Task-f5c21409-b84b-4125-8649-5630a00906b1.json TaskIn-ProgressState-Dispensed-Multiple-MedicationDispenses Instance examples/Example_Task.fsh 113 - 142 -ValueSet-GEM-ERP-VS-AvailabilityStatus.json GEM_ERP_VS_AvailabilityStatus ValueSet valuesets/GEM_ERP_VS_AvailabilityStatus.fsh 1 - 6 -ValueSet-GEM-ERP-VS-DocumentType.json GEM_ERP_VS_DocumentType ValueSet valuesets/GEM_ERP_VS_DocumentType.fsh 1 - 11 -ValueSet-GEM-ERP-VS-FlowType.json GEM_ERP_VS_FlowType ValueSet valuesets/GEM_ERP_VS_FlowType.fsh 1 - 6 -ValueSet-GEM-ERP-VS-OrganizationType.json GEM_ERP_VS_OrganizationType ValueSet valuesets/GEM_ERP_VS_OrganizationType.fsh 1 - 6 -ValueSet-GEM-ERP-VS-PerformerType.json PerformerTypeVS ValueSet valuesets/GEM_ERP_VS_PerformerType.fsh 5 - 16 \ No newline at end of file +Output File Name Type FSH File Lines +AuditEvent-9361863d-fec0-4ba9-8776-7905cf1b0cfa.json AuditEventSample Instance examples/Example_AuditEvent.fsh 2 - 32 +Bundle-Bundle-AcceptOperation.json Bundle-AcceptOperation Instance examples/Example_Bundle.fsh 34 - 45 +Bundle-dffbfd6a-5712-4798-bdc8-07201eb77ab8.json ReceiptBundleQuittung Instance examples/Example_Bundle.fsh 10 - 32 +CodeSystem-GEM-ERP-CS-AvailabilityStatus.json GEM_ERP_CS_AvailabilityStatus CodeSystem codesystems/GEM_ERP_CS_AvailabilityStatus.fsh 1 - 12 +CodeSystem-GEM-ERP-CS-DocumentType.json GEM_ERP_CS_DocumentType CodeSystem codesystems/GEM_ERP_CS_DocumentType.fsh 1 - 10 +CodeSystem-GEM-ERP-CS-FlowType.json GEM_ERP_CS_FlowType CodeSystem codesystems/GEM_ERP_CS_FlowType.fsh 1 - 16 +CodeSystem-GEM-ERP-CS-OrganizationType.json GEM_ERP_CS_OrganizationType CodeSystem codesystems/GEM_ERP_CS_OrganizationType.fsh 1 - 8 +Communication-2be1c6ac-5d10-47f6-84ee-8318b2c22c76.json Communication_DispenseRequest_DiGA Instance examples/Example_Communication_DispReq.fsh 20 - 35 +Communication-7977a4ab-97a9-4d95-afb3-6c4c1e2ac596.json Communication_Reply Instance examples/Example_Communication_Reply.fsh 2 - 26 +Communication-8ca3c379-ac86-470f-bc12-178c9008f5c9.json Communication_InformationRequest Instance examples/Example_Communication_InfoReq.fsh 1 - 35 +Communication-a218a36e-f2fd-4603-ba67-c827acfef01b.json Communication_DispenseRequest Instance examples/Example_Communication_DispReq.fsh 2 - 18 +Medication-Augentropfen.json Augentropfen Instance examples/Example_Medication_Kombipackung.fsh 19 - 37 +Medication-Medication-Kombipackung.json Medication-Kombipackung Instance examples/Example_Medication_Kombipackung.fsh 2 - 17 +Medication-Medication-Rezeptur-FD.json Medication-Rezeptur-FD Instance examples/Example_Medication_Rezeptur_FD.fsh 2 - 45 +Medication-Medication-Rezeptur.json Medication-Rezeptur Instance examples/Example_Medication_Rezeptur.fsh 2 - 41 +Medication-Medication-Without-Strength-Code.json Medication-Without-Strength-Code Instance examples/Example_Medication.fsh 33 - 50 +Medication-Medication-Without-Strength-Numerator.json Medication-Without-Strength-Numerator Instance examples/Example_Medication.fsh 52 - 70 +Medication-MedicationDexpanthenol-FD.json MedicationDexpanthenol-FD Instance examples/Example_Medication_Rezeptur_FD.fsh 57 - 65 +Medication-MedicationDexpanthenol.json MedicationDexpanthenol Instance examples/Example_Medication_Rezeptur.fsh 53 - 61 +Medication-MedicationHydrocortison-FD.json MedicationHydrocortison-FD Instance examples/Example_Medication_Rezeptur_FD.fsh 47 - 55 +Medication-MedicationHydrocortison.json MedicationHydrocortison Instance examples/Example_Medication_Rezeptur.fsh 43 - 51 +Medication-NasenSpray.json NasenSpray Instance examples/Example_Medication_Kombipackung.fsh 39 - 57 +Medication-SimpleMedication.json SimpleMedication Instance examples/Example_Medication.fsh 25 - 30 +Medication-SumatripanMedication.json SumatripanMedication Instance examples/Example_Medication.fsh 2 - 23 +MedicationDispense-Example-MedicationDispense-2.json Example-MedicationDispense-2 Instance examples/Example_MedicationDispense.fsh 29 - 41 +MedicationDispense-Example-MedicationDispense-DiGA-DeepLink.json Example-MedicationDispense-DiGA-DeepLink Instance examples/Example_MedicationDispense_DiGA.fsh 18 - 34 +MedicationDispense-Example-MedicationDispense-DiGA-Name-And-PZN.json Example-MedicationDispense-DiGA-Name-And-PZN Instance examples/Example_MedicationDispense_DiGA.fsh 1 - 16 +MedicationDispense-Example-MedicationDispense-DiGA-NoRedeemCode.json Example-MedicationDispense-DiGA-NoRedeemCode Instance examples/Example_MedicationDispense_DiGA.fsh 36 - 49 +MedicationDispense-Example-MedicationDispense-Kombipackung.json Example-MedicationDispense-Kombipackung Instance examples/Example_MedicationDispense.fsh 43 - 55 +MedicationDispense-Example-MedicationDispense-Rezeptur.json Example-MedicationDispense-Rezeptur Instance examples/Example_MedicationDispense.fsh 57 - 69 +MedicationDispense-Example-MedicationDispense-Without-Medication.json Example-MedicationDispense-Without-Medication Instance examples/Example_MedicationDispense.fsh 15 - 27 +MedicationDispense-Example-MedicationDispense.json Example-MedicationDispense Instance examples/Example_MedicationDispense.fsh 1 - 13 +OperationDefinition-AbortOperation.json AbortOperation Instance operationdefinitions/GEM_ERP_OP_Abort.fsh 1 - 23 +OperationDefinition-AcceptOperation.json AcceptOperation Instance operationdefinitions/GEM_ERP_OP_Accept.fsh 1 - 25 +OperationDefinition-ActivateOperation.json ActivateOperation Instance operationdefinitions/GEM_ERP_OP_Activate.fsh 1 - 26 +OperationDefinition-CloseOperation.json CloseOperation Instance operationdefinitions/GEM_ERP_OP_Close.fsh 1 - 51 +OperationDefinition-CreateOperation.json CreateOperation Instance operationdefinitions/GEM_ERP_OP_Create.fsh 1 - 28 +OperationDefinition-DispenseOperation.json DispenseOperation Instance operationdefinitions/GEM_ERP_OP_Dispense.fsh 1 - 69 +OperationDefinition-RejectOperation.json RejectOperation Instance operationdefinitions/GEM_ERP_OP_Reject.fsh 1 - 15 +OperationOutcome-ExampleOperationAbortErrorAVS.json ExampleOperationAbortErrorAVS Instance examples/Example_Operation_Abort.fsh 1 - 8 +OperationOutcome-ExampleOperationAbortErrorPVS.json ExampleOperationAbortErrorPVS Instance examples/Example_Operation_Abort.fsh 10 - 17 +OperationOutcome-ExampleOperationAcceptError.json ExampleOperationAcceptError Instance examples/Example_Operation_Accept.fsh 1 - 8 +OperationOutcome-ExampleOperationActivateError.json ExampleOperationActivateError Instance examples/Example_Operation_Activate.fsh 8 - 16 +OperationOutcome-ExampleOperationCloseError.json ExampleOperationCloseError Instance examples/Example_Operation_Close.fsh 1 - 9 +OperationOutcome-ExampleOperationCreateError.json ExampleOperationCreateError Instance examples/Example_Operation_Create.fsh 8 - 16 +OperationOutcome-ExampleOperationRejectError.json ExampleOperationRejectError Instance examples/Example_Operation_Reject.fsh 1 - 8 +Parameters-ExampleCloseInputParameters.json ExampleCloseInputParameters Instance examples/parameters_examples/Example_Parameters_CloseInput.fsh 1 - 12 +Parameters-ExampleCloseInputParametersDiGA.json ExampleCloseInputParametersDiGA Instance examples/parameters_examples/Example_Parameters_CloseInput.fsh 61 - 69 +Parameters-ExampleCloseInputParametersKombipackung.json ExampleCloseInputParametersKombipackung Instance examples/parameters_examples/Example_Parameters_CloseInput.fsh 35 - 46 +Parameters-ExampleCloseInputParametersMultipleMedicationDispenses.json ExampleCloseInputParametersMultipleMedicationDispenses Instance examples/parameters_examples/Example_Parameters_CloseInput.fsh 14 - 33 +Parameters-ExampleCloseInputParametersRezeptur.json ExampleCloseInputParametersRezeptur Instance examples/parameters_examples/Example_Parameters_CloseInput.fsh 48 - 59 +Parameters-ExampleDispenseInputParameters.json ExampleDispenseInputParameters Instance examples/Example_Operation_Dispense.fsh 1 - 12 +Parameters-ExampleDispenseInputParametersKombipackung.json ExampleDispenseInputParametersKombipackung Instance examples/Example_Operation_Dispense.fsh 35 - 46 +Parameters-ExampleDispenseInputParametersMultipleMedicationDispenses.json ExampleDispenseInputParametersMultipleMedicationDispenses Instance examples/Example_Operation_Dispense.fsh 14 - 33 +Parameters-ExampleDispenseOutputParametersError.json ExampleDispenseOutputParametersError Instance examples/Example_Operation_Dispense.fsh 61 - 69 +Parameters-ExampleDispenseOutputParametersSuccess.json ExampleDispenseOutputParametersSuccess Instance examples/Example_Operation_Dispense.fsh 48 - 59 +Parameters-ExampleOperationActivateParametersInput.json ExampleOperationActivateParametersInput Instance examples/Example_Operation_Activate.fsh 1 - 6 +Parameters-OperationCreateParametersInputExample.json OperationCreateParametersInputExample Instance examples/Example_Operation_Create.fsh 1 - 6 +Provenance-64d5081e-8d65-11ec-b909-0242ac120002.json PractitionersNarcoticsApproval Instance examples/Example_Provenance.fsh 2 - 21 +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 - 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 - 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 +StructureDefinition-GEM-ERP-PR-AuditEvent.json GEM_ERP_PR_AuditEvent Profile profiles/GEM_ERP_PR_AuditEvent.fsh 1 - 32 +StructureDefinition-GEM-ERP-PR-BfArMApproval.json GEM_ERP_PR_BfArMApproval Profile profiles/GEM_ERP_PR_BfArMApproval.fsh 1 - 71 +StructureDefinition-GEM-ERP-PR-Binary.json GEM_ERP_PR_Binary Profile profiles/GEM_ERP_PR_Binary.fsh 1 - 8 +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 - 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 +StructureDefinition-GEM-ERP-PR-Device.json GEM_ERP_PR_Device Profile profiles/GEM_ERP_PR_Device.fsh 1 - 11 +StructureDefinition-GEM-ERP-PR-Digest.json GEM_ERP_PR_Digest Profile profiles/GEM_ERP_PR_Digest.fsh 1 - 8 +StructureDefinition-GEM-ERP-PR-Medication.json GEM_ERP_PR_Medication Profile profiles/GEM_ERP_PR_Medication.fsh 1 - 23 +StructureDefinition-GEM-ERP-PR-MedicationDispense-DiGA.json GEM_ERP_PR_MedicationDispense_DiGA Profile profiles/GEM_ERP_PR_MedicationDispense_DiGA.fsh 1 - 57 +StructureDefinition-GEM-ERP-PR-MedicationDispense.json GEM_ERP_PR_MedicationDispense Profile profiles/GEM_ERP_PR_MedicationDispense.fsh 1 - 26 +StructureDefinition-GEM-ERP-PR-PAR-Accept-Operation-Output.json GEM_ERP_PR_PAR_AcceptOperation_Output Profile parameters/GEM_ERP_PR_PAR_AcceptOperation_Output.fsh 1 - 22 +StructureDefinition-GEM-ERP-PR-PAR-Activate-Operation-Input.json GEM_ERP_PR_PAR_ActivateOperation_Input Profile parameters/GEM_ERP_PR_PAR_ActivateOperation_Input.fsh 1 - 20 +StructureDefinition-GEM-ERP-PR-PAR-Activate-Operation-Output.json GEM_ERP_PR_PAR_ActivateOperation_Output Profile parameters/GEM_ERP_PR_PAR_ActivateOperation_Output.fsh 1 - 22 +StructureDefinition-GEM-ERP-PR-PAR-Close-Operation-Input.json GEM_ERP_PR_PAR_CloseOperation_Input Profile parameters/GEM_ERP_PR_PAR_CloseOperation_Input.fsh 1 - 43 +StructureDefinition-GEM-ERP-PR-PAR-Close-Operation-Output.json GEM_ERP_PR_PAR_CloseOperation_Output Profile parameters/GEM_ERP_PR_PAR_CloseOperation_Output.fsh 1 - 22 +StructureDefinition-GEM-ERP-PR-PAR-Create-Operation-Input.json GEM_ERP_PR_PAR_CreateOperation_Input Profile parameters/GEM_ERP_PR_PAR_CreateOperation_Input.fsh 1 - 20 +StructureDefinition-GEM-ERP-PR-PAR-Create-Operation-Output.json GEM_ERP_PR_PAR_CreateOperation_Output Profile parameters/GEM_ERP_PR_PAR_CreateOperation_Output.fsh 1 - 22 +StructureDefinition-GEM-ERP-PR-PAR-Dispense-Operation-Input.json GEM_ERP_PR_PAR_DispenseOperation_Input Profile parameters/GEM_ERP_PR_PAR_DispenseOperation_Input.fsh 1 - 41 +StructureDefinition-GEM-ERP-PR-PAR-Dispense-Operation-Output.json GEM_ERP_PR_PAR_DispenseOperation_Output Profile parameters/GEM_ERP_PR_PAR_DispenseOperation_Output.fsh 1 - 48 +StructureDefinition-GEM-ERP-PR-PrescriptionId.json GEM_ERP_PR_PrescriptionId Profile profiles/GEM_ERP_PR_PrescriptionId.fsh 1 - 13 +StructureDefinition-GEM-ERP-PR-Secret.json GEM_ERP_PR_Secret Profile profiles/GEM_ERP_PR_Secret.fsh 1 - 12 +StructureDefinition-GEM-ERP-PR-Signature.json GEM_ERP_PR_Signature Profile profiles/GEM_ERP_PR_Signature.fsh 1 - 23 +StructureDefinition-GEM-ERP-PR-Task.json GEM_ERP_PR_Task Profile profiles/GEM_ERP_PR_Task.fsh 1 - 77 +StructureDefinition-logMedDispense.json GEM_ERP_LOG_MedicationDispense Logical logicalmodels/logical-medication-dispense.fsh 1 - 114 +StructureDefinition-logMedDispenseDiGA.json GEM_ERP_LOG_MedicationDispense_DiGA Logical logicalmodels/logical-medication-dispense-diga.fsh 1 - 20 +Task-09330307-16ce-4cdc-810a-ca24ef80dde3.json TaskInClosedState Instance examples/Example_Task.fsh 144 - 173 +Task-607255ed-ce41-47fc-aad3-cfce1c39963f.json TaskInReadyState Instance examples/Example_Task.fsh 26 - 53 +Task-9b48f82c-9c11-4a57-aa72-a805f9537a82.json TaskIn-ProgressState-Dispensed Instance examples/Example_Task.fsh 82 - 111 +Task-b12eb5f7-91ce-4887-93c7-800454601377.json TaskInCreatedState Instance examples/Example_Task.fsh 2 - 24 +Task-d70932d1-9e1c-483c-b2d4-b7dced09b35e.json TaskIn-ProgressState Instance examples/Example_Task.fsh 55 - 80 +Task-f5c21409-b84b-4125-8649-5630a00906b1.json TaskIn-ProgressState-Dispensed-Multiple-MedicationDispenses Instance examples/Example_Task.fsh 113 - 142 +ValueSet-GEM-ERP-VS-AvailabilityStatus.json GEM_ERP_VS_AvailabilityStatus ValueSet valuesets/GEM_ERP_VS_AvailabilityStatus.fsh 1 - 6 +ValueSet-GEM-ERP-VS-DocumentType.json GEM_ERP_VS_DocumentType ValueSet valuesets/GEM_ERP_VS_DocumentType.fsh 1 - 11 +ValueSet-GEM-ERP-VS-FlowType.json GEM_ERP_VS_FlowType ValueSet valuesets/GEM_ERP_VS_FlowType.fsh 1 - 6 +ValueSet-GEM-ERP-VS-OrganizationType.json GEM_ERP_VS_OrganizationType ValueSet valuesets/GEM_ERP_VS_OrganizationType.fsh 1 - 6 +ValueSet-GEM-ERP-VS-PerformerType.json PerformerTypeVS ValueSet valuesets/GEM_ERP_VS_PerformerType.fsh 5 - 16 \ No newline at end of file diff --git a/Resources/fsh-generated/resources/Parameters-INVALID-ExampleOperationCloseInputParametersWithoutMedication.json b/Resources/fsh-generated/resources/Parameters-INVALID-ExampleOperationCloseInputParametersWithoutMedication.json deleted file mode 100644 index b92135fc..00000000 --- a/Resources/fsh-generated/resources/Parameters-INVALID-ExampleOperationCloseInputParametersWithoutMedication.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "resourceType": "Parameters", - "id": "INVALID-ExampleOperationCloseInputParametersWithoutMedication", - "meta": { - "profile": [ - "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_PAR_CloseOperation_Input|1.4" - ] - }, - "parameter": [ - { - "name": "rxDispensation", - "part": [ - { - "name": "medicationDispense", - "resource": { - "resourceType": "MedicationDispense", - "id": "Example-MedicationDispense-Without-Medication", - "meta": { - "profile": [ - "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_MedicationDispense|1.4" - ] - }, - "identifier": [ - { - "system": "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_PrescriptionId", - "value": "160.000.033.491.280.78" - } - ], - "status": "completed", - "subject": { - "identifier": { - "system": "http://fhir.de/sid/gkv/kvid-10", - "value": "X123456789" - } - }, - "performer": [ - { - "actor": { - "identifier": { - "system": "https://gematik.de/fhir/sid/telematik-id", - "value": "3-SMC-B-Testkarte-883110000095957" - } - } - } - ], - "whenHandedOver": "2024-04-03", - "medicationReference": { - "reference": "Medication/SumatripanMedication" - } - } - } - ] - } - ] -} diff --git a/Resources/input/fsh/examples/Example_Operation_Close.fsh b/Resources/input/fsh/examples/Example_Operation_Close.fsh index f6b841fb..e07d8c1f 100644 --- a/Resources/input/fsh/examples/Example_Operation_Close.fsh +++ b/Resources/input/fsh/examples/Example_Operation_Close.fsh @@ -1,83 +1,3 @@ -Instance: ExampleOperationCloseInputParameters -InstanceOf: GEM_ERP_PR_PAR_CloseOperation_Input -Usage: #example -Title: "Example Close Parameters" -* parameter[rxDispensation] - * name = "rxDispensation" - * part[medicationDispense] - * name = "medicationDispense" - * resource = Example-MedicationDispense - * part[medication] - * name = "medication" - * resource = SumatripanMedication - -Instance: ExampleOperationCloseInputParametersMultipleMedicationDispenses -InstanceOf: GEM_ERP_PR_PAR_CloseOperation_Input -Usage: #example -Title: "Example Close Parameters" -* parameter[rxDispensation][+] - * name = "rxDispensation" - * part[medicationDispense] - * name = "medicationDispense" - * resource = Example-MedicationDispense - * part[medication] - * name = "medication" - * resource = SumatripanMedication -* parameter[rxDispensation][+] - * name = "rxDispensation" - * part[medicationDispense] - * name = "medicationDispense" - * resource = Example-MedicationDispense-2 - * part[medication] - * name = "medication" - * resource = Medication-Without-Strength-Code - -Instance: ExampleOperationCloseInputParametersKombipackung -InstanceOf: GEM_ERP_PR_PAR_CloseOperation_Input -Usage: #example -Title: "Example Close Parameters" -* parameter[rxDispensation] - * name = "rxDispensation" - * part[medicationDispense] - * name = "medicationDispense" - * resource = Example-MedicationDispense-Kombipackung - * part[medication] - * name = "medication" - * resource = Medication-Kombipackung - -Instance: ExampleOperationCloseInputParametersRezeptur -InstanceOf: GEM_ERP_PR_PAR_CloseOperation_Input -Usage: #example -Title: "Example Close Parameters" -* parameter[rxDispensation] - * name = "rxDispensation" - * part[medicationDispense] - * name = "medicationDispense" - * resource = Example-MedicationDispense-Rezeptur - * part[medication] - * name = "medication" - * resource = Medication-Rezeptur - -Instance: ExampleOperationCloseInputParametersDiGA -InstanceOf: GEM_ERP_PR_PAR_CloseOperation_Input -Usage: #example -Title: "Example Close Parameters" -* parameter[rxDispensation] - * name = "rxDispensation" - * part[medicationDispense] - * name = "medicationDispense" - * resource = Example-MedicationDispense-DiGA-Name-And-PZN - -Instance: INVALID-ExampleOperationCloseInputParametersWithoutMedication -InstanceOf: GEM_ERP_PR_PAR_CloseOperation_Input -Usage: #example -Title: "Example Close Parameters" -* parameter[rxDispensation] - * name = "rxDispensation" - * part[medicationDispense] - * name = "medicationDispense" - * resource = Example-MedicationDispense-Without-Medication - Instance: ExampleOperationCloseError InstanceOf: OperationOutcome Title: "Example Close operation error response" diff --git a/Resources/input/fsh/examples/parameters_examples/Example_Parameters_CloseInput.fsh b/Resources/input/fsh/examples/parameters_examples/Example_Parameters_CloseInput.fsh new file mode 100644 index 00000000..ba5329b5 --- /dev/null +++ b/Resources/input/fsh/examples/parameters_examples/Example_Parameters_CloseInput.fsh @@ -0,0 +1,94 @@ +Instance: ExampleCloseInputParameters +InstanceOf: GEM_ERP_PR_PAR_CloseOperation_Input +Usage: #example +Title: "Example Close Parameters" +* parameter[rxDispensation] + * name = "rxDispensation" + * part[medicationDispense] + * name = "medicationDispense" + * resource = Example-MedicationDispense + * part[medication] + * name = "medication" + * resource = SumatripanMedication + +Instance: ExampleCloseInputParametersMultipleMedicationDispenses +InstanceOf: GEM_ERP_PR_PAR_CloseOperation_Input +Usage: #example +Title: "Example Close Parameters" +* parameter[rxDispensation][+] + * name = "rxDispensation" + * part[medicationDispense] + * name = "medicationDispense" + * resource = Example-MedicationDispense + * part[medication] + * name = "medication" + * resource = SumatripanMedication +* parameter[rxDispensation][+] + * name = "rxDispensation" + * part[medicationDispense] + * name = "medicationDispense" + * resource = Example-MedicationDispense-2 + * part[medication] + * name = "medication" + * resource = Medication-Without-Strength-Code + +Instance: ExampleCloseInputParametersKombipackung +InstanceOf: GEM_ERP_PR_PAR_CloseOperation_Input +Usage: #example +Title: "Example Close Parameters" +* parameter[rxDispensation] + * name = "rxDispensation" + * part[medicationDispense] + * name = "medicationDispense" + * resource = Example-MedicationDispense-Kombipackung + * part[medication] + * name = "medication" + * resource = Medication-Kombipackung + +Instance: ExampleCloseInputParametersRezeptur +InstanceOf: GEM_ERP_PR_PAR_CloseOperation_Input +Usage: #example +Title: "Example Close Parameters" +* parameter[rxDispensation] + * name = "rxDispensation" + * part[medicationDispense] + * name = "medicationDispense" + * resource = Example-MedicationDispense-Rezeptur + * part[medication] + * name = "medication" + * resource = Medication-Rezeptur + +Instance: ExampleCloseInputParametersDiGA +InstanceOf: GEM_ERP_PR_PAR_CloseOperation_Input +Usage: #example +Title: "Example Close Parameters" +* parameter[rxDispensation] + * name = "rxDispensation" + * part[medicationDispense] + * name = "medicationDispense" + * resource = Example-MedicationDispense-DiGA-Name-And-PZN + +/* +Instance: INVALID-ExampleCloseInputParametersWithoutMedication +InstanceOf: GEM_ERP_PR_PAR_CloseOperation_Input +Usage: #example +Title: "Example Close Parameters" +* parameter[rxDispensation] + * name = "rxDispensation" + * part[medicationDispense] + * name = "medicationDispense" + * resource = Example-MedicationDispense-Without-Medication + +Instance: INVALID-ExampleCloseInputParametersReferenceWrong +InstanceOf: GEM_ERP_PR_PAR_CloseOperation_Input +Usage: #example +Title: "Example Close Parameters" +* parameter[rxDispensation] + * name = "rxDispensation" + * part[medicationDispense] + * name = "medicationDispense" + * resource = Example-MedicationDispense + * part[medication] + * name = "medication" + * resource = SimpleMedication +*/ \ No newline at end of file From 9e3786d801d9d9601f383e96fc482b9720a6f1aa Mon Sep 17 00:00:00 2001 From: florianschoffke Date: Tue, 3 Sep 2024 11:54:26 +0200 Subject: [PATCH 08/19] Fix constraint for Communcation --- .../StructureDefinition-GEM-ERP-PR-Communication-DispReq.json | 2 +- .../input/fsh/profiles/GEM_ERP_PR_Communication_DispReq.fsh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-DispReq.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-DispReq.json index f18d3437..f08c2de5 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-DispReq.json +++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-DispReq.json @@ -25,7 +25,7 @@ "human": "Payload muss angegeben werden, wenn eine Zuweisung für ein Arzneimittel vorgenommen wird", "source": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_Communication_DispReq", "severity": "error", - "expression": "(extension.where(url = 'https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_PrescriptionType').valueCoding.code = '162' implies payload.exists().not()) and (extension.where(url = 'https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_PrescriptionType').valueCoding.code != '162' implies payload.exists() and payload.empty().not())" + "expression": "(extension.where(url = 'https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_PrescriptionType').value.code = '162' implies payload.exists().not()) and (extension.where(url = 'https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_PrescriptionType').value.code != '162' implies payload.exists() and payload.empty().not())" } ] }, diff --git a/Resources/input/fsh/profiles/GEM_ERP_PR_Communication_DispReq.fsh b/Resources/input/fsh/profiles/GEM_ERP_PR_Communication_DispReq.fsh index cf04f99b..2a0f83ed 100644 --- a/Resources/input/fsh/profiles/GEM_ERP_PR_Communication_DispReq.fsh +++ b/Resources/input/fsh/profiles/GEM_ERP_PR_Communication_DispReq.fsh @@ -42,4 +42,4 @@ Description: "Ressource used for the communication of dispense request between p Invariant: workflow-communication-payload-1 Description: "Payload muss angegeben werden, wenn eine Zuweisung für ein Arzneimittel vorgenommen wird" * severity = #error -* expression = "(extension.where(url = 'https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_PrescriptionType').valueCoding.code = '162' implies payload.exists().not()) and (extension.where(url = 'https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_PrescriptionType').valueCoding.code != '162' implies payload.exists() and payload.empty().not())" +* expression = "(extension.where(url = 'https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_PrescriptionType').value.code = '162' implies payload.exists().not()) and (extension.where(url = 'https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_PrescriptionType').value.code != '162' implies payload.exists() and payload.empty().not())" \ No newline at end of file From 2d7e0e4fb22bb39a19953fee55143fbed29e9e05 Mon Sep 17 00:00:00 2001 From: florianschoffke Date: Thu, 5 Sep 2024 12:39:36 +0200 Subject: [PATCH 09/19] Better implementation of FHIR Constraint --- ...uctureDefinition-GEM-ERP-PR-PAR-Close-Operation-Input.json | 4 ++-- .../fsh/parameters/GEM_ERP_PR_PAR_CloseOperation_Input.fsh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-PAR-Close-Operation-Input.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-PAR-Close-Operation-Input.json index e350d568..045d31ae 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-PAR-Close-Operation-Input.json +++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-PAR-Close-Operation-Input.json @@ -52,14 +52,14 @@ "key": "workflow-parameters-close-medication-exists", "severity": "error", "human": "If a reference from a MedicationDispense to a Medication exists, a Medication resource must exist.", - "expression": "part.where(name = 'medicationDispense').resource.medication.reference.exists() implies part.where(name = 'medication').exists()", + "expression": "part.where(name = 'medicationDispense').resource.medication.ofType(Reference).exists() implies part.where(name = 'medication').exists()", "source": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_PAR_CloseOperation_Input" }, { "key": "workflow-parameters-close-medication-references", "severity": "error", "human": "If a reference from a MedicationDispense to a Medication exists, the reference must resolve to the Medication.", - "expression": "part.where(name = 'medicationDispense').resource.medication.reference.exists() implies ((part.where(name = 'medicationDispense').resource.medication.reference.split('/').last().split(':').last()) = (part.where(name = 'medication').resource.id))", + "expression": "part.where(name = 'medicationDispense').resource.medication.ofType(Reference).exists() implies ((part.where(name = 'medicationDispense').resource.medication.reference.split('/').last().split(':').last()) = (part.where(name = 'medication').resource.id))", "source": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_PAR_CloseOperation_Input" } ] diff --git a/Resources/input/fsh/parameters/GEM_ERP_PR_PAR_CloseOperation_Input.fsh b/Resources/input/fsh/parameters/GEM_ERP_PR_PAR_CloseOperation_Input.fsh index 26463c1a..ed30f749 100644 --- a/Resources/input/fsh/parameters/GEM_ERP_PR_PAR_CloseOperation_Input.fsh +++ b/Resources/input/fsh/parameters/GEM_ERP_PR_PAR_CloseOperation_Input.fsh @@ -44,11 +44,11 @@ Description: "This profile defines the parameters for closing a workflow for a p Invariant: workflow-parameters-close-medication-exists Description: "If a reference from a MedicationDispense to a Medication exists, a Medication resource must exist." -Expression: "part.where(name = 'medicationDispense').resource.medication.reference.exists() implies part.where(name = 'medication').exists()" +Expression: "part.where(name = 'medicationDispense').resource.medication.ofType(Reference).exists() implies part.where(name = 'medication').exists()" Severity: #error Invariant: workflow-parameters-close-medication-references Description: "If a reference from a MedicationDispense to a Medication exists, the reference must resolve to the Medication." -Expression: "part.where(name = 'medicationDispense').resource.medication.reference.exists() implies ((part.where(name = 'medicationDispense').resource.medication.reference.split('/').last().split(':').last()) = (part.where(name = 'medication').resource.id))" +Expression: "part.where(name = 'medicationDispense').resource.medication.ofType(Reference).exists() implies ((part.where(name = 'medicationDispense').resource.medication.reference.split('/').last().split(':').last()) = (part.where(name = 'medication').resource.id))" Severity: #error From e6845f05ae89f290ef7c822f785e4217a361bb57 Mon Sep 17 00:00:00 2001 From: florianschoffke Date: Thu, 5 Sep 2024 12:40:50 +0200 Subject: [PATCH 10/19] Add constraint to dispense input paramters --- Resources/fsh-generated/fsh-index.json | 2 +- Resources/fsh-generated/fsh-index.txt | 2 +- ...finition-GEM-ERP-PR-PAR-Close-Operation-Input.json | 2 +- ...ition-GEM-ERP-PR-PAR-Dispense-Operation-Input.json | 11 ++++++++++- .../GEM_ERP_PR_PAR_CloseOperation_Input.fsh | 4 ++-- .../GEM_ERP_PR_PAR_DispenseOperation_Input.fsh | 1 + 6 files changed, 16 insertions(+), 6 deletions(-) diff --git a/Resources/fsh-generated/fsh-index.json b/Resources/fsh-generated/fsh-index.json index f1364963..df1875c3 100644 --- a/Resources/fsh-generated/fsh-index.json +++ b/Resources/fsh-generated/fsh-index.json @@ -757,7 +757,7 @@ "fshType": "Profile", "fshFile": "parameters/GEM_ERP_PR_PAR_DispenseOperation_Input.fsh", "startLine": 1, - "endLine": 41 + "endLine": 42 }, { "outputFile": "StructureDefinition-GEM-ERP-PR-PAR-Dispense-Operation-Output.json", diff --git a/Resources/fsh-generated/fsh-index.txt b/Resources/fsh-generated/fsh-index.txt index 28f04169..cb5d69a0 100644 --- a/Resources/fsh-generated/fsh-index.txt +++ b/Resources/fsh-generated/fsh-index.txt @@ -93,7 +93,7 @@ StructureDefinition-GEM-ERP-PR-PAR-Close-Operation-Input.json GEM_E StructureDefinition-GEM-ERP-PR-PAR-Close-Operation-Output.json GEM_ERP_PR_PAR_CloseOperation_Output Profile parameters/GEM_ERP_PR_PAR_CloseOperation_Output.fsh 1 - 22 StructureDefinition-GEM-ERP-PR-PAR-Create-Operation-Input.json GEM_ERP_PR_PAR_CreateOperation_Input Profile parameters/GEM_ERP_PR_PAR_CreateOperation_Input.fsh 1 - 20 StructureDefinition-GEM-ERP-PR-PAR-Create-Operation-Output.json GEM_ERP_PR_PAR_CreateOperation_Output Profile parameters/GEM_ERP_PR_PAR_CreateOperation_Output.fsh 1 - 22 -StructureDefinition-GEM-ERP-PR-PAR-Dispense-Operation-Input.json GEM_ERP_PR_PAR_DispenseOperation_Input Profile parameters/GEM_ERP_PR_PAR_DispenseOperation_Input.fsh 1 - 41 +StructureDefinition-GEM-ERP-PR-PAR-Dispense-Operation-Input.json GEM_ERP_PR_PAR_DispenseOperation_Input Profile parameters/GEM_ERP_PR_PAR_DispenseOperation_Input.fsh 1 - 42 StructureDefinition-GEM-ERP-PR-PAR-Dispense-Operation-Output.json GEM_ERP_PR_PAR_DispenseOperation_Output Profile parameters/GEM_ERP_PR_PAR_DispenseOperation_Output.fsh 1 - 48 StructureDefinition-GEM-ERP-PR-PrescriptionId.json GEM_ERP_PR_PrescriptionId Profile profiles/GEM_ERP_PR_PrescriptionId.fsh 1 - 13 StructureDefinition-GEM-ERP-PR-Secret.json GEM_ERP_PR_Secret Profile profiles/GEM_ERP_PR_Secret.fsh 1 - 12 diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-PAR-Close-Operation-Input.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-PAR-Close-Operation-Input.json index 045d31ae..81f696b8 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-PAR-Close-Operation-Input.json +++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-PAR-Close-Operation-Input.json @@ -56,7 +56,7 @@ "source": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_PAR_CloseOperation_Input" }, { - "key": "workflow-parameters-close-medication-references", + "key": "workflow-parameters-close-dispense-medication-references", "severity": "error", "human": "If a reference from a MedicationDispense to a Medication exists, the reference must resolve to the Medication.", "expression": "part.where(name = 'medicationDispense').resource.medication.ofType(Reference).exists() implies ((part.where(name = 'medicationDispense').resource.medication.reference.split('/').last().split(':').last()) = (part.where(name = 'medication').resource.id))", diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-PAR-Dispense-Operation-Input.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-PAR-Dispense-Operation-Input.json index c321be57..0529082e 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-PAR-Dispense-Operation-Input.json +++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-PAR-Dispense-Operation-Input.json @@ -47,7 +47,16 @@ "path": "Parameters.parameter", "sliceName": "rxDispensation", "min": 1, - "max": "*" + "max": "*", + "constraint": [ + { + "key": "workflow-parameters-close-dispense-medication-references", + "severity": "error", + "human": "If a reference from a MedicationDispense to a Medication exists, the reference must resolve to the Medication.", + "expression": "part.where(name = 'medicationDispense').resource.medication.ofType(Reference).exists() implies ((part.where(name = 'medicationDispense').resource.medication.reference.split('/').last().split(':').last()) = (part.where(name = 'medication').resource.id))", + "source": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_PAR_DispenseOperation_Input" + } + ] }, { "id": "Parameters.parameter:rxDispensation.name", diff --git a/Resources/input/fsh/parameters/GEM_ERP_PR_PAR_CloseOperation_Input.fsh b/Resources/input/fsh/parameters/GEM_ERP_PR_PAR_CloseOperation_Input.fsh index ed30f749..3e966335 100644 --- a/Resources/input/fsh/parameters/GEM_ERP_PR_PAR_CloseOperation_Input.fsh +++ b/Resources/input/fsh/parameters/GEM_ERP_PR_PAR_CloseOperation_Input.fsh @@ -19,7 +19,7 @@ Description: "This profile defines the parameters for closing a workflow for a p * value[x] 0..0 * resource 0..0 * obeys workflow-parameters-close-medication-exists - * obeys workflow-parameters-close-medication-references + * obeys workflow-parameters-close-dispense-medication-references * part MS * ^slicing.discriminator.type = #pattern * ^slicing.discriminator.path = "name" @@ -47,7 +47,7 @@ Description: "If a reference from a MedicationDispense to a Medication exists, a Expression: "part.where(name = 'medicationDispense').resource.medication.ofType(Reference).exists() implies part.where(name = 'medication').exists()" Severity: #error -Invariant: workflow-parameters-close-medication-references +Invariant: workflow-parameters-close-dispense-medication-references Description: "If a reference from a MedicationDispense to a Medication exists, the reference must resolve to the Medication." Expression: "part.where(name = 'medicationDispense').resource.medication.ofType(Reference).exists() implies ((part.where(name = 'medicationDispense').resource.medication.reference.split('/').last().split(':').last()) = (part.where(name = 'medication').resource.id))" Severity: #error diff --git a/Resources/input/fsh/parameters/GEM_ERP_PR_PAR_DispenseOperation_Input.fsh b/Resources/input/fsh/parameters/GEM_ERP_PR_PAR_DispenseOperation_Input.fsh index d207e5c2..6e18bf66 100644 --- a/Resources/input/fsh/parameters/GEM_ERP_PR_PAR_DispenseOperation_Input.fsh +++ b/Resources/input/fsh/parameters/GEM_ERP_PR_PAR_DispenseOperation_Input.fsh @@ -18,6 +18,7 @@ Description: "This profile defines the parameters for dispensing a medication fr * name = "rxDispensation" * value[x] 0..0 * resource 0..0 + * obeys workflow-parameters-close-dispense-medication-references * part MS * ^slicing.discriminator.type = #pattern * ^slicing.discriminator.path = "name" From 31a82d24330378e14e609bdfb99604fbf316b443 Mon Sep 17 00:00:00 2001 From: florianschoffke Date: Fri, 6 Sep 2024 07:27:21 +0200 Subject: [PATCH 11/19] Remove invalid examples --- Resources/fsh-generated/fsh-index.json | 20 +- Resources/fsh-generated/fsh-index.txt | 228 +++++++++--------- ...-GEM-ERP-PR-PAR-Close-Operation-Input.json | 4 +- ...M-ERP-PR-PAR-Dispense-Operation-Input.json | 2 +- .../examples/Example_Operation_Dispense.fsh | 70 ------ ...Input.fsh => Example_Parameters_Close.fsh} | 2 +- .../Example_Parameters_Dispense.fsh | 94 ++++++++ .../GEM_ERP_PR_PAR_CloseOperation_Input.fsh | 4 +- 8 files changed, 224 insertions(+), 200 deletions(-) rename Resources/input/fsh/examples/parameters_examples/{Example_Parameters_CloseInput.fsh => Example_Parameters_Close.fsh} (99%) create mode 100644 Resources/input/fsh/examples/parameters_examples/Example_Parameters_Dispense.fsh diff --git a/Resources/fsh-generated/fsh-index.json b/Resources/fsh-generated/fsh-index.json index df1875c3..c02c220d 100644 --- a/Resources/fsh-generated/fsh-index.json +++ b/Resources/fsh-generated/fsh-index.json @@ -371,7 +371,7 @@ "outputFile": "Parameters-ExampleCloseInputParameters.json", "fshName": "ExampleCloseInputParameters", "fshType": "Instance", - "fshFile": "examples/parameters_examples/Example_Parameters_CloseInput.fsh", + "fshFile": "examples/parameters_examples/Example_Parameters_Close.fsh", "startLine": 1, "endLine": 12 }, @@ -379,7 +379,7 @@ "outputFile": "Parameters-ExampleCloseInputParametersDiGA.json", "fshName": "ExampleCloseInputParametersDiGA", "fshType": "Instance", - "fshFile": "examples/parameters_examples/Example_Parameters_CloseInput.fsh", + "fshFile": "examples/parameters_examples/Example_Parameters_Close.fsh", "startLine": 61, "endLine": 69 }, @@ -387,7 +387,7 @@ "outputFile": "Parameters-ExampleCloseInputParametersKombipackung.json", "fshName": "ExampleCloseInputParametersKombipackung", "fshType": "Instance", - "fshFile": "examples/parameters_examples/Example_Parameters_CloseInput.fsh", + "fshFile": "examples/parameters_examples/Example_Parameters_Close.fsh", "startLine": 35, "endLine": 46 }, @@ -395,7 +395,7 @@ "outputFile": "Parameters-ExampleCloseInputParametersMultipleMedicationDispenses.json", "fshName": "ExampleCloseInputParametersMultipleMedicationDispenses", "fshType": "Instance", - "fshFile": "examples/parameters_examples/Example_Parameters_CloseInput.fsh", + "fshFile": "examples/parameters_examples/Example_Parameters_Close.fsh", "startLine": 14, "endLine": 33 }, @@ -403,7 +403,7 @@ "outputFile": "Parameters-ExampleCloseInputParametersRezeptur.json", "fshName": "ExampleCloseInputParametersRezeptur", "fshType": "Instance", - "fshFile": "examples/parameters_examples/Example_Parameters_CloseInput.fsh", + "fshFile": "examples/parameters_examples/Example_Parameters_Close.fsh", "startLine": 48, "endLine": 59 }, @@ -411,7 +411,7 @@ "outputFile": "Parameters-ExampleDispenseInputParameters.json", "fshName": "ExampleDispenseInputParameters", "fshType": "Instance", - "fshFile": "examples/Example_Operation_Dispense.fsh", + "fshFile": "examples/parameters_examples/Example_Parameters_Dispense.fsh", "startLine": 1, "endLine": 12 }, @@ -419,7 +419,7 @@ "outputFile": "Parameters-ExampleDispenseInputParametersKombipackung.json", "fshName": "ExampleDispenseInputParametersKombipackung", "fshType": "Instance", - "fshFile": "examples/Example_Operation_Dispense.fsh", + "fshFile": "examples/parameters_examples/Example_Parameters_Dispense.fsh", "startLine": 35, "endLine": 46 }, @@ -427,7 +427,7 @@ "outputFile": "Parameters-ExampleDispenseInputParametersMultipleMedicationDispenses.json", "fshName": "ExampleDispenseInputParametersMultipleMedicationDispenses", "fshType": "Instance", - "fshFile": "examples/Example_Operation_Dispense.fsh", + "fshFile": "examples/parameters_examples/Example_Parameters_Dispense.fsh", "startLine": 14, "endLine": 33 }, @@ -435,7 +435,7 @@ "outputFile": "Parameters-ExampleDispenseOutputParametersError.json", "fshName": "ExampleDispenseOutputParametersError", "fshType": "Instance", - "fshFile": "examples/Example_Operation_Dispense.fsh", + "fshFile": "examples/parameters_examples/Example_Parameters_Dispense.fsh", "startLine": 61, "endLine": 69 }, @@ -443,7 +443,7 @@ "outputFile": "Parameters-ExampleDispenseOutputParametersSuccess.json", "fshName": "ExampleDispenseOutputParametersSuccess", "fshType": "Instance", - "fshFile": "examples/Example_Operation_Dispense.fsh", + "fshFile": "examples/parameters_examples/Example_Parameters_Dispense.fsh", "startLine": 48, "endLine": 59 }, diff --git a/Resources/fsh-generated/fsh-index.txt b/Resources/fsh-generated/fsh-index.txt index cb5d69a0..bae3150f 100644 --- a/Resources/fsh-generated/fsh-index.txt +++ b/Resources/fsh-generated/fsh-index.txt @@ -1,114 +1,114 @@ -Output File Name Type FSH File Lines -AuditEvent-9361863d-fec0-4ba9-8776-7905cf1b0cfa.json AuditEventSample Instance examples/Example_AuditEvent.fsh 2 - 32 -Bundle-Bundle-AcceptOperation.json Bundle-AcceptOperation Instance examples/Example_Bundle.fsh 34 - 45 -Bundle-dffbfd6a-5712-4798-bdc8-07201eb77ab8.json ReceiptBundleQuittung Instance examples/Example_Bundle.fsh 10 - 32 -CodeSystem-GEM-ERP-CS-AvailabilityStatus.json GEM_ERP_CS_AvailabilityStatus CodeSystem codesystems/GEM_ERP_CS_AvailabilityStatus.fsh 1 - 12 -CodeSystem-GEM-ERP-CS-DocumentType.json GEM_ERP_CS_DocumentType CodeSystem codesystems/GEM_ERP_CS_DocumentType.fsh 1 - 10 -CodeSystem-GEM-ERP-CS-FlowType.json GEM_ERP_CS_FlowType CodeSystem codesystems/GEM_ERP_CS_FlowType.fsh 1 - 16 -CodeSystem-GEM-ERP-CS-OrganizationType.json GEM_ERP_CS_OrganizationType CodeSystem codesystems/GEM_ERP_CS_OrganizationType.fsh 1 - 8 -Communication-2be1c6ac-5d10-47f6-84ee-8318b2c22c76.json Communication_DispenseRequest_DiGA Instance examples/Example_Communication_DispReq.fsh 20 - 35 -Communication-7977a4ab-97a9-4d95-afb3-6c4c1e2ac596.json Communication_Reply Instance examples/Example_Communication_Reply.fsh 2 - 26 -Communication-8ca3c379-ac86-470f-bc12-178c9008f5c9.json Communication_InformationRequest Instance examples/Example_Communication_InfoReq.fsh 1 - 35 -Communication-a218a36e-f2fd-4603-ba67-c827acfef01b.json Communication_DispenseRequest Instance examples/Example_Communication_DispReq.fsh 2 - 18 -Medication-Augentropfen.json Augentropfen Instance examples/Example_Medication_Kombipackung.fsh 19 - 37 -Medication-Medication-Kombipackung.json Medication-Kombipackung Instance examples/Example_Medication_Kombipackung.fsh 2 - 17 -Medication-Medication-Rezeptur-FD.json Medication-Rezeptur-FD Instance examples/Example_Medication_Rezeptur_FD.fsh 2 - 45 -Medication-Medication-Rezeptur.json Medication-Rezeptur Instance examples/Example_Medication_Rezeptur.fsh 2 - 41 -Medication-Medication-Without-Strength-Code.json Medication-Without-Strength-Code Instance examples/Example_Medication.fsh 33 - 50 -Medication-Medication-Without-Strength-Numerator.json Medication-Without-Strength-Numerator Instance examples/Example_Medication.fsh 52 - 70 -Medication-MedicationDexpanthenol-FD.json MedicationDexpanthenol-FD Instance examples/Example_Medication_Rezeptur_FD.fsh 57 - 65 -Medication-MedicationDexpanthenol.json MedicationDexpanthenol Instance examples/Example_Medication_Rezeptur.fsh 53 - 61 -Medication-MedicationHydrocortison-FD.json MedicationHydrocortison-FD Instance examples/Example_Medication_Rezeptur_FD.fsh 47 - 55 -Medication-MedicationHydrocortison.json MedicationHydrocortison Instance examples/Example_Medication_Rezeptur.fsh 43 - 51 -Medication-NasenSpray.json NasenSpray Instance examples/Example_Medication_Kombipackung.fsh 39 - 57 -Medication-SimpleMedication.json SimpleMedication Instance examples/Example_Medication.fsh 25 - 30 -Medication-SumatripanMedication.json SumatripanMedication Instance examples/Example_Medication.fsh 2 - 23 -MedicationDispense-Example-MedicationDispense-2.json Example-MedicationDispense-2 Instance examples/Example_MedicationDispense.fsh 29 - 41 -MedicationDispense-Example-MedicationDispense-DiGA-DeepLink.json Example-MedicationDispense-DiGA-DeepLink Instance examples/Example_MedicationDispense_DiGA.fsh 18 - 34 -MedicationDispense-Example-MedicationDispense-DiGA-Name-And-PZN.json Example-MedicationDispense-DiGA-Name-And-PZN Instance examples/Example_MedicationDispense_DiGA.fsh 1 - 16 -MedicationDispense-Example-MedicationDispense-DiGA-NoRedeemCode.json Example-MedicationDispense-DiGA-NoRedeemCode Instance examples/Example_MedicationDispense_DiGA.fsh 36 - 49 -MedicationDispense-Example-MedicationDispense-Kombipackung.json Example-MedicationDispense-Kombipackung Instance examples/Example_MedicationDispense.fsh 43 - 55 -MedicationDispense-Example-MedicationDispense-Rezeptur.json Example-MedicationDispense-Rezeptur Instance examples/Example_MedicationDispense.fsh 57 - 69 -MedicationDispense-Example-MedicationDispense-Without-Medication.json Example-MedicationDispense-Without-Medication Instance examples/Example_MedicationDispense.fsh 15 - 27 -MedicationDispense-Example-MedicationDispense.json Example-MedicationDispense Instance examples/Example_MedicationDispense.fsh 1 - 13 -OperationDefinition-AbortOperation.json AbortOperation Instance operationdefinitions/GEM_ERP_OP_Abort.fsh 1 - 23 -OperationDefinition-AcceptOperation.json AcceptOperation Instance operationdefinitions/GEM_ERP_OP_Accept.fsh 1 - 25 -OperationDefinition-ActivateOperation.json ActivateOperation Instance operationdefinitions/GEM_ERP_OP_Activate.fsh 1 - 26 -OperationDefinition-CloseOperation.json CloseOperation Instance operationdefinitions/GEM_ERP_OP_Close.fsh 1 - 51 -OperationDefinition-CreateOperation.json CreateOperation Instance operationdefinitions/GEM_ERP_OP_Create.fsh 1 - 28 -OperationDefinition-DispenseOperation.json DispenseOperation Instance operationdefinitions/GEM_ERP_OP_Dispense.fsh 1 - 69 -OperationDefinition-RejectOperation.json RejectOperation Instance operationdefinitions/GEM_ERP_OP_Reject.fsh 1 - 15 -OperationOutcome-ExampleOperationAbortErrorAVS.json ExampleOperationAbortErrorAVS Instance examples/Example_Operation_Abort.fsh 1 - 8 -OperationOutcome-ExampleOperationAbortErrorPVS.json ExampleOperationAbortErrorPVS Instance examples/Example_Operation_Abort.fsh 10 - 17 -OperationOutcome-ExampleOperationAcceptError.json ExampleOperationAcceptError Instance examples/Example_Operation_Accept.fsh 1 - 8 -OperationOutcome-ExampleOperationActivateError.json ExampleOperationActivateError Instance examples/Example_Operation_Activate.fsh 8 - 16 -OperationOutcome-ExampleOperationCloseError.json ExampleOperationCloseError Instance examples/Example_Operation_Close.fsh 1 - 9 -OperationOutcome-ExampleOperationCreateError.json ExampleOperationCreateError Instance examples/Example_Operation_Create.fsh 8 - 16 -OperationOutcome-ExampleOperationRejectError.json ExampleOperationRejectError Instance examples/Example_Operation_Reject.fsh 1 - 8 -Parameters-ExampleCloseInputParameters.json ExampleCloseInputParameters Instance examples/parameters_examples/Example_Parameters_CloseInput.fsh 1 - 12 -Parameters-ExampleCloseInputParametersDiGA.json ExampleCloseInputParametersDiGA Instance examples/parameters_examples/Example_Parameters_CloseInput.fsh 61 - 69 -Parameters-ExampleCloseInputParametersKombipackung.json ExampleCloseInputParametersKombipackung Instance examples/parameters_examples/Example_Parameters_CloseInput.fsh 35 - 46 -Parameters-ExampleCloseInputParametersMultipleMedicationDispenses.json ExampleCloseInputParametersMultipleMedicationDispenses Instance examples/parameters_examples/Example_Parameters_CloseInput.fsh 14 - 33 -Parameters-ExampleCloseInputParametersRezeptur.json ExampleCloseInputParametersRezeptur Instance examples/parameters_examples/Example_Parameters_CloseInput.fsh 48 - 59 -Parameters-ExampleDispenseInputParameters.json ExampleDispenseInputParameters Instance examples/Example_Operation_Dispense.fsh 1 - 12 -Parameters-ExampleDispenseInputParametersKombipackung.json ExampleDispenseInputParametersKombipackung Instance examples/Example_Operation_Dispense.fsh 35 - 46 -Parameters-ExampleDispenseInputParametersMultipleMedicationDispenses.json ExampleDispenseInputParametersMultipleMedicationDispenses Instance examples/Example_Operation_Dispense.fsh 14 - 33 -Parameters-ExampleDispenseOutputParametersError.json ExampleDispenseOutputParametersError Instance examples/Example_Operation_Dispense.fsh 61 - 69 -Parameters-ExampleDispenseOutputParametersSuccess.json ExampleDispenseOutputParametersSuccess Instance examples/Example_Operation_Dispense.fsh 48 - 59 -Parameters-ExampleOperationActivateParametersInput.json ExampleOperationActivateParametersInput Instance examples/Example_Operation_Activate.fsh 1 - 6 -Parameters-OperationCreateParametersInputExample.json OperationCreateParametersInputExample Instance examples/Example_Operation_Create.fsh 1 - 6 -Provenance-64d5081e-8d65-11ec-b909-0242ac120002.json PractitionersNarcoticsApproval Instance examples/Example_Provenance.fsh 2 - 21 -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 - 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 - 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 -StructureDefinition-GEM-ERP-PR-AuditEvent.json GEM_ERP_PR_AuditEvent Profile profiles/GEM_ERP_PR_AuditEvent.fsh 1 - 32 -StructureDefinition-GEM-ERP-PR-BfArMApproval.json GEM_ERP_PR_BfArMApproval Profile profiles/GEM_ERP_PR_BfArMApproval.fsh 1 - 71 -StructureDefinition-GEM-ERP-PR-Binary.json GEM_ERP_PR_Binary Profile profiles/GEM_ERP_PR_Binary.fsh 1 - 8 -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 - 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 -StructureDefinition-GEM-ERP-PR-Device.json GEM_ERP_PR_Device Profile profiles/GEM_ERP_PR_Device.fsh 1 - 11 -StructureDefinition-GEM-ERP-PR-Digest.json GEM_ERP_PR_Digest Profile profiles/GEM_ERP_PR_Digest.fsh 1 - 8 -StructureDefinition-GEM-ERP-PR-Medication.json GEM_ERP_PR_Medication Profile profiles/GEM_ERP_PR_Medication.fsh 1 - 23 -StructureDefinition-GEM-ERP-PR-MedicationDispense-DiGA.json GEM_ERP_PR_MedicationDispense_DiGA Profile profiles/GEM_ERP_PR_MedicationDispense_DiGA.fsh 1 - 57 -StructureDefinition-GEM-ERP-PR-MedicationDispense.json GEM_ERP_PR_MedicationDispense Profile profiles/GEM_ERP_PR_MedicationDispense.fsh 1 - 26 -StructureDefinition-GEM-ERP-PR-PAR-Accept-Operation-Output.json GEM_ERP_PR_PAR_AcceptOperation_Output Profile parameters/GEM_ERP_PR_PAR_AcceptOperation_Output.fsh 1 - 22 -StructureDefinition-GEM-ERP-PR-PAR-Activate-Operation-Input.json GEM_ERP_PR_PAR_ActivateOperation_Input Profile parameters/GEM_ERP_PR_PAR_ActivateOperation_Input.fsh 1 - 20 -StructureDefinition-GEM-ERP-PR-PAR-Activate-Operation-Output.json GEM_ERP_PR_PAR_ActivateOperation_Output Profile parameters/GEM_ERP_PR_PAR_ActivateOperation_Output.fsh 1 - 22 -StructureDefinition-GEM-ERP-PR-PAR-Close-Operation-Input.json GEM_ERP_PR_PAR_CloseOperation_Input Profile parameters/GEM_ERP_PR_PAR_CloseOperation_Input.fsh 1 - 43 -StructureDefinition-GEM-ERP-PR-PAR-Close-Operation-Output.json GEM_ERP_PR_PAR_CloseOperation_Output Profile parameters/GEM_ERP_PR_PAR_CloseOperation_Output.fsh 1 - 22 -StructureDefinition-GEM-ERP-PR-PAR-Create-Operation-Input.json GEM_ERP_PR_PAR_CreateOperation_Input Profile parameters/GEM_ERP_PR_PAR_CreateOperation_Input.fsh 1 - 20 -StructureDefinition-GEM-ERP-PR-PAR-Create-Operation-Output.json GEM_ERP_PR_PAR_CreateOperation_Output Profile parameters/GEM_ERP_PR_PAR_CreateOperation_Output.fsh 1 - 22 -StructureDefinition-GEM-ERP-PR-PAR-Dispense-Operation-Input.json GEM_ERP_PR_PAR_DispenseOperation_Input Profile parameters/GEM_ERP_PR_PAR_DispenseOperation_Input.fsh 1 - 42 -StructureDefinition-GEM-ERP-PR-PAR-Dispense-Operation-Output.json GEM_ERP_PR_PAR_DispenseOperation_Output Profile parameters/GEM_ERP_PR_PAR_DispenseOperation_Output.fsh 1 - 48 -StructureDefinition-GEM-ERP-PR-PrescriptionId.json GEM_ERP_PR_PrescriptionId Profile profiles/GEM_ERP_PR_PrescriptionId.fsh 1 - 13 -StructureDefinition-GEM-ERP-PR-Secret.json GEM_ERP_PR_Secret Profile profiles/GEM_ERP_PR_Secret.fsh 1 - 12 -StructureDefinition-GEM-ERP-PR-Signature.json GEM_ERP_PR_Signature Profile profiles/GEM_ERP_PR_Signature.fsh 1 - 23 -StructureDefinition-GEM-ERP-PR-Task.json GEM_ERP_PR_Task Profile profiles/GEM_ERP_PR_Task.fsh 1 - 77 -StructureDefinition-logMedDispense.json GEM_ERP_LOG_MedicationDispense Logical logicalmodels/logical-medication-dispense.fsh 1 - 114 -StructureDefinition-logMedDispenseDiGA.json GEM_ERP_LOG_MedicationDispense_DiGA Logical logicalmodels/logical-medication-dispense-diga.fsh 1 - 20 -Task-09330307-16ce-4cdc-810a-ca24ef80dde3.json TaskInClosedState Instance examples/Example_Task.fsh 144 - 173 -Task-607255ed-ce41-47fc-aad3-cfce1c39963f.json TaskInReadyState Instance examples/Example_Task.fsh 26 - 53 -Task-9b48f82c-9c11-4a57-aa72-a805f9537a82.json TaskIn-ProgressState-Dispensed Instance examples/Example_Task.fsh 82 - 111 -Task-b12eb5f7-91ce-4887-93c7-800454601377.json TaskInCreatedState Instance examples/Example_Task.fsh 2 - 24 -Task-d70932d1-9e1c-483c-b2d4-b7dced09b35e.json TaskIn-ProgressState Instance examples/Example_Task.fsh 55 - 80 -Task-f5c21409-b84b-4125-8649-5630a00906b1.json TaskIn-ProgressState-Dispensed-Multiple-MedicationDispenses Instance examples/Example_Task.fsh 113 - 142 -ValueSet-GEM-ERP-VS-AvailabilityStatus.json GEM_ERP_VS_AvailabilityStatus ValueSet valuesets/GEM_ERP_VS_AvailabilityStatus.fsh 1 - 6 -ValueSet-GEM-ERP-VS-DocumentType.json GEM_ERP_VS_DocumentType ValueSet valuesets/GEM_ERP_VS_DocumentType.fsh 1 - 11 -ValueSet-GEM-ERP-VS-FlowType.json GEM_ERP_VS_FlowType ValueSet valuesets/GEM_ERP_VS_FlowType.fsh 1 - 6 -ValueSet-GEM-ERP-VS-OrganizationType.json GEM_ERP_VS_OrganizationType ValueSet valuesets/GEM_ERP_VS_OrganizationType.fsh 1 - 6 -ValueSet-GEM-ERP-VS-PerformerType.json PerformerTypeVS ValueSet valuesets/GEM_ERP_VS_PerformerType.fsh 5 - 16 \ No newline at end of file +Output File Name Type FSH File Lines +AuditEvent-9361863d-fec0-4ba9-8776-7905cf1b0cfa.json AuditEventSample Instance examples/Example_AuditEvent.fsh 2 - 32 +Bundle-Bundle-AcceptOperation.json Bundle-AcceptOperation Instance examples/Example_Bundle.fsh 34 - 45 +Bundle-dffbfd6a-5712-4798-bdc8-07201eb77ab8.json ReceiptBundleQuittung Instance examples/Example_Bundle.fsh 10 - 32 +CodeSystem-GEM-ERP-CS-AvailabilityStatus.json GEM_ERP_CS_AvailabilityStatus CodeSystem codesystems/GEM_ERP_CS_AvailabilityStatus.fsh 1 - 12 +CodeSystem-GEM-ERP-CS-DocumentType.json GEM_ERP_CS_DocumentType CodeSystem codesystems/GEM_ERP_CS_DocumentType.fsh 1 - 10 +CodeSystem-GEM-ERP-CS-FlowType.json GEM_ERP_CS_FlowType CodeSystem codesystems/GEM_ERP_CS_FlowType.fsh 1 - 16 +CodeSystem-GEM-ERP-CS-OrganizationType.json GEM_ERP_CS_OrganizationType CodeSystem codesystems/GEM_ERP_CS_OrganizationType.fsh 1 - 8 +Communication-2be1c6ac-5d10-47f6-84ee-8318b2c22c76.json Communication_DispenseRequest_DiGA Instance examples/Example_Communication_DispReq.fsh 20 - 35 +Communication-7977a4ab-97a9-4d95-afb3-6c4c1e2ac596.json Communication_Reply Instance examples/Example_Communication_Reply.fsh 2 - 26 +Communication-8ca3c379-ac86-470f-bc12-178c9008f5c9.json Communication_InformationRequest Instance examples/Example_Communication_InfoReq.fsh 1 - 35 +Communication-a218a36e-f2fd-4603-ba67-c827acfef01b.json Communication_DispenseRequest Instance examples/Example_Communication_DispReq.fsh 2 - 18 +Medication-Augentropfen.json Augentropfen Instance examples/Example_Medication_Kombipackung.fsh 19 - 37 +Medication-Medication-Kombipackung.json Medication-Kombipackung Instance examples/Example_Medication_Kombipackung.fsh 2 - 17 +Medication-Medication-Rezeptur-FD.json Medication-Rezeptur-FD Instance examples/Example_Medication_Rezeptur_FD.fsh 2 - 45 +Medication-Medication-Rezeptur.json Medication-Rezeptur Instance examples/Example_Medication_Rezeptur.fsh 2 - 41 +Medication-Medication-Without-Strength-Code.json Medication-Without-Strength-Code Instance examples/Example_Medication.fsh 33 - 50 +Medication-Medication-Without-Strength-Numerator.json Medication-Without-Strength-Numerator Instance examples/Example_Medication.fsh 52 - 70 +Medication-MedicationDexpanthenol-FD.json MedicationDexpanthenol-FD Instance examples/Example_Medication_Rezeptur_FD.fsh 57 - 65 +Medication-MedicationDexpanthenol.json MedicationDexpanthenol Instance examples/Example_Medication_Rezeptur.fsh 53 - 61 +Medication-MedicationHydrocortison-FD.json MedicationHydrocortison-FD Instance examples/Example_Medication_Rezeptur_FD.fsh 47 - 55 +Medication-MedicationHydrocortison.json MedicationHydrocortison Instance examples/Example_Medication_Rezeptur.fsh 43 - 51 +Medication-NasenSpray.json NasenSpray Instance examples/Example_Medication_Kombipackung.fsh 39 - 57 +Medication-SimpleMedication.json SimpleMedication Instance examples/Example_Medication.fsh 25 - 30 +Medication-SumatripanMedication.json SumatripanMedication Instance examples/Example_Medication.fsh 2 - 23 +MedicationDispense-Example-MedicationDispense-2.json Example-MedicationDispense-2 Instance examples/Example_MedicationDispense.fsh 29 - 41 +MedicationDispense-Example-MedicationDispense-DiGA-DeepLink.json Example-MedicationDispense-DiGA-DeepLink Instance examples/Example_MedicationDispense_DiGA.fsh 18 - 34 +MedicationDispense-Example-MedicationDispense-DiGA-Name-And-PZN.json Example-MedicationDispense-DiGA-Name-And-PZN Instance examples/Example_MedicationDispense_DiGA.fsh 1 - 16 +MedicationDispense-Example-MedicationDispense-DiGA-NoRedeemCode.json Example-MedicationDispense-DiGA-NoRedeemCode Instance examples/Example_MedicationDispense_DiGA.fsh 36 - 49 +MedicationDispense-Example-MedicationDispense-Kombipackung.json Example-MedicationDispense-Kombipackung Instance examples/Example_MedicationDispense.fsh 43 - 55 +MedicationDispense-Example-MedicationDispense-Rezeptur.json Example-MedicationDispense-Rezeptur Instance examples/Example_MedicationDispense.fsh 57 - 69 +MedicationDispense-Example-MedicationDispense-Without-Medication.json Example-MedicationDispense-Without-Medication Instance examples/Example_MedicationDispense.fsh 15 - 27 +MedicationDispense-Example-MedicationDispense.json Example-MedicationDispense Instance examples/Example_MedicationDispense.fsh 1 - 13 +OperationDefinition-AbortOperation.json AbortOperation Instance operationdefinitions/GEM_ERP_OP_Abort.fsh 1 - 23 +OperationDefinition-AcceptOperation.json AcceptOperation Instance operationdefinitions/GEM_ERP_OP_Accept.fsh 1 - 25 +OperationDefinition-ActivateOperation.json ActivateOperation Instance operationdefinitions/GEM_ERP_OP_Activate.fsh 1 - 26 +OperationDefinition-CloseOperation.json CloseOperation Instance operationdefinitions/GEM_ERP_OP_Close.fsh 1 - 51 +OperationDefinition-CreateOperation.json CreateOperation Instance operationdefinitions/GEM_ERP_OP_Create.fsh 1 - 28 +OperationDefinition-DispenseOperation.json DispenseOperation Instance operationdefinitions/GEM_ERP_OP_Dispense.fsh 1 - 69 +OperationDefinition-RejectOperation.json RejectOperation Instance operationdefinitions/GEM_ERP_OP_Reject.fsh 1 - 15 +OperationOutcome-ExampleOperationAbortErrorAVS.json ExampleOperationAbortErrorAVS Instance examples/Example_Operation_Abort.fsh 1 - 8 +OperationOutcome-ExampleOperationAbortErrorPVS.json ExampleOperationAbortErrorPVS Instance examples/Example_Operation_Abort.fsh 10 - 17 +OperationOutcome-ExampleOperationAcceptError.json ExampleOperationAcceptError Instance examples/Example_Operation_Accept.fsh 1 - 8 +OperationOutcome-ExampleOperationActivateError.json ExampleOperationActivateError Instance examples/Example_Operation_Activate.fsh 8 - 16 +OperationOutcome-ExampleOperationCloseError.json ExampleOperationCloseError Instance examples/Example_Operation_Close.fsh 1 - 9 +OperationOutcome-ExampleOperationCreateError.json ExampleOperationCreateError Instance examples/Example_Operation_Create.fsh 8 - 16 +OperationOutcome-ExampleOperationRejectError.json ExampleOperationRejectError Instance examples/Example_Operation_Reject.fsh 1 - 8 +Parameters-ExampleCloseInputParameters.json ExampleCloseInputParameters Instance examples/parameters_examples/Example_Parameters_Close.fsh 1 - 12 +Parameters-ExampleCloseInputParametersDiGA.json ExampleCloseInputParametersDiGA Instance examples/parameters_examples/Example_Parameters_Close.fsh 61 - 69 +Parameters-ExampleCloseInputParametersKombipackung.json ExampleCloseInputParametersKombipackung Instance examples/parameters_examples/Example_Parameters_Close.fsh 35 - 46 +Parameters-ExampleCloseInputParametersMultipleMedicationDispenses.json ExampleCloseInputParametersMultipleMedicationDispenses Instance examples/parameters_examples/Example_Parameters_Close.fsh 14 - 33 +Parameters-ExampleCloseInputParametersRezeptur.json ExampleCloseInputParametersRezeptur Instance examples/parameters_examples/Example_Parameters_Close.fsh 48 - 59 +Parameters-ExampleDispenseInputParameters.json ExampleDispenseInputParameters Instance examples/parameters_examples/Example_Parameters_Dispense.fsh 1 - 12 +Parameters-ExampleDispenseInputParametersKombipackung.json ExampleDispenseInputParametersKombipackung Instance examples/parameters_examples/Example_Parameters_Dispense.fsh 35 - 46 +Parameters-ExampleDispenseInputParametersMultipleMedicationDispenses.json ExampleDispenseInputParametersMultipleMedicationDispenses Instance examples/parameters_examples/Example_Parameters_Dispense.fsh 14 - 33 +Parameters-ExampleDispenseOutputParametersError.json ExampleDispenseOutputParametersError Instance examples/parameters_examples/Example_Parameters_Dispense.fsh 61 - 69 +Parameters-ExampleDispenseOutputParametersSuccess.json ExampleDispenseOutputParametersSuccess Instance examples/parameters_examples/Example_Parameters_Dispense.fsh 48 - 59 +Parameters-ExampleOperationActivateParametersInput.json ExampleOperationActivateParametersInput Instance examples/Example_Operation_Activate.fsh 1 - 6 +Parameters-OperationCreateParametersInputExample.json OperationCreateParametersInputExample Instance examples/Example_Operation_Create.fsh 1 - 6 +Provenance-64d5081e-8d65-11ec-b909-0242ac120002.json PractitionersNarcoticsApproval Instance examples/Example_Provenance.fsh 2 - 21 +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 - 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 - 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 +StructureDefinition-GEM-ERP-PR-AuditEvent.json GEM_ERP_PR_AuditEvent Profile profiles/GEM_ERP_PR_AuditEvent.fsh 1 - 32 +StructureDefinition-GEM-ERP-PR-BfArMApproval.json GEM_ERP_PR_BfArMApproval Profile profiles/GEM_ERP_PR_BfArMApproval.fsh 1 - 71 +StructureDefinition-GEM-ERP-PR-Binary.json GEM_ERP_PR_Binary Profile profiles/GEM_ERP_PR_Binary.fsh 1 - 8 +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 - 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 +StructureDefinition-GEM-ERP-PR-Device.json GEM_ERP_PR_Device Profile profiles/GEM_ERP_PR_Device.fsh 1 - 11 +StructureDefinition-GEM-ERP-PR-Digest.json GEM_ERP_PR_Digest Profile profiles/GEM_ERP_PR_Digest.fsh 1 - 8 +StructureDefinition-GEM-ERP-PR-Medication.json GEM_ERP_PR_Medication Profile profiles/GEM_ERP_PR_Medication.fsh 1 - 23 +StructureDefinition-GEM-ERP-PR-MedicationDispense-DiGA.json GEM_ERP_PR_MedicationDispense_DiGA Profile profiles/GEM_ERP_PR_MedicationDispense_DiGA.fsh 1 - 57 +StructureDefinition-GEM-ERP-PR-MedicationDispense.json GEM_ERP_PR_MedicationDispense Profile profiles/GEM_ERP_PR_MedicationDispense.fsh 1 - 26 +StructureDefinition-GEM-ERP-PR-PAR-Accept-Operation-Output.json GEM_ERP_PR_PAR_AcceptOperation_Output Profile parameters/GEM_ERP_PR_PAR_AcceptOperation_Output.fsh 1 - 22 +StructureDefinition-GEM-ERP-PR-PAR-Activate-Operation-Input.json GEM_ERP_PR_PAR_ActivateOperation_Input Profile parameters/GEM_ERP_PR_PAR_ActivateOperation_Input.fsh 1 - 20 +StructureDefinition-GEM-ERP-PR-PAR-Activate-Operation-Output.json GEM_ERP_PR_PAR_ActivateOperation_Output Profile parameters/GEM_ERP_PR_PAR_ActivateOperation_Output.fsh 1 - 22 +StructureDefinition-GEM-ERP-PR-PAR-Close-Operation-Input.json GEM_ERP_PR_PAR_CloseOperation_Input Profile parameters/GEM_ERP_PR_PAR_CloseOperation_Input.fsh 1 - 43 +StructureDefinition-GEM-ERP-PR-PAR-Close-Operation-Output.json GEM_ERP_PR_PAR_CloseOperation_Output Profile parameters/GEM_ERP_PR_PAR_CloseOperation_Output.fsh 1 - 22 +StructureDefinition-GEM-ERP-PR-PAR-Create-Operation-Input.json GEM_ERP_PR_PAR_CreateOperation_Input Profile parameters/GEM_ERP_PR_PAR_CreateOperation_Input.fsh 1 - 20 +StructureDefinition-GEM-ERP-PR-PAR-Create-Operation-Output.json GEM_ERP_PR_PAR_CreateOperation_Output Profile parameters/GEM_ERP_PR_PAR_CreateOperation_Output.fsh 1 - 22 +StructureDefinition-GEM-ERP-PR-PAR-Dispense-Operation-Input.json GEM_ERP_PR_PAR_DispenseOperation_Input Profile parameters/GEM_ERP_PR_PAR_DispenseOperation_Input.fsh 1 - 42 +StructureDefinition-GEM-ERP-PR-PAR-Dispense-Operation-Output.json GEM_ERP_PR_PAR_DispenseOperation_Output Profile parameters/GEM_ERP_PR_PAR_DispenseOperation_Output.fsh 1 - 48 +StructureDefinition-GEM-ERP-PR-PrescriptionId.json GEM_ERP_PR_PrescriptionId Profile profiles/GEM_ERP_PR_PrescriptionId.fsh 1 - 13 +StructureDefinition-GEM-ERP-PR-Secret.json GEM_ERP_PR_Secret Profile profiles/GEM_ERP_PR_Secret.fsh 1 - 12 +StructureDefinition-GEM-ERP-PR-Signature.json GEM_ERP_PR_Signature Profile profiles/GEM_ERP_PR_Signature.fsh 1 - 23 +StructureDefinition-GEM-ERP-PR-Task.json GEM_ERP_PR_Task Profile profiles/GEM_ERP_PR_Task.fsh 1 - 77 +StructureDefinition-logMedDispense.json GEM_ERP_LOG_MedicationDispense Logical logicalmodels/logical-medication-dispense.fsh 1 - 114 +StructureDefinition-logMedDispenseDiGA.json GEM_ERP_LOG_MedicationDispense_DiGA Logical logicalmodels/logical-medication-dispense-diga.fsh 1 - 20 +Task-09330307-16ce-4cdc-810a-ca24ef80dde3.json TaskInClosedState Instance examples/Example_Task.fsh 144 - 173 +Task-607255ed-ce41-47fc-aad3-cfce1c39963f.json TaskInReadyState Instance examples/Example_Task.fsh 26 - 53 +Task-9b48f82c-9c11-4a57-aa72-a805f9537a82.json TaskIn-ProgressState-Dispensed Instance examples/Example_Task.fsh 82 - 111 +Task-b12eb5f7-91ce-4887-93c7-800454601377.json TaskInCreatedState Instance examples/Example_Task.fsh 2 - 24 +Task-d70932d1-9e1c-483c-b2d4-b7dced09b35e.json TaskIn-ProgressState Instance examples/Example_Task.fsh 55 - 80 +Task-f5c21409-b84b-4125-8649-5630a00906b1.json TaskIn-ProgressState-Dispensed-Multiple-MedicationDispenses Instance examples/Example_Task.fsh 113 - 142 +ValueSet-GEM-ERP-VS-AvailabilityStatus.json GEM_ERP_VS_AvailabilityStatus ValueSet valuesets/GEM_ERP_VS_AvailabilityStatus.fsh 1 - 6 +ValueSet-GEM-ERP-VS-DocumentType.json GEM_ERP_VS_DocumentType ValueSet valuesets/GEM_ERP_VS_DocumentType.fsh 1 - 11 +ValueSet-GEM-ERP-VS-FlowType.json GEM_ERP_VS_FlowType ValueSet valuesets/GEM_ERP_VS_FlowType.fsh 1 - 6 +ValueSet-GEM-ERP-VS-OrganizationType.json GEM_ERP_VS_OrganizationType ValueSet valuesets/GEM_ERP_VS_OrganizationType.fsh 1 - 6 +ValueSet-GEM-ERP-VS-PerformerType.json PerformerTypeVS ValueSet valuesets/GEM_ERP_VS_PerformerType.fsh 5 - 16 \ No newline at end of file diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-PAR-Close-Operation-Input.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-PAR-Close-Operation-Input.json index 81f696b8..406fe843 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-PAR-Close-Operation-Input.json +++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-PAR-Close-Operation-Input.json @@ -52,14 +52,14 @@ "key": "workflow-parameters-close-medication-exists", "severity": "error", "human": "If a reference from a MedicationDispense to a Medication exists, a Medication resource must exist.", - "expression": "part.where(name = 'medicationDispense').resource.medication.ofType(Reference).exists() implies part.where(name = 'medication').exists()", + "expression": "part.where(name = 'medicationDispense').resource.medication.ofType(Reference).reference.exists() implies part.where(name = 'medication').exists()", "source": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_PAR_CloseOperation_Input" }, { "key": "workflow-parameters-close-dispense-medication-references", "severity": "error", "human": "If a reference from a MedicationDispense to a Medication exists, the reference must resolve to the Medication.", - "expression": "part.where(name = 'medicationDispense').resource.medication.ofType(Reference).exists() implies ((part.where(name = 'medicationDispense').resource.medication.reference.split('/').last().split(':').last()) = (part.where(name = 'medication').resource.id))", + "expression": "part.where(name = 'medicationDispense').resource.medication.ofType(Reference).reference.exists() implies ((part.where(name = 'medicationDispense').resource.medication.reference.split('/').last().split(':').last()) = (part.where(name = 'medication').resource.id))", "source": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_PAR_CloseOperation_Input" } ] diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-PAR-Dispense-Operation-Input.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-PAR-Dispense-Operation-Input.json index 0529082e..22b63dde 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-PAR-Dispense-Operation-Input.json +++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-PAR-Dispense-Operation-Input.json @@ -53,7 +53,7 @@ "key": "workflow-parameters-close-dispense-medication-references", "severity": "error", "human": "If a reference from a MedicationDispense to a Medication exists, the reference must resolve to the Medication.", - "expression": "part.where(name = 'medicationDispense').resource.medication.ofType(Reference).exists() implies ((part.where(name = 'medicationDispense').resource.medication.reference.split('/').last().split(':').last()) = (part.where(name = 'medication').resource.id))", + "expression": "part.where(name = 'medicationDispense').resource.medication.ofType(Reference).reference.exists() implies ((part.where(name = 'medicationDispense').resource.medication.reference.split('/').last().split(':').last()) = (part.where(name = 'medication').resource.id))", "source": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_PAR_DispenseOperation_Input" } ] diff --git a/Resources/input/fsh/examples/Example_Operation_Dispense.fsh b/Resources/input/fsh/examples/Example_Operation_Dispense.fsh index 7348e6dc..50b19b9c 100644 --- a/Resources/input/fsh/examples/Example_Operation_Dispense.fsh +++ b/Resources/input/fsh/examples/Example_Operation_Dispense.fsh @@ -1,73 +1,3 @@ -Instance: ExampleDispenseInputParameters -InstanceOf: GEM_ERP_PR_PAR_DispenseOperation_Input -Usage: #example -Title: "Example Dispense Parameters" -* parameter[rxDispensation] - * name = "rxDispensation" - * part[medicationDispense] - * name = "medicationDispense" - * resource = Example-MedicationDispense - * part[medication] - * name = "medication" - * resource = SumatripanMedication - -Instance: ExampleDispenseInputParametersMultipleMedicationDispenses -InstanceOf: GEM_ERP_PR_PAR_DispenseOperation_Input -Usage: #example -Title: "Example Dispense Parameters" -* parameter[rxDispensation][+] - * name = "rxDispensation" - * part[medicationDispense] - * name = "medicationDispense" - * resource = Example-MedicationDispense - * part[medication] - * name = "medication" - * resource = SumatripanMedication -* parameter[rxDispensation][+] - * name = "rxDispensation" - * part[medicationDispense] - * name = "medicationDispense" - * resource = Example-MedicationDispense-2 - * part[medication] - * name = "medication" - * resource = Medication-Without-Strength-Code - -Instance: ExampleDispenseInputParametersKombipackung -InstanceOf: GEM_ERP_PR_PAR_DispenseOperation_Input -Usage: #example -Title: "Example Dispense Parameters" -* parameter[rxDispensation] - * name = "rxDispensation" - * part[medicationDispense] - * name = "medicationDispense" - * resource = Example-MedicationDispense-Kombipackung - * part[medication] - * name = "medication" - * resource = Medication-Kombipackung - -Instance: ExampleDispenseOutputParametersSuccess -InstanceOf: GEM_ERP_PR_PAR_DispenseOperation_Output -Usage: #example -Title: "Example Dispense Parameters Response on Success" -* parameter[rxDispensation] - * name = "rxDispensation" - * part[medicationDispense] - * name = "medicationDispense" - * resource = Example-MedicationDispense - * part[medication] - * name = "medication" - * resource = SumatripanMedication - -Instance: ExampleDispenseOutputParametersError -InstanceOf: GEM_ERP_PR_PAR_DispenseOperation_Output -Usage: #example -Title: "Example Dispense Parameters Response on Error" -* parameter[rxDispensation] - * name = "rxDispensation" - * part[operationOutcome] - * name = "operationOutcome" - * resource = ExampleOperationDispenseError - Instance: ExampleOperationDispenseError InstanceOf: OperationOutcome Title: "Example Dispense operation error response" diff --git a/Resources/input/fsh/examples/parameters_examples/Example_Parameters_CloseInput.fsh b/Resources/input/fsh/examples/parameters_examples/Example_Parameters_Close.fsh similarity index 99% rename from Resources/input/fsh/examples/parameters_examples/Example_Parameters_CloseInput.fsh rename to Resources/input/fsh/examples/parameters_examples/Example_Parameters_Close.fsh index ba5329b5..f175109b 100644 --- a/Resources/input/fsh/examples/parameters_examples/Example_Parameters_CloseInput.fsh +++ b/Resources/input/fsh/examples/parameters_examples/Example_Parameters_Close.fsh @@ -68,7 +68,7 @@ Title: "Example Close Parameters" * name = "medicationDispense" * resource = Example-MedicationDispense-DiGA-Name-And-PZN -/* +/* Instance: INVALID-ExampleCloseInputParametersWithoutMedication InstanceOf: GEM_ERP_PR_PAR_CloseOperation_Input Usage: #example diff --git a/Resources/input/fsh/examples/parameters_examples/Example_Parameters_Dispense.fsh b/Resources/input/fsh/examples/parameters_examples/Example_Parameters_Dispense.fsh new file mode 100644 index 00000000..eba2ea85 --- /dev/null +++ b/Resources/input/fsh/examples/parameters_examples/Example_Parameters_Dispense.fsh @@ -0,0 +1,94 @@ +Instance: ExampleDispenseInputParameters +InstanceOf: GEM_ERP_PR_PAR_DispenseOperation_Input +Usage: #example +Title: "Example Dispense Parameters" +* parameter[rxDispensation] + * name = "rxDispensation" + * part[medicationDispense] + * name = "medicationDispense" + * resource = Example-MedicationDispense + * part[medication] + * name = "medication" + * resource = SumatripanMedication + +Instance: ExampleDispenseInputParametersMultipleMedicationDispenses +InstanceOf: GEM_ERP_PR_PAR_DispenseOperation_Input +Usage: #example +Title: "Example Dispense Parameters" +* parameter[rxDispensation][+] + * name = "rxDispensation" + * part[medicationDispense] + * name = "medicationDispense" + * resource = Example-MedicationDispense + * part[medication] + * name = "medication" + * resource = SumatripanMedication +* parameter[rxDispensation][+] + * name = "rxDispensation" + * part[medicationDispense] + * name = "medicationDispense" + * resource = Example-MedicationDispense-2 + * part[medication] + * name = "medication" + * resource = Medication-Without-Strength-Code + +Instance: ExampleDispenseInputParametersKombipackung +InstanceOf: GEM_ERP_PR_PAR_DispenseOperation_Input +Usage: #example +Title: "Example Dispense Parameters" +* parameter[rxDispensation] + * name = "rxDispensation" + * part[medicationDispense] + * name = "medicationDispense" + * resource = Example-MedicationDispense-Kombipackung + * part[medication] + * name = "medication" + * resource = Medication-Kombipackung + +Instance: ExampleDispenseOutputParametersSuccess +InstanceOf: GEM_ERP_PR_PAR_DispenseOperation_Output +Usage: #example +Title: "Example Dispense Parameters Response on Success" +* parameter[rxDispensation] + * name = "rxDispensation" + * part[medicationDispense] + * name = "medicationDispense" + * resource = Example-MedicationDispense + * part[medication] + * name = "medication" + * resource = SumatripanMedication + +Instance: ExampleDispenseOutputParametersError +InstanceOf: GEM_ERP_PR_PAR_DispenseOperation_Output +Usage: #example +Title: "Example Dispense Parameters Response on Error" +* parameter[rxDispensation] + * name = "rxDispensation" + * part[operationOutcome] + * name = "operationOutcome" + * resource = ExampleOperationDispenseError + +/* +Instance: INVALID-ExampleDispenseInputParametersWithoutMedication +InstanceOf: GEM_ERP_PR_PAR_DispenseOperation_Input +Usage: #example +Title: "Example Dispense Parameters" +* parameter[rxDispensation] + * name = "rxDispensation" + * part[medicationDispense] + * name = "medicationDispense" + * resource = Example-MedicationDispense-Without-Medication + +Instance: INVALID-ExampleDispenseInputParametersReferenceWrong +InstanceOf: GEM_ERP_PR_PAR_DispenseOperation_Input +Usage: #example +Title: "Example Dispense Parameters" +* parameter[rxDispensation] + * name = "rxDispensation" + * part[medicationDispense] + * name = "medicationDispense" + * resource = Example-MedicationDispense + * part[medication] + * name = "medication" + * resource = SimpleMedication +*/ \ No newline at end of file diff --git a/Resources/input/fsh/parameters/GEM_ERP_PR_PAR_CloseOperation_Input.fsh b/Resources/input/fsh/parameters/GEM_ERP_PR_PAR_CloseOperation_Input.fsh index 3e966335..25cbf2c4 100644 --- a/Resources/input/fsh/parameters/GEM_ERP_PR_PAR_CloseOperation_Input.fsh +++ b/Resources/input/fsh/parameters/GEM_ERP_PR_PAR_CloseOperation_Input.fsh @@ -44,11 +44,11 @@ Description: "This profile defines the parameters for closing a workflow for a p Invariant: workflow-parameters-close-medication-exists Description: "If a reference from a MedicationDispense to a Medication exists, a Medication resource must exist." -Expression: "part.where(name = 'medicationDispense').resource.medication.ofType(Reference).exists() implies part.where(name = 'medication').exists()" +Expression: "part.where(name = 'medicationDispense').resource.medication.ofType(Reference).reference.exists() implies part.where(name = 'medication').exists()" Severity: #error Invariant: workflow-parameters-close-dispense-medication-references Description: "If a reference from a MedicationDispense to a Medication exists, the reference must resolve to the Medication." -Expression: "part.where(name = 'medicationDispense').resource.medication.ofType(Reference).exists() implies ((part.where(name = 'medicationDispense').resource.medication.reference.split('/').last().split(':').last()) = (part.where(name = 'medication').resource.id))" +Expression: "part.where(name = 'medicationDispense').resource.medication.ofType(Reference).reference.exists() implies ((part.where(name = 'medicationDispense').resource.medication.reference.split('/').last().split(':').last()) = (part.where(name = 'medication').resource.id))" Severity: #error From a428285c4eed079a2a50222a407d55c35265cf75 Mon Sep 17 00:00:00 2001 From: florianschoffke Date: Fri, 6 Sep 2024 11:56:27 +0200 Subject: [PATCH 12/19] Fix examples totalQuantity Extension --- .../Communication-8ca3c379-ac86-470f-bc12-178c9008f5c9.json | 2 +- .../resources/Medication-Medication-Rezeptur-FD.json | 2 +- .../fsh-generated/resources/Medication-Medication-Rezeptur.json | 2 +- .../resources/Medication-SumatripanMedication.json | 2 +- .../resources/Parameters-ExampleCloseInputParameters.json | 2 +- ...-ExampleCloseInputParametersMultipleMedicationDispenses.json | 2 +- .../Parameters-ExampleCloseInputParametersRezeptur.json | 2 +- .../resources/Parameters-ExampleDispenseInputParameters.json | 2 +- ...ampleDispenseInputParametersMultipleMedicationDispenses.json | 2 +- .../Parameters-ExampleDispenseOutputParametersSuccess.json | 2 +- Resources/input/fsh/examples/Example_Medication.fsh | 2 +- Resources/input/fsh/examples/Example_Medication_Rezeptur.fsh | 2 +- Resources/input/fsh/examples/Example_Medication_Rezeptur_FD.fsh | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Resources/fsh-generated/resources/Communication-8ca3c379-ac86-470f-bc12-178c9008f5c9.json b/Resources/fsh-generated/resources/Communication-8ca3c379-ac86-470f-bc12-178c9008f5c9.json index dc3c352e..ed42cefe 100644 --- a/Resources/fsh-generated/resources/Communication-8ca3c379-ac86-470f-bc12-178c9008f5c9.json +++ b/Resources/fsh-generated/resources/Communication-8ca3c379-ac86-470f-bc12-178c9008f5c9.json @@ -123,7 +123,7 @@ "extension": [ { "url": "https://gematik.de/fhir/epa-medication/StructureDefinition/medication-total-quantity-formulation-extension", - "valueString": "20 St." + "valueString": "20" } ], "value": 20, diff --git a/Resources/fsh-generated/resources/Medication-Medication-Rezeptur-FD.json b/Resources/fsh-generated/resources/Medication-Medication-Rezeptur-FD.json index a6b18c04..5555b10d 100644 --- a/Resources/fsh-generated/resources/Medication-Medication-Rezeptur-FD.json +++ b/Resources/fsh-generated/resources/Medication-Medication-Rezeptur-FD.json @@ -41,7 +41,7 @@ "extension": [ { "url": "https://gematik.de/fhir/epa-medication/StructureDefinition/medication-total-quantity-formulation-extension", - "valueString": "100 ml" + "valueString": "100" } ], "value": 20, diff --git a/Resources/fsh-generated/resources/Medication-Medication-Rezeptur.json b/Resources/fsh-generated/resources/Medication-Medication-Rezeptur.json index b89b35b3..0069f216 100644 --- a/Resources/fsh-generated/resources/Medication-Medication-Rezeptur.json +++ b/Resources/fsh-generated/resources/Medication-Medication-Rezeptur.json @@ -41,7 +41,7 @@ "extension": [ { "url": "https://gematik.de/fhir/epa-medication/StructureDefinition/medication-total-quantity-formulation-extension", - "valueString": "100 ml" + "valueString": "100" } ], "value": 20, diff --git a/Resources/fsh-generated/resources/Medication-SumatripanMedication.json b/Resources/fsh-generated/resources/Medication-SumatripanMedication.json index 577208c1..982e17f3 100644 --- a/Resources/fsh-generated/resources/Medication-SumatripanMedication.json +++ b/Resources/fsh-generated/resources/Medication-SumatripanMedication.json @@ -45,7 +45,7 @@ "extension": [ { "url": "https://gematik.de/fhir/epa-medication/StructureDefinition/medication-total-quantity-formulation-extension", - "valueString": "20 St." + "valueString": "20" } ], "value": 20, diff --git a/Resources/fsh-generated/resources/Parameters-ExampleCloseInputParameters.json b/Resources/fsh-generated/resources/Parameters-ExampleCloseInputParameters.json index 257d486e..bff14fb3 100644 --- a/Resources/fsh-generated/resources/Parameters-ExampleCloseInputParameters.json +++ b/Resources/fsh-generated/resources/Parameters-ExampleCloseInputParameters.json @@ -98,7 +98,7 @@ "extension": [ { "url": "https://gematik.de/fhir/epa-medication/StructureDefinition/medication-total-quantity-formulation-extension", - "valueString": "20 St." + "valueString": "20" } ], "value": 20, diff --git a/Resources/fsh-generated/resources/Parameters-ExampleCloseInputParametersMultipleMedicationDispenses.json b/Resources/fsh-generated/resources/Parameters-ExampleCloseInputParametersMultipleMedicationDispenses.json index bc2acf96..753dc77d 100644 --- a/Resources/fsh-generated/resources/Parameters-ExampleCloseInputParametersMultipleMedicationDispenses.json +++ b/Resources/fsh-generated/resources/Parameters-ExampleCloseInputParametersMultipleMedicationDispenses.json @@ -98,7 +98,7 @@ "extension": [ { "url": "https://gematik.de/fhir/epa-medication/StructureDefinition/medication-total-quantity-formulation-extension", - "valueString": "20 St." + "valueString": "20" } ], "value": 20, diff --git a/Resources/fsh-generated/resources/Parameters-ExampleCloseInputParametersRezeptur.json b/Resources/fsh-generated/resources/Parameters-ExampleCloseInputParametersRezeptur.json index 9d54cc67..3c5448f1 100644 --- a/Resources/fsh-generated/resources/Parameters-ExampleCloseInputParametersRezeptur.json +++ b/Resources/fsh-generated/resources/Parameters-ExampleCloseInputParametersRezeptur.json @@ -94,7 +94,7 @@ "extension": [ { "url": "https://gematik.de/fhir/epa-medication/StructureDefinition/medication-total-quantity-formulation-extension", - "valueString": "100 ml" + "valueString": "100" } ], "value": 20, diff --git a/Resources/fsh-generated/resources/Parameters-ExampleDispenseInputParameters.json b/Resources/fsh-generated/resources/Parameters-ExampleDispenseInputParameters.json index b7ad7485..8debb69a 100644 --- a/Resources/fsh-generated/resources/Parameters-ExampleDispenseInputParameters.json +++ b/Resources/fsh-generated/resources/Parameters-ExampleDispenseInputParameters.json @@ -98,7 +98,7 @@ "extension": [ { "url": "https://gematik.de/fhir/epa-medication/StructureDefinition/medication-total-quantity-formulation-extension", - "valueString": "20 St." + "valueString": "20" } ], "value": 20, diff --git a/Resources/fsh-generated/resources/Parameters-ExampleDispenseInputParametersMultipleMedicationDispenses.json b/Resources/fsh-generated/resources/Parameters-ExampleDispenseInputParametersMultipleMedicationDispenses.json index 244a3d66..261e438c 100644 --- a/Resources/fsh-generated/resources/Parameters-ExampleDispenseInputParametersMultipleMedicationDispenses.json +++ b/Resources/fsh-generated/resources/Parameters-ExampleDispenseInputParametersMultipleMedicationDispenses.json @@ -98,7 +98,7 @@ "extension": [ { "url": "https://gematik.de/fhir/epa-medication/StructureDefinition/medication-total-quantity-formulation-extension", - "valueString": "20 St." + "valueString": "20" } ], "value": 20, diff --git a/Resources/fsh-generated/resources/Parameters-ExampleDispenseOutputParametersSuccess.json b/Resources/fsh-generated/resources/Parameters-ExampleDispenseOutputParametersSuccess.json index bb9a54cf..26604239 100644 --- a/Resources/fsh-generated/resources/Parameters-ExampleDispenseOutputParametersSuccess.json +++ b/Resources/fsh-generated/resources/Parameters-ExampleDispenseOutputParametersSuccess.json @@ -98,7 +98,7 @@ "extension": [ { "url": "https://gematik.de/fhir/epa-medication/StructureDefinition/medication-total-quantity-formulation-extension", - "valueString": "20 St." + "valueString": "20" } ], "value": 20, diff --git a/Resources/input/fsh/examples/Example_Medication.fsh b/Resources/input/fsh/examples/Example_Medication.fsh index cd8869b9..c97ebb90 100644 --- a/Resources/input/fsh/examples/Example_Medication.fsh +++ b/Resources/input/fsh/examples/Example_Medication.fsh @@ -19,7 +19,7 @@ Usage: #example * form.coding[kbvDarreichungsform].code = #TAB * amount.numerator.value = 20 * amount.numerator.unit = "St" -* amount.numerator.extension[totalQuantity].valueString = "20 St." +* amount.numerator.extension[totalQuantity].valueString = "20" * amount.denominator.value = 1 Instance: SimpleMedication diff --git a/Resources/input/fsh/examples/Example_Medication_Rezeptur.fsh b/Resources/input/fsh/examples/Example_Medication_Rezeptur.fsh index 430a7902..1ea58201 100644 --- a/Resources/input/fsh/examples/Example_Medication_Rezeptur.fsh +++ b/Resources/input/fsh/examples/Example_Medication_Rezeptur.fsh @@ -21,7 +21,7 @@ Usage: #example * form.coding[kbvDarreichungsform].code = #SAL * amount.numerator.value = 20 * amount.numerator.unit = "ml" -* amount.numerator.extension[totalQuantity].valueString = "100 ml" +* amount.numerator.extension[totalQuantity].valueString = "100" * amount.denominator.value = 1 * ingredient[+].itemReference = Reference(MedicationHydrocortison) * ingredient[=].isActive = true diff --git a/Resources/input/fsh/examples/Example_Medication_Rezeptur_FD.fsh b/Resources/input/fsh/examples/Example_Medication_Rezeptur_FD.fsh index 2ea9dd35..abc36492 100644 --- a/Resources/input/fsh/examples/Example_Medication_Rezeptur_FD.fsh +++ b/Resources/input/fsh/examples/Example_Medication_Rezeptur_FD.fsh @@ -16,7 +16,7 @@ Usage: #example * code.text = "Hydrocortison-Dexpanthenol-Salbe" * form.text = "Salbe" -* amount.numerator.extension[totalQuantity].valueString = "100 ml" +* amount.numerator.extension[totalQuantity].valueString = "100" * amount.numerator.value = 20 * amount.numerator.unit = "ml" * amount.denominator.value = 1 From d9f5870e98f1f2466439cb3d6c003a4383743825 Mon Sep 17 00:00:00 2001 From: florianschoffke Date: Mon, 9 Sep 2024 07:28:19 +0200 Subject: [PATCH 13/19] Better comment for Communication.sent --- .../StructureDefinition-GEM-ERP-PR-Communication-DispReq.json | 4 ++-- .../StructureDefinition-GEM-ERP-PR-Communication-InfoReq.json | 4 ++-- .../StructureDefinition-GEM-ERP-PR-Communication-Reply.json | 4 ++-- ...ureDefinition-GEM-ERP-PR-Communication-Representative.json | 4 ++-- .../input/fsh/profiles/GEM_ERP_PR_Communication_DispReq.fsh | 4 ++-- .../input/fsh/profiles/GEM_ERP_PR_Communication_InfoReq.fsh | 4 ++-- .../input/fsh/profiles/GEM_ERP_PR_Communication_Reply.fsh | 4 ++-- .../fsh/profiles/GEM_ERP_PR_Communication_Representative.fsh | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-DispReq.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-DispReq.json index f08c2de5..04da7d53 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-DispReq.json +++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-DispReq.json @@ -96,14 +96,14 @@ "id": "Communication.sent", "path": "Communication.sent", "short": "The time when this communication was sent.", - "comment": "Set by the eprescription server.", + "comment": "Set by the eprescription server. A client therefore will always have this value available.", "mustSupport": true }, { "id": "Communication.received", "path": "Communication.received", "short": "The time when this communication was received.", - "comment": "Set by the eprescription server.", + "comment": "Set by the eprescription server. A client therefore will always have this value available.", "mustSupport": true }, { diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-InfoReq.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-InfoReq.json index 44d36343..3128afff 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-InfoReq.json +++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-InfoReq.json @@ -84,14 +84,14 @@ "id": "Communication.sent", "path": "Communication.sent", "short": "The time when this communication was sent.", - "comment": "Set by the eprescription server.", + "comment": "Set by the eprescription server. A client therefore will always have this value available.", "mustSupport": true }, { "id": "Communication.received", "path": "Communication.received", "short": "The time when this communication was received.", - "comment": "Set by the eprescription server.", + "comment": "Set by the eprescription server. A client therefore will always have this value available.", "mustSupport": true }, { diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-Reply.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-Reply.json index 786c4df0..3113f875 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-Reply.json +++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-Reply.json @@ -64,14 +64,14 @@ "id": "Communication.sent", "path": "Communication.sent", "short": "The time when this communication was sent.", - "comment": "Set by the eprescription server.", + "comment": "Set by the eprescription server. A client therefore will always have this value available.", "mustSupport": true }, { "id": "Communication.received", "path": "Communication.received", "short": "The time when this communication was received.", - "comment": "Set by the eprescription server.", + "comment": "Set by the eprescription server. A client therefore will always have this value available.", "mustSupport": true }, { diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-Representative.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-Representative.json index 46c069c4..29e2e3e8 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-Representative.json +++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERP-PR-Communication-Representative.json @@ -66,14 +66,14 @@ "id": "Communication.sent", "path": "Communication.sent", "short": "The time when this communication was sent.", - "comment": "Set by the eprescription server.", + "comment": "Set by the eprescription server. A client therefore will always have this value available.", "mustSupport": true }, { "id": "Communication.received", "path": "Communication.received", "short": "The time when this communication was received.", - "comment": "Set by the eprescription server.", + "comment": "Set by the eprescription server. A client therefore will always have this value available.", "mustSupport": true }, { diff --git a/Resources/input/fsh/profiles/GEM_ERP_PR_Communication_DispReq.fsh b/Resources/input/fsh/profiles/GEM_ERP_PR_Communication_DispReq.fsh index 2a0f83ed..91b272b9 100644 --- a/Resources/input/fsh/profiles/GEM_ERP_PR_Communication_DispReq.fsh +++ b/Resources/input/fsh/profiles/GEM_ERP_PR_Communication_DispReq.fsh @@ -16,10 +16,10 @@ Description: "Ressource used for the communication of dispense request between p * status = #unknown (exactly) * sent MS * ^short = "The time when this communication was sent." - * ^comment = "Set by the eprescription server." + * ^comment = "Set by the eprescription server. A client therefore will always have this value available." * received MS * ^short = "The time when this communication was received." - * ^comment = "Set by the eprescription server." + * ^comment = "Set by the eprescription server. A client therefore will always have this value available." * recipient 1..1 MS * ^short = "The entity (e.g. person, organization) which was the target of the communication." * ^comment = "This needs to be set by the sender of the communication to define the target." diff --git a/Resources/input/fsh/profiles/GEM_ERP_PR_Communication_InfoReq.fsh b/Resources/input/fsh/profiles/GEM_ERP_PR_Communication_InfoReq.fsh index 9b32f464..c092ea6c 100644 --- a/Resources/input/fsh/profiles/GEM_ERP_PR_Communication_InfoReq.fsh +++ b/Resources/input/fsh/profiles/GEM_ERP_PR_Communication_InfoReq.fsh @@ -18,10 +18,10 @@ Description: "Ressource used for the communication of informative requests betwe * about.reference 1..1 * sent MS * ^short = "The time when this communication was sent." - * ^comment = "Set by the eprescription server." + * ^comment = "Set by the eprescription server. A client therefore will always have this value available." * received MS * ^short = "The time when this communication was received." - * ^comment = "Set by the eprescription server." + * ^comment = "Set by the eprescription server. A client therefore will always have this value available." * recipient 1..1 * ^short = "The entity (e.g. person, organization) which was the target of the communication." * ^comment = "This needs to be set by the sender of the communication to define the target." diff --git a/Resources/input/fsh/profiles/GEM_ERP_PR_Communication_Reply.fsh b/Resources/input/fsh/profiles/GEM_ERP_PR_Communication_Reply.fsh index 3ae70a73..e2725057 100644 --- a/Resources/input/fsh/profiles/GEM_ERP_PR_Communication_Reply.fsh +++ b/Resources/input/fsh/profiles/GEM_ERP_PR_Communication_Reply.fsh @@ -19,10 +19,10 @@ Description: "Ressource used for the communication of the reply to dispense/info //* about.reference 1.. MS * sent MS * ^short = "The time when this communication was sent." - * ^comment = "Set by the eprescription server." + * ^comment = "Set by the eprescription server. A client therefore will always have this value available." * received MS * ^short = "The time when this communication was received." - * ^comment = "Set by the eprescription server." + * ^comment = "Set by the eprescription server. A client therefore will always have this value available." * recipient 1..1 * ^short = "The entity (e.g. person, organization) which was the target of the communication." * ^comment = "This needs to be set by the sender of the communication to define the target." diff --git a/Resources/input/fsh/profiles/GEM_ERP_PR_Communication_Representative.fsh b/Resources/input/fsh/profiles/GEM_ERP_PR_Communication_Representative.fsh index c81b2068..2d5ecd1e 100644 --- a/Resources/input/fsh/profiles/GEM_ERP_PR_Communication_Representative.fsh +++ b/Resources/input/fsh/profiles/GEM_ERP_PR_Communication_Representative.fsh @@ -15,10 +15,10 @@ Description: "Ressource used for the communication between patients and their re * status = #unknown (exactly) * sent MS * ^short = "The time when this communication was sent." - * ^comment = "Set by the eprescription server." + * ^comment = "Set by the eprescription server. A client therefore will always have this value available." * received MS * ^short = "The time when this communication was received." - * ^comment = "Set by the eprescription server." + * ^comment = "Set by the eprescription server. A client therefore will always have this value available." * recipient 1..1 MS * ^short = "The entity (e.g. person, organization) which was the target of the communication." * ^comment = "This needs to be set by the sender of the communication to define the target." From d542385e0c773b6f7ea558ec83bae482cfd79102 Mon Sep 17 00:00:00 2001 From: florianschoffke Date: Mon, 9 Sep 2024 08:36:30 +0200 Subject: [PATCH 14/19] Add more invalid examples --- .../Example_Parameters_Close.fsh | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/Resources/input/fsh/examples/parameters_examples/Example_Parameters_Close.fsh b/Resources/input/fsh/examples/parameters_examples/Example_Parameters_Close.fsh index f175109b..793fa8c4 100644 --- a/Resources/input/fsh/examples/parameters_examples/Example_Parameters_Close.fsh +++ b/Resources/input/fsh/examples/parameters_examples/Example_Parameters_Close.fsh @@ -79,6 +79,23 @@ Title: "Example Close Parameters" * name = "medicationDispense" * resource = Example-MedicationDispense-Without-Medication +Instance: INVALID-ExampleCloseInputParametersWithoutMedicationDispense +InstanceOf: GEM_ERP_PR_PAR_CloseOperation_Input +Usage: #example +Title: "Example Close Parameters" +* parameter[rxDispensation] + * name = "rxDispensation" + * part[medication] + * name = "medication" + * resource = SimpleMedication + +Instance: INVALID-ExampleCloseInputParametersNoParts +InstanceOf: GEM_ERP_PR_PAR_CloseOperation_Input +Usage: #example +Title: "Example Close Parameters" +* parameter[rxDispensation] + * name = "rxDispensation" + Instance: INVALID-ExampleCloseInputParametersReferenceWrong InstanceOf: GEM_ERP_PR_PAR_CloseOperation_Input Usage: #example @@ -91,4 +108,25 @@ Title: "Example Close Parameters" * part[medication] * name = "medication" * resource = SimpleMedication + +Instance: INVALID-ExampleCloseInputParametersReferenceWrongMultiple +InstanceOf: GEM_ERP_PR_PAR_CloseOperation_Input +Usage: #example +Title: "Example Close Parameters" +* parameter[rxDispensation][+] + * name = "rxDispensation" + * part[medicationDispense] + * name = "medicationDispense" + * resource = Example-MedicationDispense + * part[medication] + * name = "medication" + * resource = Medication-Without-Strength-Code +* parameter[rxDispensation][+] + * name = "rxDispensation" + * part[medicationDispense] + * name = "medicationDispense" + * resource = Example-MedicationDispense-2 + * part[medication] + * name = "medication" + * resource = SumatripanMedication */ \ No newline at end of file From f1e496965c68693ab0f48c26b3e777592354651d Mon Sep 17 00:00:00 2001 From: florianschoffke Date: Mon, 9 Sep 2024 08:39:51 +0200 Subject: [PATCH 15/19] Add more dispense input invalid examples --- .../Example_Parameters_Dispense.fsh | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/Resources/input/fsh/examples/parameters_examples/Example_Parameters_Dispense.fsh b/Resources/input/fsh/examples/parameters_examples/Example_Parameters_Dispense.fsh index eba2ea85..2341af72 100644 --- a/Resources/input/fsh/examples/parameters_examples/Example_Parameters_Dispense.fsh +++ b/Resources/input/fsh/examples/parameters_examples/Example_Parameters_Dispense.fsh @@ -79,6 +79,13 @@ Title: "Example Dispense Parameters" * name = "medicationDispense" * resource = Example-MedicationDispense-Without-Medication +Instance: INVALID-ExampleDispenseInputParametersNoParts +InstanceOf: GEM_ERP_PR_PAR_DispenseOperation_Input +Usage: #example +Title: "Example Dispense Parameters" +* parameter[rxDispensation] + * name = "rxDispensation" + Instance: INVALID-ExampleDispenseInputParametersReferenceWrong InstanceOf: GEM_ERP_PR_PAR_DispenseOperation_Input Usage: #example @@ -91,4 +98,25 @@ Title: "Example Dispense Parameters" * part[medication] * name = "medication" * resource = SimpleMedication + +Instance: INVALID-ExampleDispenseInputParametersReferenceWrongMultiple +InstanceOf: GEM_ERP_PR_PAR_DispenseOperation_Input +Usage: #example +Title: "Example Dispense Parameters" +* parameter[rxDispensation][+] + * name = "rxDispensation" + * part[medicationDispense] + * name = "medicationDispense" + * resource = Example-MedicationDispense + * part[medication] + * name = "medication" + * resource = Medication-Without-Strength-Code +* parameter[rxDispensation][+] + * name = "rxDispensation" + * part[medicationDispense] + * name = "medicationDispense" + * resource = Example-MedicationDispense-2 + * part[medication] + * name = "medication" + * resource = SumatripanMedication */ \ No newline at end of file From c958f8e468638110fe45fafef5e2e13ee06111e8 Mon Sep 17 00:00:00 2001 From: florianschoffke Date: Tue, 10 Sep 2024 06:59:11 +0200 Subject: [PATCH 16/19] Add jurisdiction to package json --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 1fc838f0..2456fda9 100644 --- a/package.json +++ b/package.json @@ -3,6 +3,7 @@ "4.0.1" ], "name": "de.gematik.erezept-workflow.r4", + "jurisdiction": "urn:iso:std:iso:3166#DE", "version": "1.4.1", "description": "ePrescription workflow specification.", "author": "gematik", From 54de4a9d01e9339009d1913f2497cc256a3b471c Mon Sep 17 00:00:00 2001 From: florianschoffke Date: Tue, 10 Sep 2024 07:00:22 +0200 Subject: [PATCH 17/19] Fix LotNumber Placement in Kombipackung --- Resources/fsh-generated/fsh-index.json | 6 +++--- Resources/fsh-generated/fsh-index.txt | 6 +++--- .../resources/Medication-Augentropfen.json | 5 +---- .../Medication-Medication-Kombipackung.json | 13 +++++-------- .../resources/Medication-NasenSpray.json | 5 +---- ...ers-ExampleCloseInputParametersKombipackung.json | 13 +++++-------- ...-ExampleDispenseInputParametersKombipackung.json | 13 +++++-------- .../examples/Example_Medication_Kombipackung.fsh | 3 +-- 8 files changed, 24 insertions(+), 40 deletions(-) diff --git a/Resources/fsh-generated/fsh-index.json b/Resources/fsh-generated/fsh-index.json index c02c220d..40dbdedd 100644 --- a/Resources/fsh-generated/fsh-index.json +++ b/Resources/fsh-generated/fsh-index.json @@ -92,7 +92,7 @@ "fshName": "Augentropfen", "fshType": "Instance", "fshFile": "examples/Example_Medication_Kombipackung.fsh", - "startLine": 19, + "startLine": 20, "endLine": 37 }, { @@ -101,7 +101,7 @@ "fshType": "Instance", "fshFile": "examples/Example_Medication_Kombipackung.fsh", "startLine": 2, - "endLine": 17 + "endLine": 18 }, { "outputFile": "Medication-Medication-Rezeptur-FD.json", @@ -173,7 +173,7 @@ "fshType": "Instance", "fshFile": "examples/Example_Medication_Kombipackung.fsh", "startLine": 39, - "endLine": 57 + "endLine": 56 }, { "outputFile": "Medication-SimpleMedication.json", diff --git a/Resources/fsh-generated/fsh-index.txt b/Resources/fsh-generated/fsh-index.txt index bae3150f..38700dc3 100644 --- a/Resources/fsh-generated/fsh-index.txt +++ b/Resources/fsh-generated/fsh-index.txt @@ -10,8 +10,8 @@ Communication-2be1c6ac-5d10-47f6-84ee-8318b2c22c76.json Commu Communication-7977a4ab-97a9-4d95-afb3-6c4c1e2ac596.json Communication_Reply Instance examples/Example_Communication_Reply.fsh 2 - 26 Communication-8ca3c379-ac86-470f-bc12-178c9008f5c9.json Communication_InformationRequest Instance examples/Example_Communication_InfoReq.fsh 1 - 35 Communication-a218a36e-f2fd-4603-ba67-c827acfef01b.json Communication_DispenseRequest Instance examples/Example_Communication_DispReq.fsh 2 - 18 -Medication-Augentropfen.json Augentropfen Instance examples/Example_Medication_Kombipackung.fsh 19 - 37 -Medication-Medication-Kombipackung.json Medication-Kombipackung Instance examples/Example_Medication_Kombipackung.fsh 2 - 17 +Medication-Augentropfen.json Augentropfen Instance examples/Example_Medication_Kombipackung.fsh 20 - 37 +Medication-Medication-Kombipackung.json Medication-Kombipackung Instance examples/Example_Medication_Kombipackung.fsh 2 - 18 Medication-Medication-Rezeptur-FD.json Medication-Rezeptur-FD Instance examples/Example_Medication_Rezeptur_FD.fsh 2 - 45 Medication-Medication-Rezeptur.json Medication-Rezeptur Instance examples/Example_Medication_Rezeptur.fsh 2 - 41 Medication-Medication-Without-Strength-Code.json Medication-Without-Strength-Code Instance examples/Example_Medication.fsh 33 - 50 @@ -20,7 +20,7 @@ Medication-MedicationDexpanthenol-FD.json Medic Medication-MedicationDexpanthenol.json MedicationDexpanthenol Instance examples/Example_Medication_Rezeptur.fsh 53 - 61 Medication-MedicationHydrocortison-FD.json MedicationHydrocortison-FD Instance examples/Example_Medication_Rezeptur_FD.fsh 47 - 55 Medication-MedicationHydrocortison.json MedicationHydrocortison Instance examples/Example_Medication_Rezeptur.fsh 43 - 51 -Medication-NasenSpray.json NasenSpray Instance examples/Example_Medication_Kombipackung.fsh 39 - 57 +Medication-NasenSpray.json NasenSpray Instance examples/Example_Medication_Kombipackung.fsh 39 - 56 Medication-SimpleMedication.json SimpleMedication Instance examples/Example_Medication.fsh 25 - 30 Medication-SumatripanMedication.json SumatripanMedication Instance examples/Example_Medication.fsh 2 - 23 MedicationDispense-Example-MedicationDispense-2.json Example-MedicationDispense-2 Instance examples/Example_MedicationDispense.fsh 29 - 41 diff --git a/Resources/fsh-generated/resources/Medication-Augentropfen.json b/Resources/fsh-generated/resources/Medication-Augentropfen.json index 7a057c24..bc20ecb8 100644 --- a/Resources/fsh-generated/resources/Medication-Augentropfen.json +++ b/Resources/fsh-generated/resources/Medication-Augentropfen.json @@ -51,8 +51,5 @@ } } } - ], - "batch": { - "lotNumber": "0132456" - } + ] } diff --git a/Resources/fsh-generated/resources/Medication-Medication-Kombipackung.json b/Resources/fsh-generated/resources/Medication-Medication-Kombipackung.json index c4a46e28..e2d9f6a1 100644 --- a/Resources/fsh-generated/resources/Medication-Medication-Kombipackung.json +++ b/Resources/fsh-generated/resources/Medication-Medication-Kombipackung.json @@ -100,10 +100,7 @@ } } } - ], - "batch": { - "lotNumber": "0132456" - } + ] }, { "resourceType": "Medication", @@ -158,12 +155,12 @@ } } } - ], - "batch": { - "lotNumber": "56498416854" - } + ] } ], + "batch": { + "lotNumber": "56498416854" + }, "status": "active", "ingredient": [ { diff --git a/Resources/fsh-generated/resources/Medication-NasenSpray.json b/Resources/fsh-generated/resources/Medication-NasenSpray.json index ebd6d5c1..f868da6b 100644 --- a/Resources/fsh-generated/resources/Medication-NasenSpray.json +++ b/Resources/fsh-generated/resources/Medication-NasenSpray.json @@ -51,8 +51,5 @@ } } } - ], - "batch": { - "lotNumber": "56498416854" - } + ] } diff --git a/Resources/fsh-generated/resources/Parameters-ExampleCloseInputParametersKombipackung.json b/Resources/fsh-generated/resources/Parameters-ExampleCloseInputParametersKombipackung.json index d6dfc592..11808449 100644 --- a/Resources/fsh-generated/resources/Parameters-ExampleCloseInputParametersKombipackung.json +++ b/Resources/fsh-generated/resources/Parameters-ExampleCloseInputParametersKombipackung.json @@ -153,10 +153,7 @@ } } } - ], - "batch": { - "lotNumber": "0132456" - } + ] }, { "resourceType": "Medication", @@ -211,12 +208,12 @@ } } } - ], - "batch": { - "lotNumber": "56498416854" - } + ] } ], + "batch": { + "lotNumber": "56498416854" + }, "status": "active", "ingredient": [ { diff --git a/Resources/fsh-generated/resources/Parameters-ExampleDispenseInputParametersKombipackung.json b/Resources/fsh-generated/resources/Parameters-ExampleDispenseInputParametersKombipackung.json index a5ad16d9..f1306c90 100644 --- a/Resources/fsh-generated/resources/Parameters-ExampleDispenseInputParametersKombipackung.json +++ b/Resources/fsh-generated/resources/Parameters-ExampleDispenseInputParametersKombipackung.json @@ -153,10 +153,7 @@ } } } - ], - "batch": { - "lotNumber": "0132456" - } + ] }, { "resourceType": "Medication", @@ -211,12 +208,12 @@ } } } - ], - "batch": { - "lotNumber": "56498416854" - } + ] } ], + "batch": { + "lotNumber": "56498416854" + }, "status": "active", "ingredient": [ { diff --git a/Resources/input/fsh/examples/Example_Medication_Kombipackung.fsh b/Resources/input/fsh/examples/Example_Medication_Kombipackung.fsh index c18623a8..b62ed793 100644 --- a/Resources/input/fsh/examples/Example_Medication_Kombipackung.fsh +++ b/Resources/input/fsh/examples/Example_Medication_Kombipackung.fsh @@ -5,6 +5,7 @@ Title: "Medication-Kombipackung" Usage: #example * contained[+] = Augentropfen * contained[+] = NasenSpray +* batch.lotNumber = "56498416854" * extension[type].valueCoding = $sct#781405001 "Medicinal product package" * extension[isVaccine].valueBoolean = false * extension[drugCategory].valueCoding = EPADrugCategoryCS#00 @@ -20,7 +21,6 @@ Instance: Augentropfen InstanceOf: EPAMedicationPharmaceuticalProduct * extension[type].valueCoding = $sct#373873005 "Pharmaceutical / biologic product (product)" * code.coding[product-key] = $cs-product-key#01746517-1 "Augentropfen" -* batch.lotNumber = "0132456" * ingredient[+] * itemCodeableConcept * coding[atc-de] = $cs-atc-de#R01AC01 "Natriumcromoglicat" @@ -40,7 +40,6 @@ Instance: NasenSpray InstanceOf: EPAMedicationPharmaceuticalProduct * extension[type].valueCoding = $sct#373873005 "Pharmaceutical / biologic product (product)" * code.coding[product-key] = $cs-product-key#01746517-2 "Nasenspray, Lösung" -* batch.lotNumber = "56498416854" * ingredient[+] * itemCodeableConcept * coding[atc-de] = $cs-atc-de#R01AC01 "Natriumcromoglicat" From a9304333e478e8a5933554089cafec311884dd4e Mon Sep 17 00:00:00 2001 From: florianschoffke Date: Tue, 10 Sep 2024 09:48:52 +0200 Subject: [PATCH 18/19] set epa medication dependency to 1.0.3 --- Resources/sushi-config.yaml | 2 +- fhirpkg.lock.json | 6 +++--- package.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Resources/sushi-config.yaml b/Resources/sushi-config.yaml index bfdc5fe8..b1aec3af 100644 --- a/Resources/sushi-config.yaml +++ b/Resources/sushi-config.yaml @@ -7,7 +7,7 @@ version: "1.4.1" dependencies: hl7.fhir.r4.core: 4.0.1 de.basisprofil.r4: 1.5.0 - de.gematik.epa.medication: 1.0.2 + de.gematik.epa.medication: 1.0.3 kbv.basis: 1.3.0 kbv.ita.for: 1.1.x kbv.ita.erp: 1.1.x \ No newline at end of file diff --git a/fhirpkg.lock.json b/fhirpkg.lock.json index 084a841e..fb324e96 100644 --- a/fhirpkg.lock.json +++ b/fhirpkg.lock.json @@ -1,13 +1,13 @@ { - "updated": "2024-07-24T08:02:31.596949+02:00", + "updated": "2024-09-10T09:47:53.155598+02:00", "dependencies": { "kbv.ita.erp": "1.1.2", "KBV.Basis": "1.3.0", "hl7.fhir.r4.core": "4.0.1", "kbv.ita.for": "1.1.0", "de.basisprofil.r4": "1.5.0", - "de.gematik.epa.medication": "1.0.2", - "de.gematik.fhir.directory": "0.11.8", + "de.gematik.epa.medication": "1.0.3", + "de.gematik.fhir.directory": "0.11.12", "de.ihe-d.terminology": "3.0.0" }, "missing": {} diff --git a/package.json b/package.json index 2456fda9..dcb9e6b8 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "kbv.ita.for": "1.1.x", "hl7.fhir.r4.core": "4.0.1", "de.basisprofil.r4": "1.5.0", - "de.gematik.epa.medication": "1.0.2", + "de.gematik.epa.medication": "1.0.3", "de.gematik.fhir.directory": "0.11.8" } } From 172dc45ac8afb8e42dc0eba50dc4c58dfc2d9b59 Mon Sep 17 00:00:00 2001 From: florianschoffke Date: Tue, 10 Sep 2024 13:38:29 +0200 Subject: [PATCH 19/19] Set Package-Version to 1.4.2 --- Resources/sushi-config.yaml | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/sushi-config.yaml b/Resources/sushi-config.yaml index b1aec3af..27638d95 100644 --- a/Resources/sushi-config.yaml +++ b/Resources/sushi-config.yaml @@ -3,7 +3,7 @@ fhirVersion: 4.0.1 FSHOnly: true applyExtensionMetadataToRoot: false -version: "1.4.1" +version: "1.4.2" dependencies: hl7.fhir.r4.core: 4.0.1 de.basisprofil.r4: 1.5.0 diff --git a/package.json b/package.json index dcb9e6b8..0936527c 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ ], "name": "de.gematik.erezept-workflow.r4", "jurisdiction": "urn:iso:std:iso:3166#DE", - "version": "1.4.1", + "version": "1.4.2", "description": "ePrescription workflow specification.", "author": "gematik", "dependencies": {