From f791e2eae6f570d32e5dc4bcf427593fb5717306 Mon Sep 17 00:00:00 2001 From: Patrick Werner Date: Wed, 13 Nov 2024 10:18:02 +0100 Subject: [PATCH 1/8] =?UTF-8?q?-=20fix:=20EKG=20Profil=20VS=20binding=20au?= =?UTF-8?q?f=20SCT=20ge=C3=A4ndert=20(LOINC=20Codes=20waren=20Part=20Codes?= =?UTF-8?q?)=20-=20fix:=20EKG.code=20zu=20SnomedCT=20ge=C3=A4ndert=20(war?= =?UTF-8?q?=20Loinc=20part=20code)=20-=20EKG=20Profil=20aus=20den=20dt.=20?= =?UTF-8?q?Basisprofilen=20integriert=20da=20keine=20TC=20f=C3=BCr=201.4.0?= =?UTF-8?q?=20verf=C3=BCgbar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/fsh-generated/fsh-index.json | 16 +++- Resources/fsh-generated/fsh-index.txt | 7 +- .../resources/Observation-ISiKEkgExample.json | 16 ++-- .../StructureDefinition-ISiKEkg.json | 47 ++++++++++- .../resources/ValueSet-EkgAbleitungenVS.json | 78 +++++++++++++++++++ Resources/input/fsh/ISiK-Ekg.fsh | 49 ++++++++++-- fhirpkg.lock.json | 16 ++-- 7 files changed, 198 insertions(+), 31 deletions(-) create mode 100644 Resources/fsh-generated/resources/ValueSet-EkgAbleitungenVS.json diff --git a/Resources/fsh-generated/fsh-index.json b/Resources/fsh-generated/fsh-index.json index dc789460..bf46c568 100644 --- a/Resources/fsh-generated/fsh-index.json +++ b/Resources/fsh-generated/fsh-index.json @@ -36,8 +36,8 @@ "fshName": "ISiKEkgExample", "fshType": "Instance", "fshFile": "ISiK-Ekg.fsh", - "startLine": 21, - "endLine": 45 + "startLine": 38, + "endLine": 62 }, { "outputFile": "Observation-ISiKGCSExample.json", @@ -124,8 +124,8 @@ "fshName": "ISiKEkg", "fshType": "Profile", "fshFile": "ISiK-Ekg.fsh", - "startLine": 1, - "endLine": 19 + "startLine": 17, + "endLine": 36 }, { "outputFile": "StructureDefinition-ISiKGCS.json", @@ -182,5 +182,13 @@ "fshFile": "ISiK-Sauerstoffsaettigung.fsh", "startLine": 1, "endLine": 17 + }, + { + "outputFile": "ValueSet-EkgAbleitungenVS.json", + "fshName": "EkgAbleitungenVS", + "fshType": "ValueSet", + "fshFile": "ISiK-Ekg.fsh", + "startLine": 64, + "endLine": 82 } ] diff --git a/Resources/fsh-generated/fsh-index.txt b/Resources/fsh-generated/fsh-index.txt index 091e6a89..f59714a6 100644 --- a/Resources/fsh-generated/fsh-index.txt +++ b/Resources/fsh-generated/fsh-index.txt @@ -3,7 +3,7 @@ CapabilityStatement-ISiK-capabilityStatement-vitalparameter-server.json ISiK-ca Device-ExampleDevice.json ExampleDevice Instance instances.fsh 14 - 17 Observation-ISiKAtemfrequenzExample.json ISiKAtemfrequenzExample Instance ISiK-Atemfrequenz.fsh 19 - 30 Observation-ISiKBlutdruckExample.json ISiKBlutdruckExample Instance ISiK-Blutdruck.fsh 27 - 44 -Observation-ISiKEkgExample.json ISiKEkgExample Instance ISiK-Ekg.fsh 21 - 45 +Observation-ISiKEkgExample.json ISiKEkgExample Instance ISiK-Ekg.fsh 38 - 62 Observation-ISiKGCSExample.json ISiKGCSExample Instance ISiK-GCS.fsh 25 - 39 Observation-ISiKHerzfrequenzExample.json ISiKHerzfrequenzExample Instance ISiK-Herzfrequenz.fsh 19 - 30 Observation-ISiKKoerpergewichtExample.json ISiKKoerpergewichtExample Instance ISiK-Koerpergewicht.fsh 19 - 31 @@ -14,11 +14,12 @@ Observation-ISiKSauerstoffsaettigungExample.json ISiKSau Patient-PatientinMusterfrau.json PatientinMusterfrau Instance instances.fsh 1 - 12 StructureDefinition-ISiKAtemfrequenz.json ISiKAtemfrequenz Profile ISiK-Atemfrequenz.fsh 1 - 17 StructureDefinition-ISiKBlutdruck.json ISiKBlutdruck Profile ISiK-Blutdruck.fsh 1 - 25 -StructureDefinition-ISiKEkg.json ISiKEkg Profile ISiK-Ekg.fsh 1 - 19 +StructureDefinition-ISiKEkg.json ISiKEkg Profile ISiK-Ekg.fsh 17 - 36 StructureDefinition-ISiKGCS.json ISiKGCS Profile ISiK-GCS.fsh 1 - 23 StructureDefinition-ISiKHerzfrequenz.json ISiKHerzfrequenz Profile ISiK-Herzfrequenz.fsh 1 - 17 StructureDefinition-ISiKKoerpergewicht.json ISiKKoerpergewicht Profile ISiK-Koerpergewicht.fsh 1 - 17 StructureDefinition-ISiKKoerpergroesse.json ISiKKoerpergroesse Profile ISiK-Koerpergroesse.fsh 1 - 17 StructureDefinition-ISiKKoerpertemperatur.json ISiKKoerpertemperatur Profile ISiK-Koerpertemperatur.fsh 1 - 17 StructureDefinition-ISiKKopfumfang.json ISiKKopfumfang Profile ISiK-Kopfumfang.fsh 1 - 17 -StructureDefinition-ISiKSauerstoffsaettigung.json ISiKSauerstoffsaettigung Profile ISiK-Sauerstoffsaettigung.fsh 1 - 17 \ No newline at end of file +StructureDefinition-ISiKSauerstoffsaettigung.json ISiKSauerstoffsaettigung Profile ISiK-Sauerstoffsaettigung.fsh 1 - 17 +ValueSet-EkgAbleitungenVS.json EkgAbleitungenVS ValueSet ISiK-Ekg.fsh 64 - 82 \ No newline at end of file diff --git a/Resources/fsh-generated/resources/Observation-ISiKEkgExample.json b/Resources/fsh-generated/resources/Observation-ISiKEkgExample.json index 590d779e..584fe0fa 100644 --- a/Resources/fsh-generated/resources/Observation-ISiKEkgExample.json +++ b/Resources/fsh-generated/resources/Observation-ISiKEkgExample.json @@ -10,9 +10,9 @@ "code": { "coding": [ { - "system": "http://loinc.org", "code": "LP6244-0", - "display": "Electrocardiogram (EKG)" + "system": "http://loinc.org", + "display": "EKG study" } ] }, @@ -39,8 +39,8 @@ "code": { "coding": [ { - "code": "LP7386-8", - "system": "http://loinc.org", + "code": "272729005", + "system": "http://snomed.info/sct", "display": "Lead I" } ] @@ -58,8 +58,8 @@ "code": { "coding": [ { - "code": "LP7386-6", - "system": "http://loinc.org", + "code": "272730000", + "system": "http://snomed.info/sct", "display": "Lead II" } ] @@ -77,8 +77,8 @@ "code": { "coding": [ { - "code": "LP7386-4", - "system": "http://loinc.org", + "code": "272731001", + "system": "http://snomed.info/sct", "display": "Lead III" } ] diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKEkg.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKEkg.json index 2b4240f7..59b1ebde 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKEkg.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKEkg.json @@ -12,7 +12,7 @@ "kind": "resource", "abstract": false, "type": "Observation", - "baseDefinition": "http://fhir.de/StructureDefinition/observation-de-ekg", + "baseDefinition": "http://hl7.org/fhir/StructureDefinition/Observation", "derivation": "constraint", "differential": { "element": [ @@ -24,16 +24,34 @@ { "id": "Observation.category", "path": "Observation.category", + "min": 1, "mustSupport": true }, + { + "id": "Observation.category.coding", + "path": "Observation.category.coding", + "patternCoding": { + "code": "procedure", + "system": "http://terminology.hl7.org/CodeSystem/observation-category" + } + }, { "id": "Observation.code", "path": "Observation.code", + "patternCodeableConcept": { + "coding": [ + { + "code": "11524-6", + "system": "http://loinc.org" + } + ] + }, "mustSupport": true }, { "id": "Observation.subject", "path": "Observation.subject", + "min": 1, "mustSupport": true }, { @@ -44,26 +62,50 @@ { "id": "Observation.effective[x]", "path": "Observation.effective[x]", + "min": 1, "mustSupport": true }, + { + "id": "Observation.value[x]", + "path": "Observation.value[x]", + "max": "0" + }, { "id": "Observation.device", "path": "Observation.device", + "min": 1, "mustSupport": true }, { "id": "Observation.component", "path": "Observation.component", + "min": 1, "mustSupport": true }, { "id": "Observation.component.code", "path": "Observation.component.code", - "mustSupport": true + "mustSupport": true, + "binding": { + "strength": "extensible", + "valueSet": "https://gematik.de/fhir/isik/v3/VitalparameterUndKoerpermasze/ValueSet/EkgAbleitungenVS", + "description": "Codes identifying the EKG lead" + } + }, + { + "id": "Observation.component.code.coding", + "path": "Observation.component.code.coding", + "min": 1 }, { "id": "Observation.component.value[x]", "path": "Observation.component.value[x]", + "min": 1, + "type": [ + { + "code": "SampledData" + } + ], "mustSupport": true }, { @@ -84,6 +126,7 @@ { "id": "Observation.component.value[x].data", "path": "Observation.component.value[x].data", + "min": 1, "mustSupport": true } ] diff --git a/Resources/fsh-generated/resources/ValueSet-EkgAbleitungenVS.json b/Resources/fsh-generated/resources/ValueSet-EkgAbleitungenVS.json new file mode 100644 index 00000000..a23f3f61 --- /dev/null +++ b/Resources/fsh-generated/resources/ValueSet-EkgAbleitungenVS.json @@ -0,0 +1,78 @@ +{ + "resourceType": "ValueSet", + "status": "active", + "name": "EkgAbleitungenVS", + "id": "EkgAbleitungenVS", + "title": "SNOMED CT codes der EKG Ableitungen", + "description": "ValueSet mit den SNOMED CT codes der EKG Ableitungen", + "version": "3.0.3", + "url": "https://gematik.de/fhir/isik/v3/VitalparameterUndKoerpermasze/ValueSet/EkgAbleitungenVS", + "experimental": false, + "publisher": "gematik GmbH", + "date": "2024-05-08", + "compose": { + "include": [ + { + "system": "http://snomed.info/sct", + "concept": [ + { + "code": "257472005", + "display": "aVF" + }, + { + "code": "257473000", + "display": "aVL" + }, + { + "code": "257474006", + "display": "aVR" + }, + { + "code": "285658004", + "display": "CM5" + }, + { + "code": "272728002", + "display": "ECG lead site" + }, + { + "code": "272729005", + "display": "Lead I" + }, + { + "code": "272730000", + "display": "Lead II" + }, + { + "code": "272731001", + "display": "Lead III" + }, + { + "code": "257475007", + "display": "Lead site V1" + }, + { + "code": "257476008", + "display": "Lead site V2" + }, + { + "code": "257477004", + "display": "Lead site V3" + }, + { + "code": "257478009", + "display": "Lead site V4" + }, + { + "code": "257479001", + "display": "Lead site V5" + }, + { + "code": "257480003", + "display": "Lead site V6" + } + ] + } + ] + } +} diff --git a/Resources/input/fsh/ISiK-Ekg.fsh b/Resources/input/fsh/ISiK-Ekg.fsh index 89a8cf9f..a01005bd 100644 --- a/Resources/input/fsh/ISiK-Ekg.fsh +++ b/Resources/input/fsh/ISiK-Ekg.fsh @@ -1,6 +1,23 @@ +RuleSet: EKGDE +* category 1.. +* category.coding = $observation-category#procedure +* code = $loinc#11524-6 // EKG study +* subject 1.. +* effective[x] 1.. +* value[x] ..0 +* device 1.. +* component 1.. +* component.code from EkgAbleitungenVS (extensible) +* component.code ^binding.description = "Codes identifying the EKG lead" +* component.code.coding 1.. +* component.value[x] 1.. +* component.value[x] only SampledData +* component.value[x].data 1.. + Profile: ISiKEkg -Parent: http://fhir.de/StructureDefinition/observation-de-ekg +Parent: Observation Id: ISiKEkg +* insert EKGDE * insert Meta * status MS * category MS @@ -27,19 +44,39 @@ Usage: #example * category = $observation-category#procedure * device = Reference(ExampleDevice) * effectiveDateTime = "2019-07-02" -* code.coding[0] = $loinc#LP6244-0 "Electrocardiogram (EKG)" -* component[0].code.coding[0] = $loinc#LP7386-8 "Lead I" +* code.coding[0] = $loinc#LP6244-0 "EKG study" +* component[0].code.coding[0] = $sct#272729005 "Lead I" * component[=].valueSampledData.origin.value = 2048 * component[=].valueSampledData.period = 10 * component[=].valueSampledData.dimensions = 1 * component[=].valueSampledData.data = "2041 2043 2037 2047 2060 2062 2051 2023 2014 2027 2034 2033 2040 2047 2047 2053 2058 2064 2059 2063 2061 2052 2053 2038 1966 1885 1884 2009 2129 2166 2137 2102 2086 2077 2067 2067 2060 2059 2062 2062 2060 2057 2045 2047 2057 2054 2042 2029 2027 2018 2007 1995 2001 2012 2024 2039 2068 2092 2111 2125 2131 2148 2137 2138 2128 2128 2115 2099 2097 2096 2101 2101 2091 2073 2076 2077 2084 2081 2088 2092 2070 2069 2074 2077 2075 2068 2064 2060 2062 2074 2075 2074 2075 2063 2058 2058 2064 2064 2070 2074 2067 2060 2062 2063 2061 2059 2048 2052 2049 2048 2051 2059 2059 2066 2077 2073" -* component[+].code.coding[0] = $loinc#LP7386-6 "Lead II" +* component[+].code.coding[0] = $sct#272730000 "Lead II" * component[=].valueSampledData.origin.value = 2048 * component[=].valueSampledData.period = 10 * component[=].valueSampledData.dimensions = 1 * component[=].valueSampledData.data = "2041 2043 2037 2047 2060 2062 2051 2023 2014 2027 2034 2033 2040 2047 2047 2053 2058 2064 2059 2063 2061 2052 2053 2038 1966 1885 1884 2009 2129 2166 2137 2102 2086 2077 2067 2067 2060 2059 2062 2062 2060 2057 2045 2047 2057 2054 2042 2029 2027 2018 2007 1995 2001 2012 2024 2039 2068 2092 2111 2125 2131 2148 2137 2138 2128 2128 2115 2099 2097 2096 2101 2101 2091 2073 2076 2077 2084 2081 2088 2092 2070 2069 2074 2077 2075 2068 2064 2060 2062 2074 2075 2074 2075 2063 2058 2058 2064 2064 2070 2074 2067 2060 2062 2063 2061 2059 2048 2052 2049 2048 2051 2059 2059 2066 2077 2073" -* component[+].code.coding[0] = $loinc#LP7386-4 "Lead III" +* component[+].code.coding[0] = $sct#272731001 "Lead III" * component[=].valueSampledData.origin.value = 2048 * component[=].valueSampledData.period = 10 * component[=].valueSampledData.dimensions = 1 -* component[=].valueSampledData.data = "2041 2043 2037 2047 2060 2062 2051 2023 2014 2027 2034 2033 2040 2047 2047 2053 2058 2064 2059 2063 2061 2052 2053 2038 1966 1885 1884 2009 2129 2166 2137 2102 2086 2077 2067 2067 2060 2059 2062 2062 2060 2057 2045 2047 2057 2054 2042 2029 2027 2018 2007 1995 2001 2012 2024 2039 2068 2092 2111 2125 2131 2148 2137 2138 2128 2128 2115 2099 2097 2096 2101 2101 2091 2073 2076 2077 2084 2081 2088 2092 2070 2069 2074 2077 2075 2068 2064 2060 2062 2074 2075 2074 2075 2063 2058 2058 2064 2064 2070 2074 2067 2060 2062 2063 2061 2059 2048 2052 2049 2048 2051 2059 2059 2066 2077 2073" \ No newline at end of file +* component[=].valueSampledData.data = "2041 2043 2037 2047 2060 2062 2051 2023 2014 2027 2034 2033 2040 2047 2047 2053 2058 2064 2059 2063 2061 2052 2053 2038 1966 1885 1884 2009 2129 2166 2137 2102 2086 2077 2067 2067 2060 2059 2062 2062 2060 2057 2045 2047 2057 2054 2042 2029 2027 2018 2007 1995 2001 2012 2024 2039 2068 2092 2111 2125 2131 2148 2137 2138 2128 2128 2115 2099 2097 2096 2101 2101 2091 2073 2076 2077 2084 2081 2088 2092 2070 2069 2074 2077 2075 2068 2064 2060 2062 2074 2075 2074 2075 2063 2058 2058 2064 2064 2070 2074 2067 2060 2062 2063 2061 2059 2048 2052 2049 2048 2051 2059 2059 2066 2077 2073" + +ValueSet: EkgAbleitungenVS +Id: EkgAbleitungenVS +Title: "SNOMED CT codes der EKG Ableitungen" +Description: "ValueSet mit den SNOMED CT codes der EKG Ableitungen" +* insert Meta +* $sct#257472005 "aVF" +* $sct#257473000 "aVL" +* $sct#257474006 "aVR" +* $sct#285658004 "CM5" +* $sct#272728002 "ECG lead site" +* $sct#272729005 "Lead I" +* $sct#272730000 "Lead II" +* $sct#272731001 "Lead III" +* $sct#257475007 "Lead site V1" +* $sct#257476008 "Lead site V2" +* $sct#257477004 "Lead site V3" +* $sct#257478009 "Lead site V4" +* $sct#257479001 "Lead site V5" +* $sct#257480003 "Lead site V6" \ No newline at end of file diff --git a/fhirpkg.lock.json b/fhirpkg.lock.json index cf02d46f..5f229197 100644 --- a/fhirpkg.lock.json +++ b/fhirpkg.lock.json @@ -1,9 +1,9 @@ -{ - "updated": "2024-03-20T16:32:26.8792493+01:00", - "dependencies": { - "de.basisprofil.r4": "1.4.0", - "hl7.fhir.r4.core": "4.0.1", - "de.gematik.isik-basismodul": "3.0.4" - }, - "missing": {} +{ + "updated": "2024-11-13T09:41:45.577727+01:00", + "dependencies": { + "de.basisprofil.r4": "1.4.0", + "hl7.fhir.r4.core": "4.0.1", + "de.gematik.isik-basismodul": "3.0.5" + }, + "missing": {} } From 214d82b64db3499dcda601f540fa782875a86b71 Mon Sep 17 00:00:00 2001 From: patrick-werner Date: Wed, 13 Nov 2024 09:20:37 +0000 Subject: [PATCH 2/8] auto-generated FHIR files by GitHub Actions (CI FSH to FHIR Validation) --- .../fsh-generated/resources/ValueSet-EkgAbleitungenVS.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/fsh-generated/resources/ValueSet-EkgAbleitungenVS.json b/Resources/fsh-generated/resources/ValueSet-EkgAbleitungenVS.json index a23f3f61..c36e38a7 100644 --- a/Resources/fsh-generated/resources/ValueSet-EkgAbleitungenVS.json +++ b/Resources/fsh-generated/resources/ValueSet-EkgAbleitungenVS.json @@ -5,9 +5,9 @@ "id": "EkgAbleitungenVS", "title": "SNOMED CT codes der EKG Ableitungen", "description": "ValueSet mit den SNOMED CT codes der EKG Ableitungen", - "version": "3.0.3", "url": "https://gematik.de/fhir/isik/v3/VitalparameterUndKoerpermasze/ValueSet/EkgAbleitungenVS", "experimental": false, + "version": "3.0.3", "publisher": "gematik GmbH", "date": "2024-05-08", "compose": { From 45178a243a411b5cdfd2aba5da5d29ee3ab41c05 Mon Sep 17 00:00:00 2001 From: patrick-werner Date: Wed, 13 Nov 2024 09:27:56 +0000 Subject: [PATCH 3/8] auto-generated file update of TC version by GitHub Actions --- ImplementationGuide/markdown/Einfuehrung.md | 4 ++-- Resources/input/fsh/ruleset.fsh | 10 +++++----- package.json | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ImplementationGuide/markdown/Einfuehrung.md b/ImplementationGuide/markdown/Einfuehrung.md index 6a86b807..dd40284f 100644 --- a/ImplementationGuide/markdown/Einfuehrung.md +++ b/ImplementationGuide/markdown/Einfuehrung.md @@ -1,9 +1,9 @@ gematik logo ---- -Version: 3.0.3 +Version: 3.0.4 -Datum: 08.05.2024 +Datum: 13.11.2024 Status: Aktiv diff --git a/Resources/input/fsh/ruleset.fsh b/Resources/input/fsh/ruleset.fsh index 1d2ef20f..fe9199d2 100644 --- a/Resources/input/fsh/ruleset.fsh +++ b/Resources/input/fsh/ruleset.fsh @@ -1,15 +1,15 @@ RuleSet: Meta * ^status = #active * ^experimental = false -* ^version = "3.0.3" +* ^version = "3.0.4" * ^publisher = "gematik GmbH" -* ^date = "2024-05-08" +* ^date = "2024-11-13" RuleSet: Meta-CapabilityStatement * status = #active * experimental = false -* version = "3.0.3" +* version = "3.0.4" * publisher = "gematik GmbH" -* date = "2024-05-08" -* implementationGuide = "https://gematik.de/fhir/isik/v3/VitalparameterUndKoerpermasze/ImplementationGuide|3.0.3" +* date = "2024-11-13" +* implementationGuide = "https://gematik.de/fhir/isik/v3/VitalparameterUndKoerpermasze/ImplementationGuide|3.0.4" * url = "https://gematik.de/fhir/isik/v3/VitalparameterUndKoerpermasze/CapabilityStatement/vitalparameter-server" \ No newline at end of file diff --git a/package.json b/package.json index cdaba71f..78db73ae 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "de.gematik.isik-vitalparameter", - "version": "3.0.3", + "version": "3.0.4", "description": "Package Release des ISiK Modul Vitalparameter und Körpermaße", "fhirVersions": [ "4.0.1" From 18f96afb298197ff7432cf0876fdcc3395483c5c Mon Sep 17 00:00:00 2001 From: nikohl-de Date: Wed, 20 Nov 2024 10:10:31 +0000 Subject: [PATCH 4/8] auto-generated file update of TC version by GitHub Actions --- ImplementationGuide/markdown/Einfuehrung.md | 2 +- Resources/input/fsh/ruleset.fsh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ImplementationGuide/markdown/Einfuehrung.md b/ImplementationGuide/markdown/Einfuehrung.md index dd40284f..245cdfd8 100644 --- a/ImplementationGuide/markdown/Einfuehrung.md +++ b/ImplementationGuide/markdown/Einfuehrung.md @@ -3,7 +3,7 @@ ---- Version: 3.0.4 -Datum: 13.11.2024 +Datum: 20.11.2024 Status: Aktiv diff --git a/Resources/input/fsh/ruleset.fsh b/Resources/input/fsh/ruleset.fsh index fe9199d2..5384add1 100644 --- a/Resources/input/fsh/ruleset.fsh +++ b/Resources/input/fsh/ruleset.fsh @@ -3,13 +3,13 @@ RuleSet: Meta * ^experimental = false * ^version = "3.0.4" * ^publisher = "gematik GmbH" -* ^date = "2024-11-13" +* ^date = "2024-11-20" RuleSet: Meta-CapabilityStatement * status = #active * experimental = false * version = "3.0.4" * publisher = "gematik GmbH" -* date = "2024-11-13" +* date = "2024-11-20" * implementationGuide = "https://gematik.de/fhir/isik/v3/VitalparameterUndKoerpermasze/ImplementationGuide|3.0.4" * url = "https://gematik.de/fhir/isik/v3/VitalparameterUndKoerpermasze/CapabilityStatement/vitalparameter-server" \ No newline at end of file From b6728698a270abe5160e642df21ff6c98c22153c Mon Sep 17 00:00:00 2001 From: nikohl-de Date: Wed, 20 Nov 2024 10:40:34 +0000 Subject: [PATCH 5/8] auto-generated FHIR files by GitHub Actions (CI FSH to FHIR Validation) --- ...ment-ISiK-capabilityStatement-vitalparameter-server.json | 6 +++--- .../resources/StructureDefinition-ISiKAtemfrequenz.json | 4 ++-- .../resources/StructureDefinition-ISiKBlutdruck.json | 4 ++-- .../resources/StructureDefinition-ISiKEkg.json | 4 ++-- .../resources/StructureDefinition-ISiKGCS.json | 4 ++-- .../resources/StructureDefinition-ISiKHerzfrequenz.json | 4 ++-- .../resources/StructureDefinition-ISiKKoerpergewicht.json | 4 ++-- .../resources/StructureDefinition-ISiKKoerpergroesse.json | 4 ++-- .../StructureDefinition-ISiKKoerpertemperatur.json | 4 ++-- .../resources/StructureDefinition-ISiKKopfumfang.json | 4 ++-- .../StructureDefinition-ISiKSauerstoffsaettigung.json | 4 ++-- .../fsh-generated/resources/ValueSet-EkgAbleitungenVS.json | 4 ++-- 12 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Resources/fsh-generated/resources/CapabilityStatement-ISiK-capabilityStatement-vitalparameter-server.json b/Resources/fsh-generated/resources/CapabilityStatement-ISiK-capabilityStatement-vitalparameter-server.json index 00cfab0e..bf6ca1da 100644 --- a/Resources/fsh-generated/resources/CapabilityStatement-ISiK-capabilityStatement-vitalparameter-server.json +++ b/Resources/fsh-generated/resources/CapabilityStatement-ISiK-capabilityStatement-vitalparameter-server.json @@ -4,11 +4,11 @@ "url": "https://gematik.de/fhir/isik/v3/VitalparameterUndKoerpermasze/CapabilityStatement/vitalparameter-server", "status": "active", "experimental": false, - "version": "3.0.3", + "version": "3.0.4", "publisher": "gematik GmbH", - "date": "2024-05-08", + "date": "2024-11-20", "implementationGuide": [ - "https://gematik.de/fhir/isik/v3/VitalparameterUndKoerpermasze/ImplementationGuide|3.0.3" + "https://gematik.de/fhir/isik/v3/VitalparameterUndKoerpermasze/ImplementationGuide|3.0.4" ], "name": "ISiKCapabilityStatementVitalparameterServer", "title": "ISiK CapabilityStatement Vitalparameter Server", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKAtemfrequenz.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKAtemfrequenz.json index e6819cdc..e79a924a 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKAtemfrequenz.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKAtemfrequenz.json @@ -2,11 +2,11 @@ "resourceType": "StructureDefinition", "id": "ISiKAtemfrequenz", "url": "https://gematik.de/fhir/isik/v3/VitalparameterUndKoerpermasze/StructureDefinition/ISiKAtemfrequenz", - "version": "3.0.3", + "version": "3.0.4", "name": "ISiKAtemfrequenz", "status": "active", "experimental": false, - "date": "2024-05-08", + "date": "2024-11-20", "publisher": "gematik GmbH", "fhirVersion": "4.0.1", "kind": "resource", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKBlutdruck.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKBlutdruck.json index f4e3abbb..9de189ed 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKBlutdruck.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKBlutdruck.json @@ -2,11 +2,11 @@ "resourceType": "StructureDefinition", "id": "ISiKBlutdruck", "url": "https://gematik.de/fhir/isik/v3/VitalparameterUndKoerpermasze/StructureDefinition/ISiKBlutdruck", - "version": "3.0.3", + "version": "3.0.4", "name": "ISiKBlutdruck", "status": "active", "experimental": false, - "date": "2024-05-08", + "date": "2024-11-20", "publisher": "gematik GmbH", "fhirVersion": "4.0.1", "kind": "resource", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKEkg.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKEkg.json index 59b1ebde..0b2d525d 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKEkg.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKEkg.json @@ -2,11 +2,11 @@ "resourceType": "StructureDefinition", "id": "ISiKEkg", "url": "https://gematik.de/fhir/isik/v3/VitalparameterUndKoerpermasze/StructureDefinition/ISiKEkg", - "version": "3.0.3", + "version": "3.0.4", "name": "ISiKEkg", "status": "active", "experimental": false, - "date": "2024-05-08", + "date": "2024-11-20", "publisher": "gematik GmbH", "fhirVersion": "4.0.1", "kind": "resource", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKGCS.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKGCS.json index 63ea0257..c32e0030 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKGCS.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKGCS.json @@ -2,11 +2,11 @@ "resourceType": "StructureDefinition", "id": "ISiKGCS", "url": "https://gematik.de/fhir/isik/v3/VitalparameterUndKoerpermasze/StructureDefinition/ISiKGCS", - "version": "3.0.3", + "version": "3.0.4", "name": "ISiKGCS", "status": "active", "experimental": false, - "date": "2024-05-08", + "date": "2024-11-20", "publisher": "gematik GmbH", "fhirVersion": "4.0.1", "kind": "resource", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKHerzfrequenz.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKHerzfrequenz.json index 36116dc4..4d9d9eb1 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKHerzfrequenz.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKHerzfrequenz.json @@ -2,11 +2,11 @@ "resourceType": "StructureDefinition", "id": "ISiKHerzfrequenz", "url": "https://gematik.de/fhir/isik/v3/VitalparameterUndKoerpermasze/StructureDefinition/ISiKHerzfrequenz", - "version": "3.0.3", + "version": "3.0.4", "name": "ISiKHerzfrequenz", "status": "active", "experimental": false, - "date": "2024-05-08", + "date": "2024-11-20", "publisher": "gematik GmbH", "fhirVersion": "4.0.1", "kind": "resource", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpergewicht.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpergewicht.json index e9bc0c8a..9d807a16 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpergewicht.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpergewicht.json @@ -2,11 +2,11 @@ "resourceType": "StructureDefinition", "id": "ISiKKoerpergewicht", "url": "https://gematik.de/fhir/isik/v3/VitalparameterUndKoerpermasze/StructureDefinition/ISiKKoerpergewicht", - "version": "3.0.3", + "version": "3.0.4", "name": "ISiKKoerpergewicht", "status": "active", "experimental": false, - "date": "2024-05-08", + "date": "2024-11-20", "publisher": "gematik GmbH", "fhirVersion": "4.0.1", "kind": "resource", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpergroesse.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpergroesse.json index 5fcb0a0a..1e9bcc53 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpergroesse.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpergroesse.json @@ -2,11 +2,11 @@ "resourceType": "StructureDefinition", "id": "ISiKKoerpergroesse", "url": "https://gematik.de/fhir/isik/v3/VitalparameterUndKoerpermasze/StructureDefinition/ISiKKoerpergroesse", - "version": "3.0.3", + "version": "3.0.4", "name": "ISiKKoerpergroesse", "status": "active", "experimental": false, - "date": "2024-05-08", + "date": "2024-11-20", "publisher": "gematik GmbH", "fhirVersion": "4.0.1", "kind": "resource", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpertemperatur.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpertemperatur.json index c9bd0fb0..67200c6b 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpertemperatur.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpertemperatur.json @@ -2,11 +2,11 @@ "resourceType": "StructureDefinition", "id": "ISiKKoerpertemperatur", "url": "https://gematik.de/fhir/isik/v3/VitalparameterUndKoerpermasze/StructureDefinition/ISiKKoerpertemperatur", - "version": "3.0.3", + "version": "3.0.4", "name": "ISiKKoerpertemperatur", "status": "active", "experimental": false, - "date": "2024-05-08", + "date": "2024-11-20", "publisher": "gematik GmbH", "fhirVersion": "4.0.1", "kind": "resource", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKKopfumfang.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKKopfumfang.json index c87fa5e9..be07c505 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKKopfumfang.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKKopfumfang.json @@ -2,11 +2,11 @@ "resourceType": "StructureDefinition", "id": "ISiKKopfumfang", "url": "https://gematik.de/fhir/isik/v3/VitalparameterUndKoerpermasze/StructureDefinition/ISiKKopfumfang", - "version": "3.0.3", + "version": "3.0.4", "name": "ISiKKopfumfang", "status": "active", "experimental": false, - "date": "2024-05-08", + "date": "2024-11-20", "publisher": "gematik GmbH", "fhirVersion": "4.0.1", "kind": "resource", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKSauerstoffsaettigung.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKSauerstoffsaettigung.json index 828dee15..24ab124f 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKSauerstoffsaettigung.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKSauerstoffsaettigung.json @@ -2,11 +2,11 @@ "resourceType": "StructureDefinition", "id": "ISiKSauerstoffsaettigung", "url": "https://gematik.de/fhir/isik/v3/VitalparameterUndKoerpermasze/StructureDefinition/ISiKSauerstoffsaettigung", - "version": "3.0.3", + "version": "3.0.4", "name": "ISiKSauerstoffsaettigung", "status": "active", "experimental": false, - "date": "2024-05-08", + "date": "2024-11-20", "publisher": "gematik GmbH", "fhirVersion": "4.0.1", "kind": "resource", diff --git a/Resources/fsh-generated/resources/ValueSet-EkgAbleitungenVS.json b/Resources/fsh-generated/resources/ValueSet-EkgAbleitungenVS.json index c36e38a7..e3dcdf1b 100644 --- a/Resources/fsh-generated/resources/ValueSet-EkgAbleitungenVS.json +++ b/Resources/fsh-generated/resources/ValueSet-EkgAbleitungenVS.json @@ -7,9 +7,9 @@ "description": "ValueSet mit den SNOMED CT codes der EKG Ableitungen", "url": "https://gematik.de/fhir/isik/v3/VitalparameterUndKoerpermasze/ValueSet/EkgAbleitungenVS", "experimental": false, - "version": "3.0.3", + "version": "3.0.4", "publisher": "gematik GmbH", - "date": "2024-05-08", + "date": "2024-11-20", "compose": { "include": [ { From 3160026ff2d30106e29e0b23a67d1cbd2cffd19a Mon Sep 17 00:00:00 2001 From: nikohl-de Date: Wed, 20 Nov 2024 11:43:58 +0100 Subject: [PATCH 6/8] Update firely and sushi version --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 55f12816..0e943470 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.1 + uses: FirelyTeam/firely-terminal-pipeline@v0.4.3 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.9.0 + SUSHI_VERSION: 3.12.0 EXPECTED_FAILS: VALIDATION_CONFORMANCE_DOTNET VALIDATION_CONFORMANCE_JAVA VALIDATION_EXAMPLES_JAVA - name: Add & Commit From f0de4cabe6836c6b8502afa37c8538f12bb976d5 Mon Sep 17 00:00:00 2001 From: nikohl-de Date: Wed, 20 Nov 2024 10:49:15 +0000 Subject: [PATCH 7/8] auto-generated FHIR files by GitHub Actions (CI FSH to FHIR Validation) --- .../fsh-generated/resources/ValueSet-EkgAbleitungenVS.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/fsh-generated/resources/ValueSet-EkgAbleitungenVS.json b/Resources/fsh-generated/resources/ValueSet-EkgAbleitungenVS.json index e3dcdf1b..93c74f0b 100644 --- a/Resources/fsh-generated/resources/ValueSet-EkgAbleitungenVS.json +++ b/Resources/fsh-generated/resources/ValueSet-EkgAbleitungenVS.json @@ -5,9 +5,9 @@ "id": "EkgAbleitungenVS", "title": "SNOMED CT codes der EKG Ableitungen", "description": "ValueSet mit den SNOMED CT codes der EKG Ableitungen", + "version": "3.0.4", "url": "https://gematik.de/fhir/isik/v3/VitalparameterUndKoerpermasze/ValueSet/EkgAbleitungenVS", "experimental": false, - "version": "3.0.4", "publisher": "gematik GmbH", "date": "2024-11-20", "compose": { From 5f71b88a31cb59edb4002b8208b1f684bbedc803 Mon Sep 17 00:00:00 2001 From: nikohl-de Date: Wed, 20 Nov 2024 11:59:05 +0100 Subject: [PATCH 8/8] Delete fhirpkg.lock.json --- fhirpkg.lock.json | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 fhirpkg.lock.json diff --git a/fhirpkg.lock.json b/fhirpkg.lock.json deleted file mode 100644 index 5f229197..00000000 --- a/fhirpkg.lock.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "updated": "2024-11-13T09:41:45.577727+01:00", - "dependencies": { - "de.basisprofil.r4": "1.4.0", - "hl7.fhir.r4.core": "4.0.1", - "de.gematik.isik-basismodul": "3.0.5" - }, - "missing": {} -}