From 6970e2f0e1c427cfee0491b3a736157c4f54a1ea Mon Sep 17 00:00:00 2001 From: patrick-werner Date: Thu, 28 Mar 2024 09:49:59 +0100 Subject: [PATCH] fixing build issues & updated firely pipeline & sushi version --- .github/workflows/main.yml | 4 ++-- Resources/fsh-generated/fsh-index.json | 6 +++--- Resources/fsh-generated/fsh-index.txt | 4 ++-- .../StructureDefinition-ISiKSauerstoffsaettigung.json | 8 -------- Resources/input/fsh/ISiK-Sauerstoffsaettigung.fsh | 3 +-- 5 files changed, 8 insertions(+), 17 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6efe3ea9..8f739195 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -33,7 +33,7 @@ jobs: # Java and .NET are already installed on ubuntu-latest - name: Firely.Terminal (GitHub Actions) - uses: FirelyTeam/firely-terminal-pipeline@v0.4.0 + uses: FirelyTeam/firely-terminal-pipeline@v0.4.1 with: PATH_TO_CONFORMANCE_RESOURCES: Resources/fsh-generated/resources/ #PATH_TO_EXAMPLES: Examples @@ -46,7 +46,7 @@ jobs: SIMPLIFIER_PASSWORD: ${{ secrets.SIMPLIFIER_PASSWORD }} SUSHI_ENABLED: true SUSHI_OPTIONS: Resources/ - SUSHI_VERSION: 3.5.0 + SUSHI_VERSION: 3.8.0 EXPECTED_FAILS: VALIDATION_CONFORMANCE_DOTNET VALIDATION_CONFORMANCE_JAVA VALIDATION_EXAMPLES_JAVA - name: Add & Commit diff --git a/Resources/fsh-generated/fsh-index.json b/Resources/fsh-generated/fsh-index.json index 82eef712..f1470cb3 100644 --- a/Resources/fsh-generated/fsh-index.json +++ b/Resources/fsh-generated/fsh-index.json @@ -108,8 +108,8 @@ "fshName": "ISiKSauerstoffsaettigungExample", "fshType": "Instance", "fshFile": "ISiK-Sauerstoffsaettigung.fsh", - "startLine": 29, - "endLine": 48 + "startLine": 28, + "endLine": 47 }, { "outputFile": "Observation-Ideales-Koerpergewicht.json", @@ -549,7 +549,7 @@ "fshType": "Profile", "fshFile": "ISiK-Sauerstoffsaettigung.fsh", "startLine": 1, - "endLine": 27 + "endLine": 26 }, { "outputFile": "StructureDefinition-sd-mii-icu-herzzeitvolumen.json", diff --git a/Resources/fsh-generated/fsh-index.txt b/Resources/fsh-generated/fsh-index.txt index 65c3f680..2975ab3f 100644 --- a/Resources/fsh-generated/fsh-index.txt +++ b/Resources/fsh-generated/fsh-index.txt @@ -12,7 +12,7 @@ Observation-ISiKKoerpergewichtExample.json Observation-ISiKKoerpergroesseExample.json ISiKKoerpergroesseExample Instance ISiK-Koerpergroesse.fsh 35 - 47 Observation-ISiKKoerpertemperaturExample.json ISiKKoerpertemperaturExample Instance ISiK-Koerpertemperatur.fsh 35 - 47 Observation-ISiKKopfumfangExample.json ISiKKopfumfangExample Instance ISiK-Kopfumfang.fsh 35 - 47 -Observation-ISiKSauerstoffsaettigungExample.json ISiKSauerstoffsaettigungExample Instance ISiK-Sauerstoffsaettigung.fsh 29 - 48 +Observation-ISiKSauerstoffsaettigungExample.json ISiKSauerstoffsaettigungExample Instance ISiK-Sauerstoffsaettigung.fsh 28 - 47 Observation-Ideales-Koerpergewicht.json Ideales-Koerpergewicht Instance mii-backport/SD_MII_ICU_Ideales_Koerpergewicht.fsh 15 - 26 Observation-Intrakranieller-Druck-ICP.json Intrakranieller-Druck-ICP Instance mii-backport/SD_MII_ICU_Intrakranieller_Druck_Icp.fsh 15 - 27 Observation-Koerpergewicht-Percentile-altersabhaengig.json Koerpergewicht-Percentile-altersabhaengig Instance mii-backport/SD_MII_ICU_Koerpergewicht_Percentil_Altersabhaengig.fsh 17 - 28 @@ -67,7 +67,7 @@ StructureDefinition-ISiKKoerpergewicht.json StructureDefinition-ISiKKoerpergroesse.json ISiKKoerpergroesse Profile ISiK-Koerpergroesse.fsh 1 - 27 StructureDefinition-ISiKKoerpertemperatur.json ISiKKoerpertemperatur Profile ISiK-Koerpertemperatur.fsh 1 - 27 StructureDefinition-ISiKKopfumfang.json ISiKKopfumfang Profile ISiK-Kopfumfang.fsh 1 - 27 -StructureDefinition-ISiKSauerstoffsaettigung.json ISiKSauerstoffsaettigung Profile ISiK-Sauerstoffsaettigung.fsh 1 - 27 +StructureDefinition-ISiKSauerstoffsaettigung.json ISiKSauerstoffsaettigung Profile ISiK-Sauerstoffsaettigung.fsh 1 - 26 StructureDefinition-sd-mii-icu-herzzeitvolumen.json SD_MII_ICU_Herzzeitvolumen Profile mii-backport/SD_MII_ICU_Herzzeitvolumen.fsh 1 - 11 StructureDefinition-sd-mii-icu-ideales-koerpergewicht.json SD_MII_ICU_Ideales_Koerpergewicht Profile mii-backport/SD_MII_ICU_Ideales_Koerpergewicht.fsh 1 - 13 StructureDefinition-sd-mii-icu-intrakranieller-druck-icp.json SD_MII_ICU_Intrakranieller_Druck_Icp Profile mii-backport/SD_MII_ICU_Intrakranieller_Druck_Icp.fsh 1 - 13 diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKSauerstoffsaettigung.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKSauerstoffsaettigung.json index 2cf347dd..fb6976a3 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKSauerstoffsaettigung.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKSauerstoffsaettigung.json @@ -69,14 +69,6 @@ "path": "Observation.code", "mustSupport": true }, - { - "id": "Observation.code.coding", - "path": "Observation.code.coding", - "patternCoding": { - "code": "2708-6", - "system": "http://loinc.org" - } - }, { "id": "Observation.code.coding:loinc", "path": "Observation.code.coding", diff --git a/Resources/input/fsh/ISiK-Sauerstoffsaettigung.fsh b/Resources/input/fsh/ISiK-Sauerstoffsaettigung.fsh index 59c7fa23..7b7c1228 100644 --- a/Resources/input/fsh/ISiK-Sauerstoffsaettigung.fsh +++ b/Resources/input/fsh/ISiK-Sauerstoffsaettigung.fsh @@ -7,7 +7,6 @@ Id: ISiKSauerstoffsaettigung * category[VSCat] MS * code MS * coding[loinc] MS - * coding = $loinc#2708-6 * coding[snomed] MS * subject MS * encounter MS @@ -32,7 +31,7 @@ Usage: #example * meta.profile[0] = "http://fhir.de/StructureDefinition/observation-de-vitalsign-sauerstoffsaettigung" * status = #final * category[VSCat] = $observation-category#vital-signs -* code.coding[loinc][+] = $loinc#2708-6 "Oxygen saturation in Arterial blood" +* code.coding[loinc] = $loinc#2708-6 "Oxygen saturation in Arterial blood" * code.coding[snomed] = $sct#442476006 "Arterial oxygen saturation" * code.text = "Pulsoximetrische Sauerstoffsättigung" * subject = Reference(PatientinMusterfrau)