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

Feat/maintenance #101

Merged
merged 5 commits into from
Dec 19, 2023
Merged

Feat/maintenance #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
072c47b
fix: Remove manual slice creation
ylboerner Dec 19, 2023
121ad97
feat: Run workflow on every PR and Branch
ylboerner Dec 19, 2023
b549069
feat: Bump CI versions
ylboerner Dec 19, 2023
cf571d2
fix: Remove unused attributes
ylboerner Dec 19, 2023
8bf7809
Commit from GitHub Actions (CI (FHIR Validation))
ylboerner Dec 19, 2023
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
6 changes: 2 additions & 4 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@ name: CI (FHIR Validation)
on:
# Triggers the workflow on push or pull request events but only for the master branch
push:
branches: [ master ]
pull_request:
branches: [ master ]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
Expand All @@ -29,7 +27,7 @@ jobs:
# Java and .NET are already installed on ubuntu-latest

- name: Firely.Terminal (GitHub Actions)
uses: FirelyTeam/firely-terminal-pipeline@v0.3.5
uses: FirelyTeam/firely-terminal-pipeline@v0.4.0
with:
PATH_TO_CONFORMANCE_RESOURCES: Resources/fsh-generated/resources/
#PATH_TO_EXAMPLES: Examples
Expand All @@ -42,7 +40,7 @@ jobs:
SIMPLIFIER_PASSWORD: ${{ secrets.SIMPLIFIER_PASSWORD }}
SUSHI_ENABLED: true
SUSHI_OPTIONS: Resources/
SUSHI_VERSION: 2.10.2
SUSHI_VERSION: 3.5.0
EXPECTED_FAILS: VALIDATION_CONFORMANCE_DOTNET VALIDATION_CONFORMANCE_JAVA VALIDATION_EXAMPLES_JAVA

