Skip to content

Commit

Permalink
add batch information to dispense and close
Browse files Browse the repository at this point in the history
  • Loading branch information
@florianschoffke
florianschoffke committed Nov 7, 2024
1 parent 0a522d6 commit 087f6ba
Show file tree
Hide file tree
Showing 15 changed files with 75 additions and 168 deletions.
32 changes: 16 additions & 16 deletions Resources/fsh-generated/fsh-index.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,16 +156,16 @@
"fshName": "Medication-Without-Strength-Code",
"fshType": "Instance",
"fshFile": "examples/Example_Medication.fsh",
"startLine": 58,
"endLine": 75
"startLine": 68,
"endLine": 85
},
{
"outputFile": "Medication-Medication-Without-Strength-Numerator.json",
"fshName": "Medication-Without-Strength-Numerator",
"fshType": "Instance",
"fshFile": "examples/Example_Medication.fsh",
"startLine": 77,
"endLine": 95
"startLine": 87,
"endLine": 105
},
{
"outputFile": "Medication-MedicationDexpanthenol-FD.json",
Expand Down Expand Up @@ -212,24 +212,24 @@
"fshName": "SimpleMedication",
"fshType": "Instance",
"fshFile": "examples/Example_Medication.fsh",
"startLine": 50,
"endLine": 55
"startLine": 56,
"endLine": 65
},
{
"outputFile": "Medication-SumatripanMedication.json",
"fshName": "SumatripanMedication",
"fshType": "Instance",
"fshFile": "examples/Example_Medication.fsh",
"startLine": 2,
"endLine": 23
"endLine": 26
},
{
"outputFile": "MedicationDispense-Example-MedicationDispense-2.json",
"fshName": "Example-MedicationDispense-2",
"fshType": "Instance",
"fshFile": "examples/Example_MedicationDispense.fsh",
"startLine": 44,
"endLine": 56
"startLine": 41,
"endLine": 52
},
{
"outputFile": "MedicationDispense-Example-MedicationDispense-DiGA-DeepLink.json",
Expand Down Expand Up @@ -260,32 +260,32 @@
"fshName": "Example-MedicationDispense-Kombipackung",
"fshType": "Instance",
"fshFile": "examples/Example_MedicationDispense.fsh",
"startLine": 58,
"endLine": 70
"startLine": 54,
"endLine": 65
},
{
"outputFile": "MedicationDispense-Example-MedicationDispense-Rezeptur.json",
"fshName": "Example-MedicationDispense-Rezeptur",
"fshType": "Instance",
"fshFile": "examples/Example_MedicationDispense.fsh",
"startLine": 72,
"endLine": 84
"startLine": 67,
"endLine": 78
},
{
"outputFile": "MedicationDispense-Example-MedicationDispense-Without-Medication.json",
"fshName": "Example-MedicationDispense-Without-Medication",
"fshType": "Instance",
"fshFile": "examples/Example_MedicationDispense.fsh",
"startLine": 30,
"endLine": 42
"startLine": 28,
"endLine": 39
},
{
"outputFile": "MedicationDispense-Example-MedicationDispense.json",
"fshName": "Example-MedicationDispense",
"fshType": "Instance",
"fshFile": "examples/Example_MedicationDispense.fsh",
"startLine": 1,
"endLine": 13
"endLine": 12
},
{
"outputFile": "OperationDefinition-AbortOperation.json",
Expand Down
18 changes: 9 additions & 9 deletions Resources/fsh-generated/fsh-index.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,23 +18,23 @@ Medication-Augentropfen.json Augen
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 58 - 75
Medication-Medication-Without-Strength-Numerator.json Medication-Without-Strength-Numerator Instance examples/Example_Medication.fsh 77 - 95
Medication-Medication-Without-Strength-Code.json Medication-Without-Strength-Code Instance examples/Example_Medication.fsh 68 - 85
Medication-Medication-Without-Strength-Numerator.json Medication-Without-Strength-Numerator Instance examples/Example_Medication.fsh 87 - 105
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 - 56
Medication-SimpleMedication.json SimpleMedication Instance examples/Example_Medication.fsh 50 - 55
Medication-SumatripanMedication.json SumatripanMedication Instance examples/Example_Medication.fsh 2 - 23
MedicationDispense-Example-MedicationDispense-2.json Example-MedicationDispense-2 Instance examples/Example_MedicationDispense.fsh 44 - 56
Medication-SimpleMedication.json SimpleMedication Instance examples/Example_Medication.fsh 56 - 65
Medication-SumatripanMedication.json SumatripanMedication Instance examples/Example_Medication.fsh 2 - 26
MedicationDispense-Example-MedicationDispense-2.json Example-MedicationDispense-2 Instance examples/Example_MedicationDispense.fsh 41 - 52
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 58 - 70
MedicationDispense-Example-MedicationDispense-Rezeptur.json Example-MedicationDispense-Rezeptur Instance examples/Example_MedicationDispense.fsh 72 - 84
MedicationDispense-Example-MedicationDispense-Without-Medication.json Example-MedicationDispense-Without-Medication Instance examples/Example_MedicationDispense.fsh 30 - 42
MedicationDispense-Example-MedicationDispense.json Example-MedicationDispense Instance examples/Example_MedicationDispense.fsh 1 - 13
MedicationDispense-Example-MedicationDispense-Kombipackung.json Example-MedicationDispense-Kombipackung Instance examples/Example_MedicationDispense.fsh 54 - 65
MedicationDispense-Example-MedicationDispense-Rezeptur.json Example-MedicationDispense-Rezeptur Instance examples/Example_MedicationDispense.fsh 67 - 78
MedicationDispense-Example-MedicationDispense-Without-Medication.json Example-MedicationDispense-Without-Medication Instance examples/Example_MedicationDispense.fsh 28 - 39
MedicationDispense-Example-MedicationDispense.json Example-MedicationDispense Instance examples/Example_MedicationDispense.fsh 1 - 12
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: 3 additions & 0 deletions Resources/fsh-generated/resources/Medication-SimpleMedication.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,8 @@
"code": "06313728"
}
]
},
"batch": {
"lotNumber": "1234567890"
}
}
3 changes: 3 additions & 0 deletions Resources/fsh-generated/resources/Medication-SumatripanMedication.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,5 +54,8 @@
"denominator": {
"value": 1
}
},
"batch": {
"lotNumber": "1234567890"
}
}
2 changes: 1 addition & 1 deletion Resources/fsh-generated/resources/MedicationDispense-Example-MedicationDispense-2.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@
],
"whenHandedOver": "2024-04-03",
"medicationReference": {
"reference": "Medication/Medication-Without-Strength-Code"
"reference": "Medication/SimpleMedication"
}
}
3 changes: 3 additions & 0 deletions Resources/fsh-generated/resources/Parameters-ExampleCloseInputParameters.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,9 @@
"denominator": {
"value": 1
}
},
"batch": {
"lotNumber": "1234567890"
}
}
}
Expand Down
74 changes: 10 additions & 64 deletions ...enerated/resources/Parameters-ExampleCloseInputParametersMultipleMedicationDispenses.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,9 @@
"denominator": {
"value": 1
}
},
"batch": {
"lotNumber": "1234567890"
}
}
}
Expand Down Expand Up @@ -150,87 +153,30 @@
],
"whenHandedOver": "2024-04-03",
"medicationReference": {
"reference": "Medication/Medication-Without-Strength-Code"
"reference": "Medication/SimpleMedication"
}
}
},
{
"name": "medication",
"resource": {
"resourceType": "Medication",
"id": "Medication-Without-Strength-Code",
"id": "SimpleMedication",
"meta": {
"profile": [
"https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_Medication|1.4"
]
},
"ingredient": [
{
"strength": {
"numerator": {
"value": 85,
"unit": "mg",
"_system": {
"extension": [
{
"valueCode": "unknown",
"url": "http://hl7.org/fhir/StructureDefinition/data-absent-reason"
}
]
},
"_code": {
"extension": [
{
"valueCode": "unknown",
"url": "http://hl7.org/fhir/StructureDefinition/data-absent-reason"
}
]
}
},
"denominator": {
"value": 250,
"unit": "Milliliter",
"_system": {
"extension": [
{
"valueCode": "unknown",
"url": "http://hl7.org/fhir/StructureDefinition/data-absent-reason"
}
]
},
"_code": {
"extension": [
{
"valueCode": "unknown",
"url": "http://hl7.org/fhir/StructureDefinition/data-absent-reason"
}
]
}
}
},
"itemCodeableConcept": {
"coding": [
{
"code": "L01DB01",
"system": "http://fhir.de/CodeSystem/bfarm/atc",
"display": "Doxorubicin"
}
]
},
"isActive": true
}
],
"code": {
"text": "Infusion bestehend aus 85mg Doxorubicin aufgeloest zur Verabreichung in 250ml 5-%iger (50 mg/ml) Glucose-Infusionsloesung"
},
"form": {
"coding": [
{
"code": "11210000",
"system": "http://standardterms.edqm.eu",
"display": "Solution for infusion"
"system": "http://fhir.de/CodeSystem/ifa/pzn",
"code": "06313728"
}
]
},
"batch": {
"lotNumber": "1234567890"
}
}
}
Expand Down
3 changes: 3 additions & 0 deletions Resources/fsh-generated/resources/Parameters-ExampleDispenseInputParameters.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,9 @@
"denominator": {
"value": 1
}
},
"batch": {
"lotNumber": "1234567890"
}
}
}
Expand Down
74 changes: 10 additions & 64 deletions ...rated/resources/Parameters-ExampleDispenseInputParametersMultipleMedicationDispenses.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,9 @@
"denominator": {
"value": 1
}
},
"batch": {
"lotNumber": "1234567890"
}
}
}
Expand Down Expand Up @@ -150,87 +153,30 @@
],
"whenHandedOver": "2024-04-03",
"medicationReference": {
"reference": "Medication/Medication-Without-Strength-Code"
"reference": "Medication/SimpleMedication"
}
}
},
{
"name": "medication",
"resource": {
"resourceType": "Medication",
"id": "Medication-Without-Strength-Code",
"id": "SimpleMedication",
"meta": {
"profile": [
"https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_Medication|1.4"
]
},
"ingredient": [
{
"strength": {
"numerator": {
"value": 85,
"unit": "mg",
"_system": {
"extension": [
{
"valueCode": "unknown",
"url": "http://hl7.org/fhir/StructureDefinition/data-absent-reason"
}
]
},
"_code": {
"extension": [
{
"valueCode": "unknown",
"url": "http://hl7.org/fhir/StructureDefinition/data-absent-reason"
}
]
}
},
"denominator": {
"value": 250,
"unit": "Milliliter",
"_system": {
"extension": [
{
"valueCode": "unknown",
"url": "http://hl7.org/fhir/StructureDefinition/data-absent-reason"
}
]
},
"_code": {
"extension": [
{
"valueCode": "unknown",
"url": "http://hl7.org/fhir/StructureDefinition/data-absent-reason"
}
]
}
}
},
"itemCodeableConcept": {
"coding": [
{
"code": "L01DB01",
"system": "http://fhir.de/CodeSystem/bfarm/atc",
"display": "Doxorubicin"
}
]
},
"isActive": true
}
],
"code": {
"text": "Infusion bestehend aus 85mg Doxorubicin aufgeloest zur Verabreichung in 250ml 5-%iger (50 mg/ml) Glucose-Infusionsloesung"
},
"form": {
"coding": [
{
"code": "11210000",
"system": "http://standardterms.edqm.eu",
"display": "Solution for infusion"
"system": "http://fhir.de/CodeSystem/ifa/pzn",
"code": "06313728"
}
]
},
"batch": {
"lotNumber": "1234567890"
}
}
}
Expand Down
3 changes: 3 additions & 0 deletions Resources/fsh-generated/resources/Parameters-ExampleDispenseOutputParametersSuccess.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,9 @@
"denominator": {
"value": 1
}
},
"batch": {
"lotNumber": "1234567890"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion Resources/input/fsh/examples/Example_Communication_InfoReq.fsh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Usage: #example
* contained[+] = SumatripanMedication
* basedOn.reference = "Task/160.000.033.491.280.78"
* status = #unknown
* about = Reference(SumatripanMedication)
* about = Reference(SumatripanMedication) //ACHTUNG: wenn das wieder aktiviert wird muss eine Medication ohne ChargenNUmmer verwendet werden
* recipient[+].identifier.system = $identifier-telematik-id
* recipient[=].identifier.value = "3-SMC-B-Testkarte-883110000123465"
* sender.identifier.system = $identifier-kvid-10
Expand Down
Loading

0 comments on commit 087f6ba

Please sign in to comment.