Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Prescription IDs for Examples #56

Merged
merged 2 commits into from
Aug 29, 2024
Merged

Fix Prescription IDs for Examples #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5980a04
Fix Prescription IDs for Examples
florianschoffke Aug 29, 2024
66cf00d
remove unnecessary whenPrepared
florianschoffke Aug 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions Resources/fsh-generated/fsh-index.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,8 +188,8 @@
"fshName": "Example-MedicationDispense-2",
"fshType": "Instance",
"fshFile": "examples/Example_MedicationDispense.fsh",
"startLine": 17,
"endLine": 30
"startLine": 16,
"endLine": 28
},
{
"outputFile": "MedicationDispense-Example-MedicationDispense-DiGA-DeepLink.json",
Expand Down Expand Up @@ -220,24 +220,24 @@
"fshName": "Example-MedicationDispense-Kombipackung",
"fshType": "Instance",
"fshFile": "examples/Example_MedicationDispense.fsh",
"startLine": 32,
"endLine": 45
"startLine": 30,
"endLine": 42
},
{
"outputFile": "MedicationDispense-Example-MedicationDispense-Rezeptur.json",
"fshName": "Example-MedicationDispense-Rezeptur",
"fshType": "Instance",
"fshFile": "examples/Example_MedicationDispense.fsh",
"startLine": 47,
"endLine": 60
"startLine": 44,
"endLine": 56
},
{
"outputFile": "MedicationDispense-Example-MedicationDispense.json",
"fshName": "Example-MedicationDispense",
"fshType": "Instance",
"fshFile": "examples/Example_MedicationDispense.fsh",
"startLine": 2,
"endLine": 15
"endLine": 14
},
{
"outputFile": "OperationDefinition-AbortOperation.json",
Expand Down
8 changes: 4 additions & 4 deletions Resources/fsh-generated/fsh-index.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ 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 17 - 30
MedicationDispense-Example-MedicationDispense-2.json Example-MedicationDispense-2 Instance examples/Example_MedicationDispense.fsh 16 - 28
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 32 - 45
MedicationDispense-Example-MedicationDispense-Rezeptur.json Example-MedicationDispense-Rezeptur Instance examples/Example_MedicationDispense.fsh 47 - 60
MedicationDispense-Example-MedicationDispense.json Example-MedicationDispense Instance examples/Example_MedicationDispense.fsh 2 - 15
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
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
Expand Down
3 changes: 1 addition & 2 deletions Resources/fsh-generated/resources/MedicationDispense-Example-MedicationDispense-2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"identifier": [
{
"system": "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_PrescriptionId",
"value": "160.153.303.257.459"
"value": "160.000.033.491.280.78"
}
],
"status": "completed",
Expand All @@ -30,7 +30,6 @@
}
],
"whenHandedOver": "2024-04-03",
"whenPrepared": "2024-04-03",
"medicationReference": {
"reference": "Medication/Medication-Without-Strength-Code"
}
Expand Down
3 changes: 1 addition & 2 deletions ...s/fsh-generated/resources/MedicationDispense-Example-MedicationDispense-Kombipackung.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"identifier": [
{
"system": "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_PrescriptionId",
"value": "160.153.303.257.459"
"value": "160.000.033.491.280.78"
}
],
"status": "completed",
Expand All @@ -30,7 +30,6 @@
}
],
"whenHandedOver": "2024-04-03",
"whenPrepared": "2024-04-03",
"medicationReference": {
"reference": "Medication/Medication-Kombipackung"
}
Expand Down
3 changes: 1 addition & 2 deletions ...urces/fsh-generated/resources/MedicationDispense-Example-MedicationDispense-Rezeptur.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"identifier": [
{
"system": "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_PrescriptionId",
"value": "160.153.303.257.459"
"value": "160.000.033.491.280.78"
}
],
"status": "completed",
Expand All @@ -30,7 +30,6 @@
}
],
"whenHandedOver": "2024-04-03",
"whenPrepared": "2024-04-03",
"medicationReference": {
"reference": "Medication/Medication-Rezeptur"
}
Expand Down
1 change: 0 additions & 1 deletion Resources/fsh-generated/resources/MedicationDispense-Example-MedicationDispense.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
}
],
"whenHandedOver": "2024-04-03",
"whenPrepared": "2024-04-03",
"medicationReference": {
"reference": "Medication/SumatripanMedication"
}
Expand Down
1 change: 0 additions & 1 deletion Resources/fsh-generated/resources/Parameters-ExampleDispenseInputParameters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
}
],
"whenHandedOver": "2024-04-03",
"whenPrepared": "2024-04-03",
"medicationReference": {
"reference": "Medication/SumatripanMedication"
}
Expand Down
3 changes: 1 addition & 2 deletions Resources/fsh-generated/resources/Parameters-ExampleDispenseInputParametersKombipackung.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"identifier": [
{
"system": "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_PrescriptionId",
"value": "160.153.303.257.459"
"value": "160.000.033.491.280.78"
}
],
"status": "completed",
Expand All @@ -44,7 +44,6 @@
}
],
"whenHandedOver": "2024-04-03",
"whenPrepared": "2024-04-03",
"medicationReference": {
"reference": "Medication/Medication-Kombipackung"
}
Expand Down
4 changes: 1 addition & 3 deletions ...rated/resources/Parameters-ExampleDispenseInputParametersMultipleMedicationDispenses.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
}
],
"whenHandedOver": "2024-04-03",
"whenPrepared": "2024-04-03",
"medicationReference": {
"reference": "Medication/SumatripanMedication"
}
Expand Down Expand Up @@ -129,7 +128,7 @@
"identifier": [
{
"system": "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_PrescriptionId",
"value": "160.153.303.257.459"
"value": "160.000.033.491.280.78"
}
],
"status": "completed",
Expand All @@ -150,7 +149,6 @@
}
],
"whenHandedOver": "2024-04-03",
"whenPrepared": "2024-04-03",
"medicationReference": {
"reference": "Medication/Medication-Without-Strength-Code"
}
Expand Down
1 change: 0 additions & 1 deletion Resources/fsh-generated/resources/Parameters-ExampleDispenseOutputParametersSuccess.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
}
],
"whenHandedOver": "2024-04-03",
"whenPrepared": "2024-04-03",
"medicationReference": {
"reference": "Medication/SumatripanMedication"
}
Expand Down
1 change: 0 additions & 1 deletion Resources/fsh-generated/resources/Parameters-ExampleOperationCloseInputParameters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
}
],
"whenHandedOver": "2024-04-03",
"whenPrepared": "2024-04-03",
"medicationReference": {
"reference": "Medication/SumatripanMedication"
}
Expand Down
3 changes: 1 addition & 2 deletions .../fsh-generated/resources/Parameters-ExampleOperationCloseInputParametersKombipackung.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"identifier": [
{
"system": "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_PrescriptionId",
"value": "160.153.303.257.459"
"value": "160.000.033.491.280.78"
}
],
"status": "completed",
Expand All @@ -44,7 +44,6 @@
}
],
"whenHandedOver": "2024-04-03",
"whenPrepared": "2024-04-03",
"medicationReference": {
"reference": "Medication/Medication-Kombipackung"
}
Expand Down
4 changes: 1 addition & 3 deletions ...resources/Parameters-ExampleOperationCloseInputParametersMultipleMedicationDispenses.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
}
],
"whenHandedOver": "2024-04-03",
"whenPrepared": "2024-04-03",
"medicationReference": {
"reference": "Medication/SumatripanMedication"
}
Expand Down Expand Up @@ -129,7 +128,7 @@
"identifier": [
{
"system": "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_PrescriptionId",
"value": "160.153.303.257.459"
"value": "160.000.033.491.280.78"
}
],
"status": "completed",
Expand All @@ -150,7 +149,6 @@
}
],
"whenHandedOver": "2024-04-03",
"whenPrepared": "2024-04-03",
"medicationReference": {
"reference": "Medication/Medication-Without-Strength-Code"
}
Expand Down
3 changes: 1 addition & 2 deletions ...rces/fsh-generated/resources/Parameters-ExampleOperationCloseInputParametersRezeptur.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"identifier": [
{
"system": "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_PrescriptionId",
"value": "160.153.303.257.459"
"value": "160.000.033.491.280.78"
}
],
"status": "completed",
Expand All @@ -44,7 +44,6 @@
}
],
"whenHandedOver": "2024-04-03",
"whenPrepared": "2024-04-03",
"medicationReference": {
"reference": "Medication/Medication-Rezeptur"
}
Expand Down
1 change: 0 additions & 1 deletion ...generated/resources/Parameters-ExampleOperationCloseInputParametersWithoutMedication.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
}
],
"whenHandedOver": "2024-04-03",
"whenPrepared": "2024-04-03",
"medicationReference": {
"reference": "Medication/SumatripanMedication"
}
Expand Down
14 changes: 3 additions & 11 deletions Resources/input/fsh/examples/Example_MedicationDispense.fsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ Description: "Example of a Medication Dispense."
* performer.actor.identifier.system = $identifier-telematik-id
* performer.actor.identifier.value = "3-SMC-B-Testkarte-883110000095957"
* whenHandedOver = "2024-04-03"
* whenPrepared = "2024-04-03"
* medicationReference = Reference(SumatripanMedication)