- name: Add & Commit
Expand Down
18 changes: 9 additions & 9 deletions Resources/fsh-generated/resources/Medication-ExampleISiKMedikament2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,6 @@
},
"ingredient": [
{
"extension": [
{
"valueCoding": {
"system": "https://www.medizininformatik-initiative.de/fhir/core/modul-medikation/CodeSystem/wirkstofftyp",
"code": "IN"
},
"url": "https://www.medizininformatik-initiative.de/fhir/core/modul-medikation/StructureDefinition/wirkstofftyp"
}
],
"strength": {
"numerator": {
"system": "http://unitsofmeasure.org",
Expand All @@ -31,6 +22,15 @@
"code": "mL"
}
},
"extension": [
{
"url": "https://www.medizininformatik-initiative.de/fhir/core/modul-medikation/StructureDefinition/wirkstofftyp",
"valueCoding": {
"system": "https://www.medizininformatik-initiative.de/fhir/core/modul-medikation/CodeSystem/wirkstofftyp",
"code": "IN"
}
}
],
"itemCodeableConcept": {
"coding": [
{
Expand Down
100 changes: 58 additions & 42 deletions Resources/fsh-generated/resources/StructureDefinition-ISiKMedikament.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,8 +335,23 @@
"mustSupport": true
},
{
"id": "Medication.ingredient.itemCodeableConcept",
"path": "Medication.ingredient.itemCodeableConcept",
"id": "Medication.ingredient.item[x]",
"path": "Medication.ingredient.item[x]",
"slicing": {
"discriminator": [
{
"type": "type",
"path": "$this"
}
],
"ordered": false,
"rules": "open"
}
},
{
"id": "Medication.ingredient.item[x]:itemCodeableConcept",
"path": "Medication.ingredient.item[x]",
"sliceName": "itemCodeableConcept",
"short": "Bestandteil in codierter Form oder ggf. als Freitext",
"min": 0,
"max": "1",
Expand All @@ -348,8 +363,8 @@
"mustSupport": true
},
{
"id": "Medication.ingredient.itemCodeableConcept.coding",
"path": "Medication.ingredient.itemCodeableConcept.coding",
"id": "Medication.ingredient.item[x]:itemCodeableConcept.coding",
"path": "Medication.ingredient.item[x].coding",
"slicing": {
"discriminator": [
{
Expand All @@ -362,8 +377,8 @@
"mustSupport": true
},
{
"id": "Medication.ingredient.itemCodeableConcept.coding:ASK",
"path": "Medication.ingredient.itemCodeableConcept.coding",
"id": "Medication.ingredient.item[x]:itemCodeableConcept.coding:ASK",
"path": "Medication.ingredient.item[x].coding",
"sliceName": "ASK",
"min": 0,
"max": "1",
Expand All @@ -373,25 +388,25 @@
"mustSupport": true
},
{
"id": "Medication.ingredient.itemCodeableConcept.coding:ASK.system",
"path": "Medication.ingredient.itemCodeableConcept.coding.system",
"id": "Medication.ingredient.item[x]:itemCodeableConcept.coding:ASK.system",
"path": "Medication.ingredient.item[x].coding.system",
"min": 1,
"mustSupport": true
},
{
"id": "Medication.ingredient.itemCodeableConcept.coding:ASK.code",
"path": "Medication.ingredient.itemCodeableConcept.coding.code",
"id": "Medication.ingredient.item[x]:itemCodeableConcept.coding:ASK.code",
"path": "Medication.ingredient.item[x].coding.code",
"min": 1,
"mustSupport": true
},
{
"id": "Medication.ingredient.itemCodeableConcept.coding:ASK.display",
"path": "Medication.ingredient.itemCodeableConcept.coding.display",
"id": "Medication.ingredient.item[x]:itemCodeableConcept.coding:ASK.display",
"path": "Medication.ingredient.item[x].coding.display",
"mustSupport": true
},
{
"id": "Medication.ingredient.itemCodeableConcept.coding:ATC-DE",
"path": "Medication.ingredient.itemCodeableConcept.coding",
"id": "Medication.ingredient.item[x]:itemCodeableConcept.coding:ATC-DE",
"path": "Medication.ingredient.item[x].coding",
"sliceName": "ATC-DE",
"min": 0,
"max": "1",
Expand All @@ -401,25 +416,25 @@
"mustSupport": true
},
{
"id": "Medication.ingredient.itemCodeableConcept.coding:ATC-DE.system",
"path": "Medication.ingredient.itemCodeableConcept.coding.system",
"id": "Medication.ingredient.item[x]:itemCodeableConcept.coding:ATC-DE.system",
"path": "Medication.ingredient.item[x].coding.system",
"min": 1,
"mustSupport": true
},
{
"id": "Medication.ingredient.itemCodeableConcept.coding:ATC-DE.code",
"path": "Medication.ingredient.itemCodeableConcept.coding.code",
"id": "Medication.ingredient.item[x]:itemCodeableConcept.coding:ATC-DE.code",
"path": "Medication.ingredient.item[x].coding.code",
"min": 1,
"mustSupport": true
},
{
"id": "Medication.ingredient.itemCodeableConcept.coding:ATC-DE.display",
"path": "Medication.ingredient.itemCodeableConcept.coding.display",
"id": "Medication.ingredient.item[x]:itemCodeableConcept.coding:ATC-DE.display",
"path": "Medication.ingredient.item[x].coding.display",
"mustSupport": true
},
{
"id": "Medication.ingredient.itemCodeableConcept.coding:PZN",
"path": "Medication.ingredient.itemCodeableConcept.coding",
"id": "Medication.ingredient.item[x]:itemCodeableConcept.coding:PZN",
"path": "Medication.ingredient.item[x].coding",
"sliceName": "PZN",
"min": 0,
"max": "1",
Expand All @@ -429,25 +444,25 @@
"mustSupport": true
},
{
"id": "Medication.ingredient.itemCodeableConcept.coding:PZN.system",
"path": "Medication.ingredient.itemCodeableConcept.coding.system",
"id": "Medication.ingredient.item[x]:itemCodeableConcept.coding:PZN.system",
"path": "Medication.ingredient.item[x].coding.system",
"min": 1,
"mustSupport": true
},
{
"id": "Medication.ingredient.itemCodeableConcept.coding:PZN.code",
"path": "Medication.ingredient.itemCodeableConcept.coding.code",
"id": "Medication.ingredient.item[x]:itemCodeableConcept.coding:PZN.code",
"path": "Medication.ingredient.item[x].coding.code",
"min": 1,
"mustSupport": true
},
{
"id": "Medication.ingredient.itemCodeableConcept.coding:PZN.display",
"path": "Medication.ingredient.itemCodeableConcept.coding.display",
"id": "Medication.ingredient.item[x]:itemCodeableConcept.coding:PZN.display",
"path": "Medication.ingredient.item[x].coding.display",
"mustSupport": true
},
{
"id": "Medication.ingredient.itemCodeableConcept.coding:WG14",
"path": "Medication.ingredient.itemCodeableConcept.coding",
"id": "Medication.ingredient.item[x]:itemCodeableConcept.coding:WG14",
"path": "Medication.ingredient.item[x].coding",
"sliceName": "WG14",
"min": 0,
"max": "1",
Expand All @@ -457,30 +472,31 @@
"mustSupport": true
},
{
"id": "Medication.ingredient.itemCodeableConcept.coding:WG14.system",
"path": "Medication.ingredient.itemCodeableConcept.coding.system",
"id": "Medication.ingredient.item[x]:itemCodeableConcept.coding:WG14.system",
"path": "Medication.ingredient.item[x].coding.system",
"min": 1,
"mustSupport": true
},
{
"id": "Medication.ingredient.itemCodeableConcept.coding:WG14.code",
"path": "Medication.ingredient.itemCodeableConcept.coding.code",
"id": "Medication.ingredient.item[x]:itemCodeableConcept.coding:WG14.code",
"path": "Medication.ingredient.item[x].coding.code",
"min": 1,
"mustSupport": true
},
{
"id": "Medication.ingredient.itemCodeableConcept.coding:WG14.display",
"path": "Medication.ingredient.itemCodeableConcept.coding.display",
"id": "Medication.ingredient.item[x]:itemCodeableConcept.coding:WG14.display",
"path": "Medication.ingredient.item[x].coding.display",
"mustSupport": true
},
{
"id": "Medication.ingredient.itemCodeableConcept.text",
"path": "Medication.ingredient.itemCodeableConcept.text",
"id": "Medication.ingredient.item[x]:itemCodeableConcept.text",
"path": "Medication.ingredient.item[x].text",
"mustSupport": true
},
{
"id": "Medication.ingredient.itemReference",
"path": "Medication.ingredient.itemReference",
"id": "Medication.ingredient.item[x]:itemReference",
"path": "Medication.ingredient.item[x]",
"sliceName": "itemReference",
"short": "Bestandteil (Referenz auf ein anderes Medikament)",
"min": 0,
"max": "1",
Expand All @@ -496,8 +512,8 @@
"mustSupport": true
},
{
"id": "Medication.ingredient.itemReference.reference",
"path": "Medication.ingredient.itemReference.reference",
"id": "Medication.ingredient.item[x]:itemReference.reference",
"path": "Medication.ingredient.item[x].reference",
"min": 1,
"mustSupport": true
},
Expand Down
Loading