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

Improvements for Dispense Confirmation #83

Merged
merged 3 commits into from
Nov 5, 2024
Merged

Improvements for Dispense Confirmation #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7d4d928
display article information in dispense confirmation
florianschoffke Nov 4, 2024
357c1e9
add packaging information to medicationdispense
florianschoffke Nov 4, 2024
d469d67
improvements for xslt
florianschoffke Nov 4, 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
4 changes: 2 additions & 2 deletions Resources/fsh-generated/fsh-index.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@
"fshType": "Instance",
"fshFile": "examples/Misc/Example_MedicationDispense.fsh",
"startLine": 1,
"endLine": 10
"endLine": 13
},
{
"outputFile": "MedicationRequest-Example-Initial-Medication-Request.json",
Expand Down Expand Up @@ -413,7 +413,7 @@
"fshType": "Profile",
"fshFile": "profiles/4.2_MedicationDispense.fsh",
"startLine": 1,
"endLine": 24
"endLine": 49
},
{
"outputFile": "StructureDefinition-erp-service-request-medication-request.json",
Expand Down
4 changes: 2 additions & 2 deletions Resources/fsh-generated/fsh-index.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ CodeSystem-delivery-type-cs.json
CodeSystem-medication-request-reason-cs.json MedicationRequestReasonCS CodeSystem codesystems/MedicationRequestReasonCS.fsh 1 - 9
CodeSystem-service-request-type-cs.json ServiceRequestTypeCS CodeSystem codesystems/ServiceRequestCodeCS.fsh 1 - 8
ConceptMap-ServiceIdentifierToSubjectConceptMap.json ServiceIdentifierToSubjectConceptMap Instance conceptmaps/serviceidentifier-to-subject-conceptmap.fsh 1 - 50
MedicationDispense-UC1-Medication-Dispense.json UC1-Medication-Dispense Instance examples/Misc/Example_MedicationDispense.fsh 1 - 10
MedicationDispense-UC1-Medication-Dispense.json UC1-Medication-Dispense Instance examples/Misc/Example_MedicationDispense.fsh 1 - 13
MedicationRequest-Example-Initial-Medication-Request.json Example-Initial-Medication-Request Instance examples/Misc/Example_MedicationRequest.fsh 1 - 10
MedicationRequest-Example-Komplex-Medication-Request.json Example-Komplex-Medication-Request Instance examples/Misc/Example_MedicationRequest.fsh 12 - 21
MedicationRequest-Example-Response-Medication-Request.json Example-Response-Medication-Request Instance examples/Misc/Example_MedicationRequest.fsh 32 - 40
Expand All @@ -50,7 +50,7 @@ StructureDefinition-changed-medication-ex.json
StructureDefinition-eprescription-token-ex.json EPrescriptionTokenEX Extension extensions/EPrescriptionTokenEX.fsh 1 - 19
StructureDefinition-erp-service-request-dispense-request.json ERPServiceRequestDispenseRequest Profile profiles/3.2_Dispense_ServiceRequest.fsh 1 - 125
StructureDefinition-erp-service-request-eprescription-token.json ERPServiceRequestEPrescriptionToken Profile profiles/6.3_EPrescriptionTokenIdentifier.fsh 1 - 11
StructureDefinition-erp-service-request-medication-dispense.json ERPServiceRequestMedicationDispense Profile profiles/4.2_MedicationDispense.fsh 1 - 24
StructureDefinition-erp-service-request-medication-dispense.json ERPServiceRequestMedicationDispense Profile profiles/4.2_MedicationDispense.fsh 1 - 49
StructureDefinition-erp-service-request-medication-request.json ERPServiceRequestMedicationRequest Profile profiles/4.1_MedicationRequest.fsh 1 - 59
StructureDefinition-erp-service-request-message-container.json ERPServiceRequestMessageContainer Profile profiles/1_Bundle.fsh 1 - 13
StructureDefinition-erp-service-request-organization.json ERPServiceRequestOrganization Profile profiles/8_Organization.fsh 1 - 24
Expand Down
11 changes: 10 additions & 1 deletion ...generated/resources/Bundle-UC1-4-Alt-Delivery-Fullfilled-DispenseRequest-To-Pharmacy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,16 @@
"status": "completed",
"medicationReference": {
"reference": "Medication/Example-Initial-Medication"
}
},
"quantity": {
"value": 1,
"unit": "Packung"
},
"dosageInstruction": [
{
"text": "1-1-1-0"
}
]
}
},
{
Expand Down
11 changes: 10 additions & 1 deletion Resources/fsh-generated/resources/Bundle-UC1-4-Fullfilled-DispenseRequest-To-Pharmacy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,16 @@
"status": "completed",
"medicationReference": {
"reference": "Medication/Example-Initial-Medication"
}
},
"quantity": {
"value": 1,
"unit": "Packung"
},
"dosageInstruction": [
{
"text": "1-1-1-0"
}
]
}
},
{
Expand Down
11 changes: 10 additions & 1 deletion Resources/fsh-generated/resources/MedicationDispense-UC1-Medication-Dispense.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,14 @@
"status": "completed",
"medicationReference": {
"reference": "Medication/Example-Initial-Medication"
}
},
"quantity": {
"value": 1,
"unit": "Packung"
},
"dosageInstruction": [
{
"text": "1-1-1-0"
}
]
}
56 changes: 56 additions & 0 deletions .../fsh-generated/resources/StructureDefinition-erp-service-request-medication-dispense.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,62 @@
}
],
"mustSupport": true
},
{
"id": "MedicationDispense.quantity",
"path": "MedicationDispense.quantity",
"short": "Number of dispensed units",
"definition": "The number of units of the medication to be supplied per dispense. Usually value and unit are stated which are free text variants. If a structured code is used it must be from UnitsOfMeasure.",
"min": 1,
"mustSupport": true
},
{
"id": "MedicationDispense.quantity.value",
"path": "MedicationDispense.quantity.value",
"short": "Number dispensed",
"definition": "Number dispensed",
"min": 1,
"mustSupport": true
},
{
"id": "MedicationDispense.quantity.unit",
"path": "MedicationDispense.quantity.unit",
"short": "Requested units of the prescription",
"definition": "This is a free text field that can be used to specify the units of the prescription.",
"min": 1,
"mustSupport": true
},
{
"id": "MedicationDispense.quantity.system",
"path": "MedicationDispense.quantity.system",
"fixedUri": "http://unitsofmeasure.org"
},
{
"id": "MedicationDispense.quantity.code",
"path": "MedicationDispense.quantity.code",
"short": "Code from Unit of measure",
"definition": "If a structured code is used it must be from UnitsOfMeasure"
},
{
"id": "MedicationDispense.dosageInstruction",
"path": "MedicationDispense.dosageInstruction",
"mustSupport": true
},
{
"id": "MedicationDispense.dosageInstruction.text",
"path": "MedicationDispense.dosageInstruction.text",
"short": "Dosieranweisung",
"definition": "Dosieranweisung einer Verordnung",
"maxLength": 500,
"mustSupport": true
},
{
"id": "MedicationDispense.dosageInstruction.patientInstruction",
"path": "MedicationDispense.dosageInstruction.patientInstruction",
"short": "Gebrauchsanweisung einer Rezeptur",
"definition": "Gebrauchsanweisung einer Rezeptur",
"maxLength": 500,
"mustSupport": true
}
]
}
Expand Down
3 changes: 3 additions & 0 deletions Resources/input/fsh/examples/Misc/Example_MedicationDispense.fsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,6 @@ Description: "Example of a Medication Dispense."
* subject = Reference(Example-Patient)
* status = #completed
* medicationReference = Reference(Example-Initial-Medication)
* quantity.value = 1
* quantity.unit = "Packung"
* dosageInstruction.text = "1-1-1-0"
25 changes: 25 additions & 0 deletions Resources/input/fsh/profiles/4.2_MedicationDispense.fsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,28 @@ Description: "Medical and pharmaceutical information for the dispense informatio