Instance: Example-MedicationDispense-2
Expand All @@ -20,13 +19,12 @@ Usage: #example
Title: "Example another Medication Dispense"
Description: "Example of another Medication Dispense."
* identifier[prescriptionID].system = "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_PrescriptionId"
* identifier[prescriptionID].value = "160.153.303.257.459"
* 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"
* whenPrepared = "2024-04-03"
* medicationReference = Reference(Medication-Without-Strength-Code)

Instance: Example-MedicationDispense-Kombipackung
Expand All @@ -35,13 +33,12 @@ Usage: #example
Title: "Example Kombipackung Medication Dispense"
Description: "Example of a Kombipackung Medication Dispense."
* identifier[prescriptionID].system = "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_PrescriptionId"
* identifier[prescriptionID].value = "160.153.303.257.459"
* 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"
* whenPrepared = "2024-04-03"
* medicationReference = Reference(Medication-Kombipackung)

Instance: Example-MedicationDispense-Rezeptur
Expand All @@ -50,13 +47,12 @@ Usage: #example
Title: "Example Rezeptur Medication Dispense"
Description: "Example of a Rezeptur Medication Dispense."
* identifier[prescriptionID].system = "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_PrescriptionId"
* identifier[prescriptionID].value = "160.153.303.257.459"
* 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"
* whenPrepared = "2024-04-03"
* medicationReference = Reference(Medication-Rezeptur)

