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

Dev/v2025 #87

Merged
merged 3 commits into from
Oct 21, 2024
Merged

Dev/v2025 #87

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
2641038
Updated gh action
julsas Oct 21, 2024
7e70d2c
Updated Medication ASK binding
julsas Oct 21, 2024
34ebbab
Updated references to intra-module references
julsas Oct 21, 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
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
# Java and .NET are already installed on ubuntu-latest

- name: Firely.Terminal (GitHub Actions)
uses: FirelyTeam/[email protected].1
uses: FirelyTeam/[email protected].3
with:
PATH_TO_CONFORMANCE_RESOURCES: fsh-generated/resources
PATH_TO_EXAMPLES: fsh-generated/resources
Expand Down
2 changes: 1 addition & 1 deletion fsh-generated/resources/StructureDefinition-mii-pr-medikation-medication-administration.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@
{
"code": "Reference",
"targetProfile": [
"http://hl7.org/fhir/StructureDefinition/Medication"
"https://www.medizininformatik-initiative.de/fhir/core/modul-medikation/StructureDefinition/Medication"
]
}
],
Expand Down
2 changes: 1 addition & 1 deletion fsh-generated/resources/StructureDefinition-mii-pr-medikation-medication-request.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@
{
"code": "Reference",
"targetProfile": [
"http://hl7.org/fhir/StructureDefinition/Medication"
"https://www.medizininformatik-initiative.de/fhir/core/modul-medikation/StructureDefinition/Medication"
]
}
],
Expand Down
2 changes: 1 addition & 1 deletion fsh-generated/resources/StructureDefinition-mii-pr-medikation-medication-statement.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,7 @@
{
"code": "Reference",
"targetProfile": [
"http://hl7.org/fhir/StructureDefinition/Medication"
"https://www.medizininformatik-initiative.de/fhir/core/modul-medikation/StructureDefinition/Medication"
]
}
],
Expand Down
4 changes: 2 additions & 2 deletions fsh-generated/resources/StructureDefinition-mii-pr-medikation-medication.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@
"code": "Reference",
"targetProfile": [
"http://hl7.org/fhir/StructureDefinition/Substance",
"http://hl7.org/fhir/StructureDefinition/Medication"
"https://www.medizininformatik-initiative.de/fhir/core/modul-medikation/StructureDefinition/Medication"
]
}
],
Expand Down Expand Up @@ -381,7 +381,7 @@
},
"mustSupport": true,
"binding": {
"strength": "example",
"strength": "required",
"valueSet": "http://fhir.de/ValueSet/ask"
}
},
Expand Down
4 changes: 2 additions & 2 deletions input/fsh/profiles/Profile-Medication.fsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ Description: "Dieses Profil beschreibt die Medikation, die angesetzt, geplant od
* ingredient.item[x] ^slicing.discriminator.path = "$this"
* ingredient.item[x] ^slicing.rules = #open
* ingredient.itemReference MS
* ingredient.itemReference only Reference
* ingredient.itemReference only Reference(Substance or mii-pr-medikation-medication)
* ingredient.itemCodeableConcept only CodeableConcept
* ingredient.itemCodeableConcept MS
* ingredient.itemCodeableConcept ^sliceName = "itemCodeableConcept"
Expand All @@ -90,7 +90,7 @@ Description: "Dieses Profil beschreibt die Medikation, die angesetzt, geplant od
UNII 0..* MS and
CAS 0..* MS and
SNOMED 0..* MS
* ingredient.itemCodeableConcept.coding[ASK] from $vs-ask (example)
* ingredient.itemCodeableConcept.coding[ASK] from $vs-ask (required)
* ingredient.itemCodeableConcept.coding[ASK] ^sliceName = "ASK"
* ingredient.itemCodeableConcept.coding[ASK] ^short = "Arzneistoffkatalog(ASK)-Nummer"
* ingredient.itemCodeableConcept.coding[ASK] ^patternCoding.system = "http://fhir.de/CodeSystem/ask"
Expand Down
2 changes: 1 addition & 1 deletion input/fsh/profiles/Profile-MedicationAdministration.fsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Description: "Dieses Profil beschreibt Medikamentenverabreichungen, einschließl
* medication[x] ^slicing.discriminator.path = "$this"
* medication[x] ^slicing.rules = #open
* medicationReference MS
* medicationReference only Reference
* medicationReference only Reference(mii-pr-medikation-medication)
* medicationCodeableConcept only CodeableConcept
* medicationCodeableConcept MS
* medicationCodeableConcept.coding MS
Expand Down
2 changes: 1 addition & 1 deletion input/fsh/profiles/Profile-MedicationRequest.fsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Description: "Dieses Profil beschreibt die Verordnung einer Medikation."
* medication[x] ^slicing.discriminator.path = "$this"
* medication[x] ^slicing.rules = #open
* medicationReference MS
* medicationReference only Reference
* medicationReference only Reference(mii-pr-medikation-medication)
* medicationCodeableConcept only CodeableConcept
* medicationCodeableConcept MS
* medicationCodeableConcept.coding MS
Expand Down
2 changes: 1 addition & 1 deletion input/fsh/profiles/Profile-MedicationStatement.fsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ Description: "Das MedicationStatement kann anzeigen, dass der Patient ein Medika
* medication[x] ^slicing.discriminator.path = "$this"
* medication[x] ^slicing.rules = #open
* medicationReference MS
* medicationReference only Reference
* medicationReference only Reference(mii-pr-medikation-medication)
* medicationCodeableConcept only CodeableConcept
* medicationCodeableConcept MS
* medicationCodeableConcept.coding MS
Expand Down