* medication[x] MS
* medication[x] only Reference(KBV_PR_ERP_Medication_PZN or KBV_PR_ERP_Medication_Compounding or KBV_PR_ERP_Medication_Ingredient or KBV_PR_ERP_Medication_FreeText)

* quantity 1..1 MS
* ^short = "Number of dispensed units"
* ^definition = "The number of units of the medication to be supplied per dispense. Usually value and unit are stated which are free text variants. If a structured code is used it must be from UnitsOfMeasure."
* value 1..1 MS
* ^short = "Number dispensed"
* ^definition = "Number dispensed"
* system 0..1
* system = $UNITSOFMEASURE (exactly)
* code 0..1
* ^short = "Code from Unit of measure"
* ^definition = "If a structured code is used it must be from UnitsOfMeasure"
* unit 1..1 MS
* ^short = "Requested units of the prescription"
* ^definition = "This is a free text field that can be used to specify the units of the prescription."

* dosageInstruction MS
* text MS
* ^short = "Dosieranweisung"
* ^definition = "Dosieranweisung einer Verordnung"
* ^maxLength = 500
* patientInstruction MS
* ^short = "Gebrauchsanweisung einer Rezeptur"
* ^definition = "Gebrauchsanweisung einer Rezeptur"
* ^maxLength = 500
7 changes: 7 additions & 0 deletions Resources/xslt-stylesheets/TestFiles/4_Dispensierbestätigung/Dispensierbestätigung.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,13 @@
<value value="X234567890"/>
</identifier>
</subject>
<quantity>
<value value="1"/>
<unit value="Packung"/>
</quantity>
<dosageInstruction>
<text value="1-1-1-0"/>
</dosageInstruction>
<performer>
<actor>
<identifier>
Expand Down
Loading
Loading