/*
Expand All @@ -73,7 +69,6 @@ Description: "Example of a Medication Dispense."
* performer.actor.identifier.system = $identifier-telematik-id
* performer.actor.identifier.value = "3-SMC-B-Testkarte-883110000095957"
* whenHandedOver = "2024"
* whenPrepared = "2024"
* contained[+] = SumatripanMedication
* medicationReference = Reference(SumatripanMedication)

Expand All @@ -89,7 +84,6 @@ Description: "Example of a Medication Dispense."
* performer.actor.identifier.system = $identifier-telematik-id
* performer.actor.identifier.value = "3-SMC-B-Testkarte-883110000095957"
* whenHandedOver = "2024-04"
* whenPrepared = "2024-04"
* contained[+] = SumatripanMedication
* medicationReference = Reference(SumatripanMedication)

Expand All @@ -105,7 +99,6 @@ Description: "Example of a Medication Dispense."
* performer.actor.identifier.system = $identifier-telematik-id
* performer.actor.identifier.value = "1-SMC-B-Testkarte-883110000095957"
* whenHandedOver = "2024-04-03T15:28:00+00:00"
* whenPrepared = "2024-04-03T15:28:00+00:00"
* contained[+] = SumatripanMedication
* medicationReference = Reference(SumatripanMedication)

Expand All @@ -121,7 +114,6 @@ Description: "Example of a Medication Dispense."
* performer.actor.identifier.system = $identifier-telematik-id
* performer.actor.identifier.value = "3-SMC-B-Testkarte-883110000095957"
* whenHandedOver = "2024-04-03T00:00:00.000Z"
* whenPrepared = "2024-04-03T00:00:00.000Z"
* contained[+] = SumatripanMedication
* medicationReference = Reference(SumatripanMedication)

Expand Down
Loading