From 900324bb0b495981b7d592fb83a74416c90d0d5f Mon Sep 17 00:00:00 2001 From: patrick-werner Date: Fri, 8 Dec 2023 10:14:58 +0100 Subject: [PATCH 1/9] feat: Vorbereitung SCT Slice --- .../Observation-ISiKAtemfrequenzExample.json | 7 +- .../Observation-ISiKBlutdruckExample.json | 4 +- .../resources/Observation-ISiKGCSExample.json | 6 +- .../Observation-ISiKHerzfrequenzExample.json | 2 +- ...ervation-ISiKKoerpertemperaturExample.json | 2 +- ...ation-ISiKSauerstoffsaettigungExample.json | 2 +- .../StructureDefinition-ISiKAtemfrequenz.json | 51 ++++++-- .../StructureDefinition-ISiKBlutdruck.json | 24 +++- .../StructureDefinition-ISiKEkg.json | 33 ++--- .../StructureDefinition-ISiKGCS.json | 114 +++++++++++------- .../StructureDefinition-ISiKHerzfrequenz.json | 30 +++-- ...tructureDefinition-ISiKKoerpergewicht.json | 30 +++-- ...tructureDefinition-ISiKKoerpergroesse.json | 30 +++-- ...ctureDefinition-ISiKKoerpertemperatur.json | 30 +++-- .../StructureDefinition-ISiKKopfumfang.json | 30 +++-- ...reDefinition-ISiKSauerstoffsaettigung.json | 30 +++-- Resources/input/fsh/ISiK-Atemfrequenz.fsh | 9 +- Resources/input/fsh/ISiK-Blutdruck.fsh | 4 +- Resources/input/fsh/ISiK-GCS.fsh | 2 +- Resources/input/fsh/ISiK-Herzfrequenz.fsh | 4 +- Resources/input/fsh/ISiK-Koerpergewicht.fsh | 4 +- Resources/input/fsh/ISiK-Koerpergroesse.fsh | 4 +- .../input/fsh/ISiK-Koerpertemperatur.fsh | 4 +- Resources/input/fsh/ISiK-Kopfumfang.fsh | 4 +- .../input/fsh/ISiK-Sauerstoffsaettigung.fsh | 4 +- Resources/sushi-config.yaml | 2 +- package.json | 20 +-- 27 files changed, 292 insertions(+), 194 deletions(-) diff --git a/Resources/fsh-generated/resources/Observation-ISiKAtemfrequenzExample.json b/Resources/fsh-generated/resources/Observation-ISiKAtemfrequenzExample.json index 81a26014..6cd5e792 100644 --- a/Resources/fsh-generated/resources/Observation-ISiKAtemfrequenzExample.json +++ b/Resources/fsh-generated/resources/Observation-ISiKAtemfrequenzExample.json @@ -25,14 +25,19 @@ "system": "http://loinc.org", "code": "9279-1", "display": "Respiratory rate" + }, + { + "code": "86290005", + "system": "http://snomed.info/sct", + "display": "Respiratory rate (observable entity)" } ], "text": "Atemfrequenz" }, "valueQuantity": { "system": "http://unitsofmeasure.org", - "value": 26, "code": "/min", + "value": 26, "unit": "Atemzüge pro Minute" }, "status": "final", diff --git a/Resources/fsh-generated/resources/Observation-ISiKBlutdruckExample.json b/Resources/fsh-generated/resources/Observation-ISiKBlutdruckExample.json index 4a182516..c518a7ff 100644 --- a/Resources/fsh-generated/resources/Observation-ISiKBlutdruckExample.json +++ b/Resources/fsh-generated/resources/Observation-ISiKBlutdruckExample.json @@ -40,8 +40,8 @@ }, "valueQuantity": { "system": "http://unitsofmeasure.org", - "value": 107, "code": "mm[Hg]", + "value": 107, "unit": "mmHg" } }, @@ -56,8 +56,8 @@ }, "valueQuantity": { "system": "http://unitsofmeasure.org", - "value": 60, "code": "mm[Hg]", + "value": 60, "unit": "mmHg" } } diff --git a/Resources/fsh-generated/resources/Observation-ISiKGCSExample.json b/Resources/fsh-generated/resources/Observation-ISiKGCSExample.json index f33580cb..8fd591a6 100644 --- a/Resources/fsh-generated/resources/Observation-ISiKGCSExample.json +++ b/Resources/fsh-generated/resources/Observation-ISiKGCSExample.json @@ -44,8 +44,8 @@ }, "valueQuantity": { "system": "http://unitsofmeasure.org", - "value": 4, "code": "1", + "value": 4, "unit": "Punktwert" } }, @@ -60,8 +60,8 @@ }, "valueQuantity": { "system": "http://unitsofmeasure.org", - "value": 4, "code": "1", + "value": 4, "unit": "Punktwert" } }, @@ -76,8 +76,8 @@ }, "valueQuantity": { "system": "http://unitsofmeasure.org", - "value": 3, "code": "1", + "value": 3, "unit": "Punktwert" } } diff --git a/Resources/fsh-generated/resources/Observation-ISiKHerzfrequenzExample.json b/Resources/fsh-generated/resources/Observation-ISiKHerzfrequenzExample.json index 999c4701..062c554d 100644 --- a/Resources/fsh-generated/resources/Observation-ISiKHerzfrequenzExample.json +++ b/Resources/fsh-generated/resources/Observation-ISiKHerzfrequenzExample.json @@ -30,8 +30,8 @@ }, "valueQuantity": { "system": "http://unitsofmeasure.org", - "value": 63, "code": "/min", + "value": 63, "unit": "per minute" }, "status": "final", diff --git a/Resources/fsh-generated/resources/Observation-ISiKKoerpertemperaturExample.json b/Resources/fsh-generated/resources/Observation-ISiKKoerpertemperaturExample.json index 632a005c..1d3aa725 100644 --- a/Resources/fsh-generated/resources/Observation-ISiKKoerpertemperaturExample.json +++ b/Resources/fsh-generated/resources/Observation-ISiKKoerpertemperaturExample.json @@ -30,8 +30,8 @@ }, "valueQuantity": { "system": "http://unitsofmeasure.org", - "value": 36.8, "code": "Cel", + "value": 36.8, "unit": "°C" }, "status": "final", diff --git a/Resources/fsh-generated/resources/Observation-ISiKSauerstoffsaettigungExample.json b/Resources/fsh-generated/resources/Observation-ISiKSauerstoffsaettigungExample.json index 29fa0f54..73b7c75b 100644 --- a/Resources/fsh-generated/resources/Observation-ISiKSauerstoffsaettigungExample.json +++ b/Resources/fsh-generated/resources/Observation-ISiKSauerstoffsaettigungExample.json @@ -39,8 +39,8 @@ }, "valueQuantity": { "system": "http://unitsofmeasure.org", - "value": 98, "code": "%", + "value": 98, "unit": "%" }, "component": [ diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKAtemfrequenz.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKAtemfrequenz.json index 5c438d85..81127feb 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKAtemfrequenz.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKAtemfrequenz.json @@ -59,9 +59,9 @@ "mustSupport": true }, { - "id": "Observation.category:vs-cat", + "id": "Observation.category:VSCat", "path": "Observation.category", - "sliceName": "vs-cat", + "sliceName": "VSCat", "mustSupport": true }, { @@ -69,6 +69,27 @@ "path": "Observation.code", "mustSupport": true }, + { + "id": "Observation.code.coding:snomed", + "path": "Observation.code.coding", + "sliceName": "snomed", + "min": 0, + "max": "*", + "patternCoding": { + "code": "86290005", + "system": "http://snomed.info/sct" + } + }, + { + "id": "Observation.code.coding:snomed.system", + "path": "Observation.code.coding.system", + "min": 1 + }, + { + "id": "Observation.code.coding:snomed.code", + "path": "Observation.code.coding.code", + "min": 1 + }, { "id": "Observation.subject", "path": "Observation.subject", @@ -90,28 +111,34 @@ "mustSupport": true }, { - "id": "Observation.valueQuantity", - "path": "Observation.valueQuantity", + "id": "Observation.value[x]:valueQuantity", + "path": "Observation.value[x]", + "sliceName": "valueQuantity", + "type": [ + { + "code": "Quantity" + } + ], "mustSupport": true }, { - "id": "Observation.valueQuantity.value", - "path": "Observation.valueQuantity.value", + "id": "Observation.value[x]:valueQuantity.value", + "path": "Observation.value[x].value", "mustSupport": true }, { - "id": "Observation.valueQuantity.unit", - "path": "Observation.valueQuantity.unit", + "id": "Observation.value[x]:valueQuantity.unit", + "path": "Observation.value[x].unit", "mustSupport": true }, { - "id": "Observation.valueQuantity.system", - "path": "Observation.valueQuantity.system", + "id": "Observation.value[x]:valueQuantity.system", + "path": "Observation.value[x].system", "mustSupport": true }, { - "id": "Observation.valueQuantity.code", - "path": "Observation.valueQuantity.code", + "id": "Observation.value[x]:valueQuantity.code", + "path": "Observation.value[x].code", "mustSupport": true } ] diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKBlutdruck.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKBlutdruck.json index ebf5167a..3346c862 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKBlutdruck.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKBlutdruck.json @@ -59,9 +59,9 @@ "mustSupport": true }, { - "id": "Observation.category:vs-cat", + "id": "Observation.category:VSCat", "path": "Observation.category", - "sliceName": "vs-cat", + "sliceName": "VSCat", "mustSupport": true }, { @@ -116,8 +116,14 @@ "mustSupport": true }, { - "id": "Observation.component:SystolicBP.valueQuantity", - "path": "Observation.component.valueQuantity", + "id": "Observation.component:SystolicBP.value[x]:valueQuantity", + "path": "Observation.component.value[x]", + "sliceName": "valueQuantity", + "type": [ + { + "code": "Quantity" + } + ], "mustSupport": true }, { @@ -142,8 +148,14 @@ "mustSupport": true }, { - "id": "Observation.component:DiastolicBP.valueQuantity", - "path": "Observation.component.valueQuantity", + "id": "Observation.component:DiastolicBP.value[x]:valueQuantity", + "path": "Observation.component.value[x]", + "sliceName": "valueQuantity", + "type": [ + { + "code": "Quantity" + } + ], "mustSupport": true } ] diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKEkg.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKEkg.json index b538000a..97cd9dc8 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKEkg.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKEkg.json @@ -91,43 +91,26 @@ { "id": "Observation.component.value[x]", "path": "Observation.component.value[x]", - "slicing": { - "discriminator": [ - { - "type": "type", - "path": "$this" - } - ], - "ordered": false, - "rules": "open" - }, "mustSupport": true }, { - "id": "Observation.component.valueSampledData", - "path": "Observation.component.valueSampledData", - "min": 1, - "max": "1", + "id": "Observation.component.value[x].origin", + "path": "Observation.component.value[x].origin", "mustSupport": true }, { - "id": "Observation.component.valueSampledData.origin", - "path": "Observation.component.valueSampledData.origin", + "id": "Observation.component.value[x].period", + "path": "Observation.component.value[x].period", "mustSupport": true }, { - "id": "Observation.component.valueSampledData.period", - "path": "Observation.component.valueSampledData.period", + "id": "Observation.component.value[x].dimensions", + "path": "Observation.component.value[x].dimensions", "mustSupport": true }, { - "id": "Observation.component.valueSampledData.dimensions", - "path": "Observation.component.valueSampledData.dimensions", - "mustSupport": true - }, - { - "id": "Observation.component.valueSampledData.data", - "path": "Observation.component.valueSampledData.data", + "id": "Observation.component.value[x].data", + "path": "Observation.component.value[x].data", "mustSupport": true } ] diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKGCS.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKGCS.json index bbc61e24..3e76aae9 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKGCS.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKGCS.json @@ -59,9 +59,9 @@ "mustSupport": true }, { - "id": "Observation.category:vs-cat", + "id": "Observation.category:VSCat", "path": "Observation.category", - "sliceName": "vs-cat", + "sliceName": "VSCat", "mustSupport": true }, { @@ -90,23 +90,29 @@ "mustSupport": true }, { - "id": "Observation.valueQuantity", - "path": "Observation.valueQuantity", + "id": "Observation.value[x]:valueQuantity", + "path": "Observation.value[x]", + "sliceName": "valueQuantity", + "type": [ + { + "code": "Quantity" + } + ], "mustSupport": true }, { - "id": "Observation.valueQuantity.value", - "path": "Observation.valueQuantity.value", + "id": "Observation.value[x]:valueQuantity.value", + "path": "Observation.value[x].value", "mustSupport": true }, { - "id": "Observation.valueQuantity.system", - "path": "Observation.valueQuantity.system", + "id": "Observation.value[x]:valueQuantity.system", + "path": "Observation.value[x].system", "mustSupport": true }, { - "id": "Observation.valueQuantity.code", - "path": "Observation.valueQuantity.code", + "id": "Observation.value[x]:valueQuantity.code", + "path": "Observation.value[x].code", "mustSupport": true }, { @@ -125,23 +131,29 @@ "mustSupport": true }, { - "id": "Observation.component.valueQuantity", - "path": "Observation.component.valueQuantity", + "id": "Observation.component.value[x]:valueQuantity", + "path": "Observation.component.value[x]", + "sliceName": "valueQuantity", + "type": [ + { + "code": "Quantity" + } + ], "mustSupport": true }, { - "id": "Observation.component.valueQuantity.unit", - "path": "Observation.component.valueQuantity.unit", + "id": "Observation.component.value[x]:valueQuantity.unit", + "path": "Observation.component.value[x].unit", "mustSupport": true }, { - "id": "Observation.component.valueQuantity.system", - "path": "Observation.component.valueQuantity.system", + "id": "Observation.component.value[x]:valueQuantity.system", + "path": "Observation.component.value[x].system", "mustSupport": true }, { - "id": "Observation.component.valueQuantity.code", - "path": "Observation.component.valueQuantity.code", + "id": "Observation.component.value[x]:valueQuantity.code", + "path": "Observation.component.value[x].code", "mustSupport": true }, { @@ -160,23 +172,29 @@ "mustSupport": true }, { - "id": "Observation.component:Eye.valueQuantity", - "path": "Observation.component.valueQuantity", + "id": "Observation.component:Eye.value[x]:valueQuantity", + "path": "Observation.component.value[x]", + "sliceName": "valueQuantity", + "type": [ + { + "code": "Quantity" + } + ], "mustSupport": true }, { - "id": "Observation.component:Eye.valueQuantity.unit", - "path": "Observation.component.valueQuantity.unit", + "id": "Observation.component:Eye.value[x]:valueQuantity.unit", + "path": "Observation.component.value[x].unit", "mustSupport": true }, { - "id": "Observation.component:Eye.valueQuantity.system", - "path": "Observation.component.valueQuantity.system", + "id": "Observation.component:Eye.value[x]:valueQuantity.system", + "path": "Observation.component.value[x].system", "mustSupport": true }, { - "id": "Observation.component:Eye.valueQuantity.code", - "path": "Observation.component.valueQuantity.code", + "id": "Observation.component:Eye.value[x]:valueQuantity.code", + "path": "Observation.component.value[x].code", "mustSupport": true }, { @@ -195,23 +213,29 @@ "mustSupport": true }, { - "id": "Observation.component:Motor.valueQuantity", - "path": "Observation.component.valueQuantity", + "id": "Observation.component:Motor.value[x]:valueQuantity", + "path": "Observation.component.value[x]", + "sliceName": "valueQuantity", + "type": [ + { + "code": "Quantity" + } + ], "mustSupport": true }, { - "id": "Observation.component:Motor.valueQuantity.unit", - "path": "Observation.component.valueQuantity.unit", + "id": "Observation.component:Motor.value[x]:valueQuantity.unit", + "path": "Observation.component.value[x].unit", "mustSupport": true }, { - "id": "Observation.component:Motor.valueQuantity.system", - "path": "Observation.component.valueQuantity.system", + "id": "Observation.component:Motor.value[x]:valueQuantity.system", + "path": "Observation.component.value[x].system", "mustSupport": true }, { - "id": "Observation.component:Motor.valueQuantity.code", - "path": "Observation.component.valueQuantity.code", + "id": "Observation.component:Motor.value[x]:valueQuantity.code", + "path": "Observation.component.value[x].code", "mustSupport": true }, { @@ -230,23 +254,29 @@ "mustSupport": true }, { - "id": "Observation.component:Verbal.valueQuantity", - "path": "Observation.component.valueQuantity", + "id": "Observation.component:Verbal.value[x]:valueQuantity", + "path": "Observation.component.value[x]", + "sliceName": "valueQuantity", + "type": [ + { + "code": "Quantity" + } + ], "mustSupport": true }, { - "id": "Observation.component:Verbal.valueQuantity.unit", - "path": "Observation.component.valueQuantity.unit", + "id": "Observation.component:Verbal.value[x]:valueQuantity.unit", + "path": "Observation.component.value[x].unit", "mustSupport": true }, { - "id": "Observation.component:Verbal.valueQuantity.system", - "path": "Observation.component.valueQuantity.system", + "id": "Observation.component:Verbal.value[x]:valueQuantity.system", + "path": "Observation.component.value[x].system", "mustSupport": true }, { - "id": "Observation.component:Verbal.valueQuantity.code", - "path": "Observation.component.valueQuantity.code", + "id": "Observation.component:Verbal.value[x]:valueQuantity.code", + "path": "Observation.component.value[x].code", "mustSupport": true } ] diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKHerzfrequenz.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKHerzfrequenz.json index 57da1b5a..676bb780 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKHerzfrequenz.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKHerzfrequenz.json @@ -59,9 +59,9 @@ "mustSupport": true }, { - "id": "Observation.category:vs-cat", + "id": "Observation.category:VSCat", "path": "Observation.category", - "sliceName": "vs-cat", + "sliceName": "VSCat", "mustSupport": true }, { @@ -90,28 +90,34 @@ "mustSupport": true }, { - "id": "Observation.valueQuantity", - "path": "Observation.valueQuantity", + "id": "Observation.value[x]:valueQuantity", + "path": "Observation.value[x]", + "sliceName": "valueQuantity", + "type": [ + { + "code": "Quantity" + } + ], "mustSupport": true }, { - "id": "Observation.valueQuantity.value", - "path": "Observation.valueQuantity.value", + "id": "Observation.value[x]:valueQuantity.value", + "path": "Observation.value[x].value", "mustSupport": true }, { - "id": "Observation.valueQuantity.unit", - "path": "Observation.valueQuantity.unit", + "id": "Observation.value[x]:valueQuantity.unit", + "path": "Observation.value[x].unit", "mustSupport": true }, { - "id": "Observation.valueQuantity.system", - "path": "Observation.valueQuantity.system", + "id": "Observation.value[x]:valueQuantity.system", + "path": "Observation.value[x].system", "mustSupport": true }, { - "id": "Observation.valueQuantity.code", - "path": "Observation.valueQuantity.code", + "id": "Observation.value[x]:valueQuantity.code", + "path": "Observation.value[x].code", "mustSupport": true } ] diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpergewicht.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpergewicht.json index 800ac2fa..7552ffb9 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpergewicht.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpergewicht.json @@ -59,9 +59,9 @@ "mustSupport": true }, { - "id": "Observation.category:vs-cat", + "id": "Observation.category:VSCat", "path": "Observation.category", - "sliceName": "vs-cat", + "sliceName": "VSCat", "mustSupport": true }, { @@ -90,28 +90,34 @@ "mustSupport": true }, { - "id": "Observation.valueQuantity", - "path": "Observation.valueQuantity", + "id": "Observation.value[x]:valueQuantity", + "path": "Observation.value[x]", + "sliceName": "valueQuantity", + "type": [ + { + "code": "Quantity" + } + ], "mustSupport": true }, { - "id": "Observation.valueQuantity.value", - "path": "Observation.valueQuantity.value", + "id": "Observation.value[x]:valueQuantity.value", + "path": "Observation.value[x].value", "mustSupport": true }, { - "id": "Observation.valueQuantity.unit", - "path": "Observation.valueQuantity.unit", + "id": "Observation.value[x]:valueQuantity.unit", + "path": "Observation.value[x].unit", "mustSupport": true }, { - "id": "Observation.valueQuantity.system", - "path": "Observation.valueQuantity.system", + "id": "Observation.value[x]:valueQuantity.system", + "path": "Observation.value[x].system", "mustSupport": true }, { - "id": "Observation.valueQuantity.code", - "path": "Observation.valueQuantity.code", + "id": "Observation.value[x]:valueQuantity.code", + "path": "Observation.value[x].code", "mustSupport": true } ] diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpergroesse.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpergroesse.json index e4167537..c1606ba6 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpergroesse.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpergroesse.json @@ -59,9 +59,9 @@ "mustSupport": true }, { - "id": "Observation.category:vs-cat", + "id": "Observation.category:VSCat", "path": "Observation.category", - "sliceName": "vs-cat", + "sliceName": "VSCat", "mustSupport": true }, { @@ -90,28 +90,34 @@ "mustSupport": true }, { - "id": "Observation.valueQuantity", - "path": "Observation.valueQuantity", + "id": "Observation.value[x]:valueQuantity", + "path": "Observation.value[x]", + "sliceName": "valueQuantity", + "type": [ + { + "code": "Quantity" + } + ], "mustSupport": true }, { - "id": "Observation.valueQuantity.value", - "path": "Observation.valueQuantity.value", + "id": "Observation.value[x]:valueQuantity.value", + "path": "Observation.value[x].value", "mustSupport": true }, { - "id": "Observation.valueQuantity.unit", - "path": "Observation.valueQuantity.unit", + "id": "Observation.value[x]:valueQuantity.unit", + "path": "Observation.value[x].unit", "mustSupport": true }, { - "id": "Observation.valueQuantity.system", - "path": "Observation.valueQuantity.system", + "id": "Observation.value[x]:valueQuantity.system", + "path": "Observation.value[x].system", "mustSupport": true }, { - "id": "Observation.valueQuantity.code", - "path": "Observation.valueQuantity.code", + "id": "Observation.value[x]:valueQuantity.code", + "path": "Observation.value[x].code", "mustSupport": true } ] diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpertemperatur.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpertemperatur.json index 14fb23f6..160d6820 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpertemperatur.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpertemperatur.json @@ -59,9 +59,9 @@ "mustSupport": true }, { - "id": "Observation.category:vs-cat", + "id": "Observation.category:VSCat", "path": "Observation.category", - "sliceName": "vs-cat", + "sliceName": "VSCat", "mustSupport": true }, { @@ -90,28 +90,34 @@ "mustSupport": true }, { - "id": "Observation.valueQuantity", - "path": "Observation.valueQuantity", + "id": "Observation.value[x]:valueQuantity", + "path": "Observation.value[x]", + "sliceName": "valueQuantity", + "type": [ + { + "code": "Quantity" + } + ], "mustSupport": true }, { - "id": "Observation.valueQuantity.value", - "path": "Observation.valueQuantity.value", + "id": "Observation.value[x]:valueQuantity.value", + "path": "Observation.value[x].value", "mustSupport": true }, { - "id": "Observation.valueQuantity.unit", - "path": "Observation.valueQuantity.unit", + "id": "Observation.value[x]:valueQuantity.unit", + "path": "Observation.value[x].unit", "mustSupport": true }, { - "id": "Observation.valueQuantity.system", - "path": "Observation.valueQuantity.system", + "id": "Observation.value[x]:valueQuantity.system", + "path": "Observation.value[x].system", "mustSupport": true }, { - "id": "Observation.valueQuantity.code", - "path": "Observation.valueQuantity.code", + "id": "Observation.value[x]:valueQuantity.code", + "path": "Observation.value[x].code", "mustSupport": true } ] diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKKopfumfang.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKKopfumfang.json index e5fd3778..7bf3a305 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKKopfumfang.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKKopfumfang.json @@ -59,9 +59,9 @@ "mustSupport": true }, { - "id": "Observation.category:vs-cat", + "id": "Observation.category:VSCat", "path": "Observation.category", - "sliceName": "vs-cat", + "sliceName": "VSCat", "mustSupport": true }, { @@ -90,28 +90,34 @@ "mustSupport": true }, { - "id": "Observation.valueQuantity", - "path": "Observation.valueQuantity", + "id": "Observation.value[x]:valueQuantity", + "path": "Observation.value[x]", + "sliceName": "valueQuantity", + "type": [ + { + "code": "Quantity" + } + ], "mustSupport": true }, { - "id": "Observation.valueQuantity.value", - "path": "Observation.valueQuantity.value", + "id": "Observation.value[x]:valueQuantity.value", + "path": "Observation.value[x].value", "mustSupport": true }, { - "id": "Observation.valueQuantity.unit", - "path": "Observation.valueQuantity.unit", + "id": "Observation.value[x]:valueQuantity.unit", + "path": "Observation.value[x].unit", "mustSupport": true }, { - "id": "Observation.valueQuantity.system", - "path": "Observation.valueQuantity.system", + "id": "Observation.value[x]:valueQuantity.system", + "path": "Observation.value[x].system", "mustSupport": true }, { - "id": "Observation.valueQuantity.code", - "path": "Observation.valueQuantity.code", + "id": "Observation.value[x]:valueQuantity.code", + "path": "Observation.value[x].code", "mustSupport": true } ] diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKSauerstoffsaettigung.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKSauerstoffsaettigung.json index 505b08aa..492bd064 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKSauerstoffsaettigung.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKSauerstoffsaettigung.json @@ -59,9 +59,9 @@ "mustSupport": true }, { - "id": "Observation.category:vs-cat", + "id": "Observation.category:VSCat", "path": "Observation.category", - "sliceName": "vs-cat", + "sliceName": "VSCat", "mustSupport": true }, { @@ -90,28 +90,34 @@ "mustSupport": true }, { - "id": "Observation.valueQuantity", - "path": "Observation.valueQuantity", + "id": "Observation.value[x]:valueQuantity", + "path": "Observation.value[x]", + "sliceName": "valueQuantity", + "type": [ + { + "code": "Quantity" + } + ], "mustSupport": true }, { - "id": "Observation.valueQuantity.value", - "path": "Observation.valueQuantity.value", + "id": "Observation.value[x]:valueQuantity.value", + "path": "Observation.value[x].value", "mustSupport": true }, { - "id": "Observation.valueQuantity.unit", - "path": "Observation.valueQuantity.unit", + "id": "Observation.value[x]:valueQuantity.unit", + "path": "Observation.value[x].unit", "mustSupport": true }, { - "id": "Observation.valueQuantity.system", - "path": "Observation.valueQuantity.system", + "id": "Observation.value[x]:valueQuantity.system", + "path": "Observation.value[x].system", "mustSupport": true }, { - "id": "Observation.valueQuantity.code", - "path": "Observation.valueQuantity.code", + "id": "Observation.value[x]:valueQuantity.code", + "path": "Observation.value[x].code", "mustSupport": true } ] diff --git a/Resources/input/fsh/ISiK-Atemfrequenz.fsh b/Resources/input/fsh/ISiK-Atemfrequenz.fsh index 5b5211e9..63bb4c3c 100644 --- a/Resources/input/fsh/ISiK-Atemfrequenz.fsh +++ b/Resources/input/fsh/ISiK-Atemfrequenz.fsh @@ -4,8 +4,12 @@ Id: ISiKAtemfrequenz * insert Meta * status MS * category MS -* category[vs-cat] MS +* category[VSCat] MS * code MS + * coding contains snomed 0..* + * coding[snomed] = $sct#86290005 + * system 1.. + * code 1.. * subject MS * encounter MS * effective[x] MS @@ -22,8 +26,9 @@ Usage: #example * meta.profile[0] = "http://hl7.org/fhir/StructureDefinition/resprate" * meta.profile[+] = "http://fhir.de/StructureDefinition/observation-de-vitalsign-atemfrequenz" * status = #final -* category[vs-cat] = $observation-category#vital-signs "Vital Signs" +* category[VSCat] = $observation-category#vital-signs "Vital Signs" * code = $loinc#9279-1 "Respiratory rate" +* code.coding[snomed] = $sct#86290005 "Respiratory rate (observable entity)" * code.text = "Atemfrequenz" * subject = Reference(PatientinMusterfrau) * effectiveDateTime = "2019-07-02" diff --git a/Resources/input/fsh/ISiK-Blutdruck.fsh b/Resources/input/fsh/ISiK-Blutdruck.fsh index 8c26abb5..3cd34ae7 100644 --- a/Resources/input/fsh/ISiK-Blutdruck.fsh +++ b/Resources/input/fsh/ISiK-Blutdruck.fsh @@ -4,7 +4,7 @@ Id: ISiKBlutdruck * insert Meta * status MS * category MS -* category[vs-cat] MS +* category[VSCat] MS * code MS * code.coding MS * subject MS @@ -27,7 +27,7 @@ InstanceOf: ISiKBlutdruck Usage: #example * meta.profile[0] = "http://fhir.de/StructureDefinition/observation-de-vitalsign-blutdruck" * status = #final -* category[vs-cat] = $observation-category#vital-signs "Vital Signs" +* category[VSCat] = $observation-category#vital-signs "Vital Signs" * code = $loinc#85354-9 "Blood pressure panel with all children optional" * code.text = "Systolischer und Diastolischer Blutdruck" * subject = Reference(PatientinMusterfrau) diff --git a/Resources/input/fsh/ISiK-GCS.fsh b/Resources/input/fsh/ISiK-GCS.fsh index bbc6cd07..613db9d4 100644 --- a/Resources/input/fsh/ISiK-GCS.fsh +++ b/Resources/input/fsh/ISiK-GCS.fsh @@ -4,7 +4,7 @@ Id: ISiKGCS * insert Meta * status MS * category MS -* category[vs-cat] MS +* category[VSCat] MS * code MS * subject MS * encounter MS diff --git a/Resources/input/fsh/ISiK-Herzfrequenz.fsh b/Resources/input/fsh/ISiK-Herzfrequenz.fsh index 831c0432..3e9f1324 100644 --- a/Resources/input/fsh/ISiK-Herzfrequenz.fsh +++ b/Resources/input/fsh/ISiK-Herzfrequenz.fsh @@ -4,7 +4,7 @@ Id: ISiKHerzfrequenz * insert Meta * status MS * category MS -* category[vs-cat] MS +* category[VSCat] MS * code MS * subject MS * encounter MS @@ -22,7 +22,7 @@ Usage: #example * meta.profile[0] = "http://hl7.org/fhir/StructureDefinition/heartrate" * meta.profile[+] = "http://fhir.de/StructureDefinition/observation-de-vitalsign-herzfrequenz" * status = #final -* category[vs-cat] = $observation-category#vital-signs +* category[VSCat] = $observation-category#vital-signs * code.coding[0] = $loinc#8867-4 "Heart rate" * code.text = "Herzfrequenz" * subject = Reference(PatientinMusterfrau) diff --git a/Resources/input/fsh/ISiK-Koerpergewicht.fsh b/Resources/input/fsh/ISiK-Koerpergewicht.fsh index 53103507..2a54af2f 100644 --- a/Resources/input/fsh/ISiK-Koerpergewicht.fsh +++ b/Resources/input/fsh/ISiK-Koerpergewicht.fsh @@ -4,7 +4,7 @@ Id: ISiKKoerpergewicht * insert Meta * status MS * category MS -* category[vs-cat] MS +* category[VSCat] MS * code MS * subject MS * encounter MS @@ -22,7 +22,7 @@ Usage: #example * meta.profile[0] = "http://hl7.org/fhir/StructureDefinition/bodyweight" * meta.profile[+] = "http://fhir.de/StructureDefinition/observation-de-vitalsign-koerpergewicht" * status = #final -* category[vs-cat] = $observation-category#vital-signs +* category[VSCat] = $observation-category#vital-signs * code.coding[0] = $loinc#29463-7 "Body weight" * code.coding[+] = $sct#27113001 "Body weight" * code.text = "Körpergewicht" diff --git a/Resources/input/fsh/ISiK-Koerpergroesse.fsh b/Resources/input/fsh/ISiK-Koerpergroesse.fsh index 09ba644d..93ef47f5 100644 --- a/Resources/input/fsh/ISiK-Koerpergroesse.fsh +++ b/Resources/input/fsh/ISiK-Koerpergroesse.fsh @@ -4,7 +4,7 @@ Id: ISiKKoerpergroesse * insert Meta * status MS * category MS -* category[vs-cat] MS +* category[VSCat] MS * code MS * subject MS * encounter MS @@ -22,7 +22,7 @@ Usage: #example * meta.profile[0] = "http://hl7.org/fhir/StructureDefinition/bodyheight" * meta.profile[+] = "http://fhir.de/StructureDefinition/observation-de-vitalsign-koerpergroesse" * status = #final -* category[vs-cat] = $observation-category#vital-signs +* category[VSCat] = $observation-category#vital-signs * code.coding[0] = $loinc#8302-2 "Body height" * code.coding[+] = $sct#50373000 "Body height measure" * code.text = "Körpergröße" diff --git a/Resources/input/fsh/ISiK-Koerpertemperatur.fsh b/Resources/input/fsh/ISiK-Koerpertemperatur.fsh index c16928be..85ce4d0c 100644 --- a/Resources/input/fsh/ISiK-Koerpertemperatur.fsh +++ b/Resources/input/fsh/ISiK-Koerpertemperatur.fsh @@ -4,7 +4,7 @@ Id: ISiKKoerpertemperatur * insert Meta * status MS * category MS -* category[vs-cat] MS +* category[VSCat] MS * code MS * subject MS * encounter MS @@ -22,7 +22,7 @@ Usage: #example * meta.profile[0] = "http://hl7.org/fhir/StructureDefinition/bodytemp" * meta.profile[+] = "http://fhir.de/StructureDefinition/observation-de-vitalsign-koerpertemperatur" * status = #final -* category[vs-cat] = $observation-category#vital-signs +* category[VSCat] = $observation-category#vital-signs * code.coding[0] = $loinc#8310-5 "Body temperature" * code.text = "Körpertemperatur" * subject = Reference(PatientinMusterfrau) diff --git a/Resources/input/fsh/ISiK-Kopfumfang.fsh b/Resources/input/fsh/ISiK-Kopfumfang.fsh index 0f0df802..24955f24 100644 --- a/Resources/input/fsh/ISiK-Kopfumfang.fsh +++ b/Resources/input/fsh/ISiK-Kopfumfang.fsh @@ -4,7 +4,7 @@ Id: ISiKKopfumfang * insert Meta * status MS * category MS -* category[vs-cat] MS +* category[VSCat] MS * code MS * subject MS * encounter MS @@ -22,7 +22,7 @@ Usage: #example * meta.profile[0] = "http://hl7.org/fhir/StructureDefinition/headcircum" * meta.profile[+] = "http://fhir.de/StructureDefinition/observation-de-vitalsign-kopfumfang" * status = #final -* category[vs-cat] = $observation-category#vital-signs "Vital Signs" +* category[VSCat] = $observation-category#vital-signs "Vital Signs" * code = $loinc#9843-4 "Head Occipital-frontal circumference" * code.text = "Kopfumfang" * subject = Reference(PatientinMusterfrau) diff --git a/Resources/input/fsh/ISiK-Sauerstoffsaettigung.fsh b/Resources/input/fsh/ISiK-Sauerstoffsaettigung.fsh index 585a1d79..efa20629 100644 --- a/Resources/input/fsh/ISiK-Sauerstoffsaettigung.fsh +++ b/Resources/input/fsh/ISiK-Sauerstoffsaettigung.fsh @@ -4,7 +4,7 @@ Id: ISiKSauerstoffsaettigung * insert Meta * status MS * category MS -* category[vs-cat] MS +* category[VSCat] MS * code MS * subject MS * encounter MS @@ -21,7 +21,7 @@ InstanceOf: ISiKSauerstoffsaettigung Usage: #example * meta.profile[0] = "http://fhir.de/StructureDefinition/observation-de-vitalsign-sauerstoffsaettigung" * status = #final -* category[vs-cat] = $observation-category#vital-signs +* category[VSCat] = $observation-category#vital-signs * code.coding[0] = $loinc#2708-6 "Oxygen saturation in Arterial blood" * code.coding[+] = $sct#442476006 "Arterial oxygen saturation" * code.coding[+] = $loinc#59408-5 "Oxygen saturation in Arterial blood by Pulse oximetry" diff --git a/Resources/sushi-config.yaml b/Resources/sushi-config.yaml index 702a7e49..755b4e5e 100644 --- a/Resources/sushi-config.yaml +++ b/Resources/sushi-config.yaml @@ -3,5 +3,5 @@ fhirVersion: 4.0.1 FSHOnly: true applyExtensionMetadataToRoot: false dependencies: - de.basisprofil.r4: 1.4.0 + de.basisprofil.r4: 1.5.0-alpha1 de.gematik.isik-basismodul: 3.0.0 \ No newline at end of file diff --git a/package.json b/package.json index f6680d5e..562b59f1 100644 --- a/package.json +++ b/package.json @@ -1,12 +1,12 @@ { - "name": "de.gematik.isik-vitalparameter", - "version": "3.0.0", - "description": "Package Release des ISiK Modul Vitalparameter und Körpermaße", - "fhirVersions": [ - "4.0.1" - ], - "dependencies": { - "de.basisprofil.r4": "1.4.0", - "de.gematik.isik-basismodul": "3.0.0" - } + "name": "de.gematik.isik-vitalparameter", + "version": "3.0.0", + "description": "Package Release des ISiK Modul Vitalparameter und Körpermaße", + "fhirVersions": [ + "4.0.1" + ], + "dependencies": { + "de.basisprofil.r4": "1.5.0-alpha1", + "de.gematik.isik-basismodul": "3.0.0" + } } From 3f548ca0c30bd2b607ef1531254c7d663e3a0616 Mon Sep 17 00:00:00 2001 From: patrick-werner Date: Thu, 1 Feb 2024 13:40:46 +0100 Subject: [PATCH 2/9] feat: sct codings added --- .../Observation-ISiKBlutdruckExample.json | 5 + .../resources/Observation-ISiKEkgExample.json | 12 +- .../resources/Observation-ISiKGCSExample.json | 55 +++++--- .../Observation-ISiKHerzfrequenzExample.json | 5 + ...Observation-ISiKKoerpergroesseExample.json | 14 +- ...ervation-ISiKKoerpertemperaturExample.json | 5 + .../Observation-ISiKKopfumfangExample.json | 5 + ...ation-ISiKSauerstoffsaettigungExample.json | 7 +- .../StructureDefinition-ISiKAtemfrequenz.json | 21 ++- .../StructureDefinition-ISiKBlutdruck.json | 9 +- .../StructureDefinition-ISiKEkg.json | 15 ++- .../StructureDefinition-ISiKGCS.json | 124 ++++-------------- .../StructureDefinition-ISiKHerzfrequenz.json | 16 +++ ...tructureDefinition-ISiKKoerpergewicht.json | 16 +++ ...tructureDefinition-ISiKKoerpergroesse.json | 16 +++ ...ctureDefinition-ISiKKoerpertemperatur.json | 16 +++ .../StructureDefinition-ISiKKopfumfang.json | 16 +++ ...reDefinition-ISiKSauerstoffsaettigung.json | 12 ++ Resources/input/fsh/ISiK-Atemfrequenz.fsh | 7 +- Resources/input/fsh/ISiK-Blutdruck.fsh | 9 +- Resources/input/fsh/ISiK-Ekg.fsh | 13 +- Resources/input/fsh/ISiK-GCS.fsh | 23 ++-- Resources/input/fsh/ISiK-Herzfrequenz.fsh | 6 +- Resources/input/fsh/ISiK-Koerpergewicht.fsh | 3 + Resources/input/fsh/ISiK-Koerpergroesse.fsh | 7 +- .../input/fsh/ISiK-Koerpertemperatur.fsh | 6 +- Resources/input/fsh/ISiK-Kopfumfang.fsh | 6 +- .../input/fsh/ISiK-Sauerstoffsaettigung.fsh | 9 +- Resources/sushi-config.yaml | 2 +- package.json | 2 +- 30 files changed, 280 insertions(+), 182 deletions(-) diff --git a/Resources/fsh-generated/resources/Observation-ISiKBlutdruckExample.json b/Resources/fsh-generated/resources/Observation-ISiKBlutdruckExample.json index c518a7ff..f8ca5f96 100644 --- a/Resources/fsh-generated/resources/Observation-ISiKBlutdruckExample.json +++ b/Resources/fsh-generated/resources/Observation-ISiKBlutdruckExample.json @@ -24,6 +24,11 @@ "system": "http://loinc.org", "code": "85354-9", "display": "Blood pressure panel with all children optional" + }, + { + "system": "http://snomed.info/sct", + "code": "75367002", + "display": "Blood pressure (observable entity)" } ], "text": "Systolischer und Diastolischer Blutdruck" diff --git a/Resources/fsh-generated/resources/Observation-ISiKEkgExample.json b/Resources/fsh-generated/resources/Observation-ISiKEkgExample.json index 590d779e..35723fdb 100644 --- a/Resources/fsh-generated/resources/Observation-ISiKEkgExample.json +++ b/Resources/fsh-generated/resources/Observation-ISiKEkgExample.json @@ -3,16 +3,20 @@ "id": "ISiKEkgExample", "meta": { "profile": [ - "https://gematik.de/fhir/isik/v3/VitalparameterUndKoerpermasze/StructureDefinition/ISiKEkg", - "http://fhir.de/StructureDefinition/observation-de-ekg" + "https://gematik.de/fhir/isik/v3/VitalparameterUndKoerpermasze/StructureDefinition/ISiKEkg" ] }, "code": { "coding": [ { "system": "http://loinc.org", - "code": "LP6244-0", - "display": "Electrocardiogram (EKG)" + "code": "11524-6", + "display": "EKG study" + }, + { + "system": "http://snomed.info/sct", + "code": "271921002", + "display": "Electrocardiogram finding (observable entity)" } ] }, diff --git a/Resources/fsh-generated/resources/Observation-ISiKGCSExample.json b/Resources/fsh-generated/resources/Observation-ISiKGCSExample.json index 8fd591a6..d474ee29 100644 --- a/Resources/fsh-generated/resources/Observation-ISiKGCSExample.json +++ b/Resources/fsh-generated/resources/Observation-ISiKGCSExample.json @@ -12,7 +12,7 @@ "coding": [ { "system": "http://terminology.hl7.org/CodeSystem/observation-category", - "code": "vital-signs" + "code": "survey" } ] } @@ -23,6 +23,11 @@ "system": "http://loinc.org", "code": "9269-2", "display": "Glasgow coma score total" + }, + { + "system": "http://snomed.info/sct", + "code": "248241002", + "display": "Glasgow coma score (observable entity)" } ] }, @@ -38,15 +43,19 @@ "coding": [ { "system": "http://loinc.org", - "code": "9267-6" + "code": "9270-0", + "display": "Glasgow coma score verbal" } ] }, - "valueQuantity": { - "system": "http://unitsofmeasure.org", - "code": "1", - "value": 4, - "unit": "Punktwert" + "valueCodeableConcept": { + "coding": [ + { + "code": "LA6560-2", + "system": "http://loinc.org", + "display": "Confused" + } + ] } }, { @@ -54,15 +63,19 @@ "coding": [ { "system": "http://loinc.org", - "code": "9268-4" + "code": "9268-4", + "display": "Glasgow coma score motor" } ] }, - "valueQuantity": { - "system": "http://unitsofmeasure.org", - "code": "1", - "value": 4, - "unit": "Punktwert" + "valueCodeableConcept": { + "coding": [ + { + "code": "LA6566-9", + "system": "http://loinc.org", + "display": "Localizing pain" + } + ] } }, { @@ -70,15 +83,19 @@ "coding": [ { "system": "http://loinc.org", - "code": "9270-0" + "code": "9267-6", + "display": "Glasgow coma score eye opening" } ] }, - "valueQuantity": { - "system": "http://unitsofmeasure.org", - "code": "1", - "value": 3, - "unit": "Punktwert" + "valueCodeableConcept": { + "coding": [ + { + "code": "LA6555-2", + "system": "http://loinc.org", + "display": "Eye opening to verbal command" + } + ] } } ], diff --git a/Resources/fsh-generated/resources/Observation-ISiKHerzfrequenzExample.json b/Resources/fsh-generated/resources/Observation-ISiKHerzfrequenzExample.json index 062c554d..e3e49cb0 100644 --- a/Resources/fsh-generated/resources/Observation-ISiKHerzfrequenzExample.json +++ b/Resources/fsh-generated/resources/Observation-ISiKHerzfrequenzExample.json @@ -24,6 +24,11 @@ "system": "http://loinc.org", "code": "8867-4", "display": "Heart rate" + }, + { + "code": "364075005", + "system": "http://snomed.info/sct", + "display": "Heart rate (observable entity)" } ], "text": "Herzfrequenz" diff --git a/Resources/fsh-generated/resources/Observation-ISiKKoerpergroesseExample.json b/Resources/fsh-generated/resources/Observation-ISiKKoerpergroesseExample.json index ffb58ebc..4e9f2996 100644 --- a/Resources/fsh-generated/resources/Observation-ISiKKoerpergroesseExample.json +++ b/Resources/fsh-generated/resources/Observation-ISiKKoerpergroesseExample.json @@ -20,15 +20,19 @@ ], "code": { "coding": [ + { + "code": "1153637007", + "system": "http://snomed.info/sct", + "display": "Body height (observable entity)" + }, { "system": "http://loinc.org", - "code": "8302-2", - "display": "Body height" + "code": "8302-2" }, { - "code": "50373000", - "system": "http://snomed.info/sct", - "display": "Body height measure" + "code": "8302-2", + "system": "http://loinc.org", + "display": "Body height" } ], "text": "Körpergröße" diff --git a/Resources/fsh-generated/resources/Observation-ISiKKoerpertemperaturExample.json b/Resources/fsh-generated/resources/Observation-ISiKKoerpertemperaturExample.json index 1d3aa725..1d9d3dfd 100644 --- a/Resources/fsh-generated/resources/Observation-ISiKKoerpertemperaturExample.json +++ b/Resources/fsh-generated/resources/Observation-ISiKKoerpertemperaturExample.json @@ -24,6 +24,11 @@ "system": "http://loinc.org", "code": "8310-5", "display": "Body temperature" + }, + { + "code": "386725007", + "system": "http://snomed.info/sct", + "display": "Body temperature (observable entity)" } ], "text": "Körpertemperatur" diff --git a/Resources/fsh-generated/resources/Observation-ISiKKopfumfangExample.json b/Resources/fsh-generated/resources/Observation-ISiKKopfumfangExample.json index 9cbeb5e2..8d32afd0 100644 --- a/Resources/fsh-generated/resources/Observation-ISiKKopfumfangExample.json +++ b/Resources/fsh-generated/resources/Observation-ISiKKopfumfangExample.json @@ -25,6 +25,11 @@ "system": "http://loinc.org", "code": "9843-4", "display": "Head Occipital-frontal circumference" + }, + { + "code": "363812007", + "system": "http://snomed.info/sct", + "display": "Head circumference (observable entity)" } ], "text": "Kopfumfang" diff --git a/Resources/fsh-generated/resources/Observation-ISiKSauerstoffsaettigungExample.json b/Resources/fsh-generated/resources/Observation-ISiKSauerstoffsaettigungExample.json index 73b7c75b..dc45da16 100644 --- a/Resources/fsh-generated/resources/Observation-ISiKSauerstoffsaettigungExample.json +++ b/Resources/fsh-generated/resources/Observation-ISiKSauerstoffsaettigungExample.json @@ -25,14 +25,9 @@ "display": "Oxygen saturation in Arterial blood" }, { - "code": "442476006", "system": "http://snomed.info/sct", + "code": "442476006", "display": "Arterial oxygen saturation" - }, - { - "code": "59408-5", - "system": "http://loinc.org", - "display": "Oxygen saturation in Arterial blood by Pulse oximetry" } ], "text": "Pulsoximetrische Sauerstoffsättigung" diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKAtemfrequenz.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKAtemfrequenz.json index 81127feb..53eaa989 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKAtemfrequenz.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKAtemfrequenz.json @@ -69,26 +69,21 @@ "path": "Observation.code", "mustSupport": true }, + { + "id": "Observation.code.coding:loinc", + "path": "Observation.code.coding", + "sliceName": "loinc", + "mustSupport": true + }, { "id": "Observation.code.coding:snomed", "path": "Observation.code.coding", "sliceName": "snomed", - "min": 0, - "max": "*", "patternCoding": { "code": "86290005", "system": "http://snomed.info/sct" - } - }, - { - "id": "Observation.code.coding:snomed.system", - "path": "Observation.code.coding.system", - "min": 1 - }, - { - "id": "Observation.code.coding:snomed.code", - "path": "Observation.code.coding.code", - "min": 1 + }, + "mustSupport": true }, { "id": "Observation.subject", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKBlutdruck.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKBlutdruck.json index 3346c862..00df1b3c 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKBlutdruck.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKBlutdruck.json @@ -70,8 +70,15 @@ "mustSupport": true }, { - "id": "Observation.code.coding", + "id": "Observation.code.coding:loinc", "path": "Observation.code.coding", + "sliceName": "loinc", + "mustSupport": true + }, + { + "id": "Observation.code.coding:snomed", + "path": "Observation.code.coding", + "sliceName": "snomed", "mustSupport": true }, { diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKEkg.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKEkg.json index 97cd9dc8..01e55dc9 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKEkg.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKEkg.json @@ -64,13 +64,20 @@ "mustSupport": true }, { - "id": "Observation.subject", - "path": "Observation.subject", + "id": "Observation.code.coding:loinc", + "path": "Observation.code.coding", + "sliceName": "loinc", "mustSupport": true }, { - "id": "Observation.effective[x]", - "path": "Observation.effective[x]", + "id": "Observation.code.coding:snomed", + "path": "Observation.code.coding", + "sliceName": "snomed", + "mustSupport": true + }, + { + "id": "Observation.subject", + "path": "Observation.subject", "mustSupport": true }, { diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKGCS.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKGCS.json index 3e76aae9..a0f5068a 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKGCS.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKGCS.json @@ -44,7 +44,7 @@ "kind": "resource", "abstract": false, "type": "Observation", - "baseDefinition": "http://fhir.de/StructureDefinition/observation-de-vitalsign-gcs", + "baseDefinition": "http://fhir.de/StructureDefinition/observation-de-score-gcs", "derivation": "constraint", "differential": { "element": [ @@ -59,14 +59,21 @@ "mustSupport": true }, { - "id": "Observation.category:VSCat", + "id": "Observation.category:survey", "path": "Observation.category", - "sliceName": "VSCat", + "sliceName": "survey", "mustSupport": true }, { - "id": "Observation.code", - "path": "Observation.code", + "id": "Observation.code.coding:loinc", + "path": "Observation.code.coding", + "sliceName": "loinc", + "mustSupport": true + }, + { + "id": "Observation.code.coding:snomed", + "path": "Observation.code.coding", + "sliceName": "snomed", "mustSupport": true }, { @@ -90,28 +97,17 @@ "mustSupport": true }, { - "id": "Observation.value[x]:valueQuantity", - "path": "Observation.value[x]", - "sliceName": "valueQuantity", - "type": [ - { - "code": "Quantity" - } - ], - "mustSupport": true - }, - { - "id": "Observation.value[x]:valueQuantity.value", + "id": "Observation.value[x].value", "path": "Observation.value[x].value", "mustSupport": true }, { - "id": "Observation.value[x]:valueQuantity.system", + "id": "Observation.value[x].system", "path": "Observation.value[x].system", "mustSupport": true }, { - "id": "Observation.value[x]:valueQuantity.code", + "id": "Observation.value[x].code", "path": "Observation.value[x].code", "mustSupport": true }, @@ -128,12 +124,24 @@ { "id": "Observation.component.value[x]", "path": "Observation.component.value[x]", + "slicing": { + "discriminator": [ + { + "type": "type", + "path": "$this" + } + ], + "ordered": false, + "rules": "open" + }, "mustSupport": true }, { "id": "Observation.component.value[x]:valueQuantity", "path": "Observation.component.value[x]", "sliceName": "valueQuantity", + "min": 0, + "max": "1", "type": [ { "code": "Quantity" @@ -171,32 +179,6 @@ "path": "Observation.component.value[x]", "mustSupport": true }, - { - "id": "Observation.component:Eye.value[x]:valueQuantity", - "path": "Observation.component.value[x]", - "sliceName": "valueQuantity", - "type": [ - { - "code": "Quantity" - } - ], - "mustSupport": true - }, - { - "id": "Observation.component:Eye.value[x]:valueQuantity.unit", - "path": "Observation.component.value[x].unit", - "mustSupport": true - }, - { - "id": "Observation.component:Eye.value[x]:valueQuantity.system", - "path": "Observation.component.value[x].system", - "mustSupport": true - }, - { - "id": "Observation.component:Eye.value[x]:valueQuantity.code", - "path": "Observation.component.value[x].code", - "mustSupport": true - }, { "id": "Observation.component:Motor", "path": "Observation.component", @@ -212,32 +194,6 @@ "path": "Observation.component.value[x]", "mustSupport": true }, - { - "id": "Observation.component:Motor.value[x]:valueQuantity", - "path": "Observation.component.value[x]", - "sliceName": "valueQuantity", - "type": [ - { - "code": "Quantity" - } - ], - "mustSupport": true - }, - { - "id": "Observation.component:Motor.value[x]:valueQuantity.unit", - "path": "Observation.component.value[x].unit", - "mustSupport": true - }, - { - "id": "Observation.component:Motor.value[x]:valueQuantity.system", - "path": "Observation.component.value[x].system", - "mustSupport": true - }, - { - "id": "Observation.component:Motor.value[x]:valueQuantity.code", - "path": "Observation.component.value[x].code", - "mustSupport": true - }, { "id": "Observation.component:Verbal", "path": "Observation.component", @@ -252,32 +208,6 @@ "id": "Observation.component:Verbal.value[x]", "path": "Observation.component.value[x]", "mustSupport": true - }, - { - "id": "Observation.component:Verbal.value[x]:valueQuantity", - "path": "Observation.component.value[x]", - "sliceName": "valueQuantity", - "type": [ - { - "code": "Quantity" - } - ], - "mustSupport": true - }, - { - "id": "Observation.component:Verbal.value[x]:valueQuantity.unit", - "path": "Observation.component.value[x].unit", - "mustSupport": true - }, - { - "id": "Observation.component:Verbal.value[x]:valueQuantity.system", - "path": "Observation.component.value[x].system", - "mustSupport": true - }, - { - "id": "Observation.component:Verbal.value[x]:valueQuantity.code", - "path": "Observation.component.value[x].code", - "mustSupport": true } ] } diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKHerzfrequenz.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKHerzfrequenz.json index 676bb780..f5a36029 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKHerzfrequenz.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKHerzfrequenz.json @@ -69,6 +69,22 @@ "path": "Observation.code", "mustSupport": true }, + { + "id": "Observation.code.coding:loinc", + "path": "Observation.code.coding", + "sliceName": "loinc", + "mustSupport": true + }, + { + "id": "Observation.code.coding:snomed", + "path": "Observation.code.coding", + "sliceName": "snomed", + "patternCoding": { + "code": "364075005", + "system": "http://snomed.info/sct" + }, + "mustSupport": true + }, { "id": "Observation.subject", "path": "Observation.subject", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpergewicht.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpergewicht.json index 7552ffb9..b0457091 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpergewicht.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpergewicht.json @@ -69,6 +69,22 @@ "path": "Observation.code", "mustSupport": true }, + { + "id": "Observation.code.coding:loinc", + "path": "Observation.code.coding", + "sliceName": "loinc", + "mustSupport": true + }, + { + "id": "Observation.code.coding:snomed", + "path": "Observation.code.coding", + "sliceName": "snomed", + "patternCoding": { + "code": "27113001", + "system": "http://snomed.info/sct" + }, + "mustSupport": true + }, { "id": "Observation.subject", "path": "Observation.subject", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpergroesse.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpergroesse.json index c1606ba6..fe65d21e 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpergroesse.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpergroesse.json @@ -69,6 +69,22 @@ "path": "Observation.code", "mustSupport": true }, + { + "id": "Observation.code.coding:loinc", + "path": "Observation.code.coding", + "sliceName": "loinc", + "mustSupport": true + }, + { + "id": "Observation.code.coding:snomed", + "path": "Observation.code.coding", + "sliceName": "snomed", + "patternCoding": { + "code": "1153637007", + "system": "http://snomed.info/sct" + }, + "mustSupport": true + }, { "id": "Observation.subject", "path": "Observation.subject", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpertemperatur.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpertemperatur.json index 160d6820..188ab992 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpertemperatur.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpertemperatur.json @@ -69,6 +69,22 @@ "path": "Observation.code", "mustSupport": true }, + { + "id": "Observation.code.coding:loinc", + "path": "Observation.code.coding", + "sliceName": "loinc", + "mustSupport": true + }, + { + "id": "Observation.code.coding:snomed", + "path": "Observation.code.coding", + "sliceName": "snomed", + "patternCoding": { + "code": "386725007", + "system": "http://snomed.info/sct" + }, + "mustSupport": true + }, { "id": "Observation.subject", "path": "Observation.subject", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKKopfumfang.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKKopfumfang.json index 7bf3a305..568e8872 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKKopfumfang.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKKopfumfang.json @@ -69,6 +69,22 @@ "path": "Observation.code", "mustSupport": true }, + { + "id": "Observation.code.coding:loinc", + "path": "Observation.code.coding", + "sliceName": "loinc", + "mustSupport": true + }, + { + "id": "Observation.code.coding:snomed", + "path": "Observation.code.coding", + "sliceName": "snomed", + "patternCoding": { + "code": "363812007", + "system": "http://snomed.info/sct" + }, + "mustSupport": true + }, { "id": "Observation.subject", "path": "Observation.subject", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKSauerstoffsaettigung.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKSauerstoffsaettigung.json index 492bd064..5dcff85c 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKSauerstoffsaettigung.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKSauerstoffsaettigung.json @@ -69,6 +69,18 @@ "path": "Observation.code", "mustSupport": true }, + { + "id": "Observation.code.coding:loinc", + "path": "Observation.code.coding", + "sliceName": "loinc", + "mustSupport": true + }, + { + "id": "Observation.code.coding:snomed", + "path": "Observation.code.coding", + "sliceName": "snomed", + "mustSupport": true + }, { "id": "Observation.subject", "path": "Observation.subject", diff --git a/Resources/input/fsh/ISiK-Atemfrequenz.fsh b/Resources/input/fsh/ISiK-Atemfrequenz.fsh index 63bb4c3c..cc56a7aa 100644 --- a/Resources/input/fsh/ISiK-Atemfrequenz.fsh +++ b/Resources/input/fsh/ISiK-Atemfrequenz.fsh @@ -6,10 +6,9 @@ Id: ISiKAtemfrequenz * category MS * category[VSCat] MS * code MS - * coding contains snomed 0..* + * coding[loinc] MS + * coding[snomed] MS * coding[snomed] = $sct#86290005 - * system 1.. - * code 1.. * subject MS * encounter MS * effective[x] MS @@ -27,7 +26,7 @@ Usage: #example * meta.profile[+] = "http://fhir.de/StructureDefinition/observation-de-vitalsign-atemfrequenz" * status = #final * category[VSCat] = $observation-category#vital-signs "Vital Signs" -* code = $loinc#9279-1 "Respiratory rate" +* code.coding[loinc] = $loinc#9279-1 "Respiratory rate" * code.coding[snomed] = $sct#86290005 "Respiratory rate (observable entity)" * code.text = "Atemfrequenz" * subject = Reference(PatientinMusterfrau) diff --git a/Resources/input/fsh/ISiK-Blutdruck.fsh b/Resources/input/fsh/ISiK-Blutdruck.fsh index 3cd34ae7..e1eb4261 100644 --- a/Resources/input/fsh/ISiK-Blutdruck.fsh +++ b/Resources/input/fsh/ISiK-Blutdruck.fsh @@ -6,7 +6,8 @@ Id: ISiKBlutdruck * category MS * category[VSCat] MS * code MS -* code.coding MS + * coding[loinc] MS + * coding[snomed] MS * subject MS * encounter MS * effective[x] MS @@ -28,8 +29,10 @@ Usage: #example * meta.profile[0] = "http://fhir.de/StructureDefinition/observation-de-vitalsign-blutdruck" * status = #final * category[VSCat] = $observation-category#vital-signs "Vital Signs" -* code = $loinc#85354-9 "Blood pressure panel with all children optional" -* code.text = "Systolischer und Diastolischer Blutdruck" +* code + * coding[loinc] = $loinc#85354-9 "Blood pressure panel with all children optional" + * coding[snomed] = $sct#75367002 "Blood pressure (observable entity)" + * text = "Systolischer und Diastolischer Blutdruck" * subject = Reference(PatientinMusterfrau) * effectiveDateTime = "2012-09-17" * performer.reference = "Practitioner/example" diff --git a/Resources/input/fsh/ISiK-Ekg.fsh b/Resources/input/fsh/ISiK-Ekg.fsh index eb14ef84..970a98c9 100644 --- a/Resources/input/fsh/ISiK-Ekg.fsh +++ b/Resources/input/fsh/ISiK-Ekg.fsh @@ -5,6 +5,8 @@ Id: ISiKEkg * status MS * category MS * code MS + * coding[loinc] MS + * coding[snomed] MS * subject MS * effective[x] MS * device MS @@ -20,24 +22,25 @@ Id: ISiKEkg Instance: ISiKEkgExample InstanceOf: ISiKEkg Usage: #example -* meta.profile[0] = "http://fhir.de/StructureDefinition/observation-de-ekg" +* code.coding[loinc] = $loinc#11524-6 "EKG study" +* code.coding[snomed] = $sct#271921002 "Electrocardiogram finding (observable entity)" * subject = Reference(PatientinMusterfrau) * status = #final * 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" + +* component[+].code = $loinc#LP7386-8 "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 = $loinc#LP7386-6 "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 = $loinc#LP7386-4 "Lead III" * component[=].valueSampledData.origin.value = 2048 * component[=].valueSampledData.period = 10 * component[=].valueSampledData.dimensions = 1 diff --git a/Resources/input/fsh/ISiK-GCS.fsh b/Resources/input/fsh/ISiK-GCS.fsh index 613db9d4..2516c6ff 100644 --- a/Resources/input/fsh/ISiK-GCS.fsh +++ b/Resources/input/fsh/ISiK-GCS.fsh @@ -1,11 +1,13 @@ Profile: ISiKGCS -Parent: http://fhir.de/StructureDefinition/observation-de-vitalsign-gcs +Parent: ScoreDE_GCS Id: ISiKGCS * insert Meta * status MS * category MS -* category[VSCat] MS -* code MS +* category[survey] MS +* code + * coding[loinc] MS + * coding[snomed] MS * subject MS * encounter MS * effective[x] MS @@ -26,14 +28,15 @@ Instance: ISiKGCSExample InstanceOf: ISiKGCS Usage: #example * meta.profile[0] = "http://fhir.de/StructureDefinition/observation-de-vitalsign-gcs" -* code = $loinc#9269-2 "Glasgow coma score total" +* code.coding[loinc] = $loinc#9269-2 "Glasgow coma score total" +* code.coding[snomed] = $sct#248241002 "Glasgow coma score (observable entity)" * valueQuantity = 11 '1' "Punktwert" * status = #final * subject = Reference(PatientinMusterfrau) * effectiveDateTime = "2020-10-11" -* component[Eye].valueQuantity = 4 '1' "Punktwert" -* component[Eye].code.coding[0] = $loinc#9267-6 -* component[Motor].valueQuantity = 4 '1' "Punktwert" -* component[Motor].code.coding[0] = $loinc#9268-4 -* component[Verbal].valueQuantity = 3 '1' "Punktwert" -* component[Verbal].code.coding[0] = $loinc#9270-0 \ No newline at end of file +* component[Verbal].code = $loinc#9270-0 "Glasgow coma score verbal" +* component[Verbal].valueCodeableConcept = $loinc#LA6560-2 "Confused" +* component[Motor].code = $loinc#9268-4 "Glasgow coma score motor" +* component[Motor].valueCodeableConcept = $loinc#LA6566-9 "Localizing pain" +* component[Eye].code = $loinc#9267-6 "Glasgow coma score eye opening" +* component[Eye].valueCodeableConcept = $loinc#LA6555-2 "Eye opening to verbal command" \ No newline at end of file diff --git a/Resources/input/fsh/ISiK-Herzfrequenz.fsh b/Resources/input/fsh/ISiK-Herzfrequenz.fsh index 3e9f1324..b7441674 100644 --- a/Resources/input/fsh/ISiK-Herzfrequenz.fsh +++ b/Resources/input/fsh/ISiK-Herzfrequenz.fsh @@ -6,6 +6,9 @@ Id: ISiKHerzfrequenz * category MS * category[VSCat] MS * code MS + * coding[loinc] MS + * coding[snomed] MS + * coding[snomed] = $sct#364075005 * subject MS * encounter MS * effective[x] MS @@ -23,7 +26,8 @@ Usage: #example * meta.profile[+] = "http://fhir.de/StructureDefinition/observation-de-vitalsign-herzfrequenz" * status = #final * category[VSCat] = $observation-category#vital-signs -* code.coding[0] = $loinc#8867-4 "Heart rate" +* code.coding[loinc] = $loinc#8867-4 "Heart rate" +* code.coding[snomed] = $sct#364075005 "Heart rate (observable entity)" * code.text = "Herzfrequenz" * subject = Reference(PatientinMusterfrau) * effectiveDateTime = "2020-10-11" diff --git a/Resources/input/fsh/ISiK-Koerpergewicht.fsh b/Resources/input/fsh/ISiK-Koerpergewicht.fsh index 2a54af2f..31274a40 100644 --- a/Resources/input/fsh/ISiK-Koerpergewicht.fsh +++ b/Resources/input/fsh/ISiK-Koerpergewicht.fsh @@ -6,6 +6,9 @@ Id: ISiKKoerpergewicht * category MS * category[VSCat] MS * code MS + * coding[loinc] MS + * coding[snomed] MS + * coding[snomed] = $sct#27113001 * subject MS * encounter MS * effective[x] MS diff --git a/Resources/input/fsh/ISiK-Koerpergroesse.fsh b/Resources/input/fsh/ISiK-Koerpergroesse.fsh index 93ef47f5..fb3c1dd7 100644 --- a/Resources/input/fsh/ISiK-Koerpergroesse.fsh +++ b/Resources/input/fsh/ISiK-Koerpergroesse.fsh @@ -6,6 +6,9 @@ Id: ISiKKoerpergroesse * category MS * category[VSCat] MS * code MS + * coding[loinc] MS + * coding[snomed] MS + * coding[snomed] = $sct#1153637007 * subject MS * encounter MS * effective[x] MS @@ -23,8 +26,8 @@ Usage: #example * meta.profile[+] = "http://fhir.de/StructureDefinition/observation-de-vitalsign-koerpergroesse" * status = #final * category[VSCat] = $observation-category#vital-signs -* code.coding[0] = $loinc#8302-2 "Body height" -* code.coding[+] = $sct#50373000 "Body height measure" +* code.coding[loinc] = $loinc#8302-2 "Body height" +* code.coding[snomed] = $sct#1153637007 "Body height (observable entity)" * code.text = "Körpergröße" * subject = Reference(PatientinMusterfrau) * effectiveDateTime = "2020-10-11" diff --git a/Resources/input/fsh/ISiK-Koerpertemperatur.fsh b/Resources/input/fsh/ISiK-Koerpertemperatur.fsh index 85ce4d0c..e276abca 100644 --- a/Resources/input/fsh/ISiK-Koerpertemperatur.fsh +++ b/Resources/input/fsh/ISiK-Koerpertemperatur.fsh @@ -6,6 +6,9 @@ Id: ISiKKoerpertemperatur * category MS * category[VSCat] MS * code MS + * coding[loinc] MS + * coding[snomed] MS + * coding[snomed] = $sct#386725007 * subject MS * encounter MS * effective[x] MS @@ -23,7 +26,8 @@ Usage: #example * meta.profile[+] = "http://fhir.de/StructureDefinition/observation-de-vitalsign-koerpertemperatur" * status = #final * category[VSCat] = $observation-category#vital-signs -* code.coding[0] = $loinc#8310-5 "Body temperature" +* code.coding[loinc] = $loinc#8310-5 "Body temperature" +* code.coding[snomed] = $sct#386725007 "Body temperature (observable entity)" * code.text = "Körpertemperatur" * subject = Reference(PatientinMusterfrau) * effectiveDateTime = "2020-10-11" diff --git a/Resources/input/fsh/ISiK-Kopfumfang.fsh b/Resources/input/fsh/ISiK-Kopfumfang.fsh index 24955f24..3d8fd400 100644 --- a/Resources/input/fsh/ISiK-Kopfumfang.fsh +++ b/Resources/input/fsh/ISiK-Kopfumfang.fsh @@ -6,6 +6,9 @@ Id: ISiKKopfumfang * category MS * category[VSCat] MS * code MS + * coding[loinc] MS + * coding[snomed] MS + * coding[snomed] = $sct#363812007 * subject MS * encounter MS * effective[x] MS @@ -23,7 +26,8 @@ Usage: #example * meta.profile[+] = "http://fhir.de/StructureDefinition/observation-de-vitalsign-kopfumfang" * status = #final * category[VSCat] = $observation-category#vital-signs "Vital Signs" -* code = $loinc#9843-4 "Head Occipital-frontal circumference" +* code.coding[loinc] = $loinc#9843-4 "Head Occipital-frontal circumference" +* code.coding[snomed] = $sct#363812007 "Head circumference (observable entity)" * code.text = "Kopfumfang" * subject = Reference(PatientinMusterfrau) * effectiveDateTime = "2019-07-02" diff --git a/Resources/input/fsh/ISiK-Sauerstoffsaettigung.fsh b/Resources/input/fsh/ISiK-Sauerstoffsaettigung.fsh index efa20629..e8dd1b3a 100644 --- a/Resources/input/fsh/ISiK-Sauerstoffsaettigung.fsh +++ b/Resources/input/fsh/ISiK-Sauerstoffsaettigung.fsh @@ -1,11 +1,13 @@ Profile: ISiKSauerstoffsaettigung -Parent: VitalSignDE_Periphere_Artierielle_Sauerstoffsaettigung +Parent: VitalSignDE_Arterielle_Sauerstoffsaettigung Id: ISiKSauerstoffsaettigung * insert Meta * status MS * category MS * category[VSCat] MS * code MS + * coding[loinc] MS + * coding[snomed] MS * subject MS * encounter MS * effective[x] MS @@ -22,9 +24,8 @@ Usage: #example * meta.profile[0] = "http://fhir.de/StructureDefinition/observation-de-vitalsign-sauerstoffsaettigung" * status = #final * category[VSCat] = $observation-category#vital-signs -* code.coding[0] = $loinc#2708-6 "Oxygen saturation in Arterial blood" -* code.coding[+] = $sct#442476006 "Arterial oxygen saturation" -* code.coding[+] = $loinc#59408-5 "Oxygen saturation in Arterial blood by Pulse oximetry" +* 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) * effectiveDateTime = "2020-10-11" diff --git a/Resources/sushi-config.yaml b/Resources/sushi-config.yaml index 755b4e5e..1ed23b7d 100644 --- a/Resources/sushi-config.yaml +++ b/Resources/sushi-config.yaml @@ -3,5 +3,5 @@ fhirVersion: 4.0.1 FSHOnly: true applyExtensionMetadataToRoot: false dependencies: - de.basisprofil.r4: 1.5.0-alpha1 + de.basisprofil.r4: 1.5.0-alpha6 de.gematik.isik-basismodul: 3.0.0 \ No newline at end of file diff --git a/package.json b/package.json index 562b59f1..07deb465 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "4.0.1" ], "dependencies": { - "de.basisprofil.r4": "1.5.0-alpha1", + "de.basisprofil.r4": "1.5.0-alpha6", "de.gematik.isik-basismodul": "3.0.0" } } From 8f0ed8a701ab5a646bdd6afaa1c35e6ee105c31d Mon Sep 17 00:00:00 2001 From: patrick-werner Date: Thu, 1 Feb 2024 12:43:18 +0000 Subject: [PATCH 3/9] Commit from GitHub Actions (CI (FHIR Validation)) --- .../Observation-ISiKAtemfrequenzExample.json | 2 +- .../Observation-ISiKBlutdruckExample.json | 6 +-- .../resources/Observation-ISiKEkgExample.json | 2 +- .../resources/Observation-ISiKGCSExample.json | 2 +- .../Observation-ISiKHerzfrequenzExample.json | 2 +- ...Observation-ISiKKoerpergroesseExample.json | 10 ++-- ...ervation-ISiKKoerpertemperaturExample.json | 2 +- ...ation-ISiKSauerstoffsaettigungExample.json | 4 +- .../StructureDefinition-ISiKAtemfrequenz.json | 26 ++++------- .../StructureDefinition-ISiKBlutdruck.json | 20 ++------ .../StructureDefinition-ISiKEkg.json | 33 +++++++++---- .../StructureDefinition-ISiKGCS.json | 46 +++++++++++++------ .../StructureDefinition-ISiKHerzfrequenz.json | 26 ++++------- ...tructureDefinition-ISiKKoerpergewicht.json | 26 ++++------- ...tructureDefinition-ISiKKoerpergroesse.json | 26 ++++------- ...ctureDefinition-ISiKKoerpertemperatur.json | 26 ++++------- .../StructureDefinition-ISiKKopfumfang.json | 26 ++++------- ...reDefinition-ISiKSauerstoffsaettigung.json | 26 ++++------- 18 files changed, 145 insertions(+), 166 deletions(-) diff --git a/Resources/fsh-generated/resources/Observation-ISiKAtemfrequenzExample.json b/Resources/fsh-generated/resources/Observation-ISiKAtemfrequenzExample.json index 6cd5e792..1c8d0f49 100644 --- a/Resources/fsh-generated/resources/Observation-ISiKAtemfrequenzExample.json +++ b/Resources/fsh-generated/resources/Observation-ISiKAtemfrequenzExample.json @@ -36,8 +36,8 @@ }, "valueQuantity": { "system": "http://unitsofmeasure.org", - "code": "/min", "value": 26, + "code": "/min", "unit": "Atemzüge pro Minute" }, "status": "final", diff --git a/Resources/fsh-generated/resources/Observation-ISiKBlutdruckExample.json b/Resources/fsh-generated/resources/Observation-ISiKBlutdruckExample.json index f8ca5f96..92019115 100644 --- a/Resources/fsh-generated/resources/Observation-ISiKBlutdruckExample.json +++ b/Resources/fsh-generated/resources/Observation-ISiKBlutdruckExample.json @@ -26,8 +26,8 @@ "display": "Blood pressure panel with all children optional" }, { - "system": "http://snomed.info/sct", "code": "75367002", + "system": "http://snomed.info/sct", "display": "Blood pressure (observable entity)" } ], @@ -45,8 +45,8 @@ }, "valueQuantity": { "system": "http://unitsofmeasure.org", - "code": "mm[Hg]", "value": 107, + "code": "mm[Hg]", "unit": "mmHg" } }, @@ -61,8 +61,8 @@ }, "valueQuantity": { "system": "http://unitsofmeasure.org", - "code": "mm[Hg]", "value": 60, + "code": "mm[Hg]", "unit": "mmHg" } } diff --git a/Resources/fsh-generated/resources/Observation-ISiKEkgExample.json b/Resources/fsh-generated/resources/Observation-ISiKEkgExample.json index 35723fdb..fd23163e 100644 --- a/Resources/fsh-generated/resources/Observation-ISiKEkgExample.json +++ b/Resources/fsh-generated/resources/Observation-ISiKEkgExample.json @@ -14,8 +14,8 @@ "display": "EKG study" }, { - "system": "http://snomed.info/sct", "code": "271921002", + "system": "http://snomed.info/sct", "display": "Electrocardiogram finding (observable entity)" } ] diff --git a/Resources/fsh-generated/resources/Observation-ISiKGCSExample.json b/Resources/fsh-generated/resources/Observation-ISiKGCSExample.json index d474ee29..88919414 100644 --- a/Resources/fsh-generated/resources/Observation-ISiKGCSExample.json +++ b/Resources/fsh-generated/resources/Observation-ISiKGCSExample.json @@ -25,8 +25,8 @@ "display": "Glasgow coma score total" }, { - "system": "http://snomed.info/sct", "code": "248241002", + "system": "http://snomed.info/sct", "display": "Glasgow coma score (observable entity)" } ] diff --git a/Resources/fsh-generated/resources/Observation-ISiKHerzfrequenzExample.json b/Resources/fsh-generated/resources/Observation-ISiKHerzfrequenzExample.json index e3e49cb0..f7048eb0 100644 --- a/Resources/fsh-generated/resources/Observation-ISiKHerzfrequenzExample.json +++ b/Resources/fsh-generated/resources/Observation-ISiKHerzfrequenzExample.json @@ -35,8 +35,8 @@ }, "valueQuantity": { "system": "http://unitsofmeasure.org", - "code": "/min", "value": 63, + "code": "/min", "unit": "per minute" }, "status": "final", diff --git a/Resources/fsh-generated/resources/Observation-ISiKKoerpergroesseExample.json b/Resources/fsh-generated/resources/Observation-ISiKKoerpergroesseExample.json index 4e9f2996..6c31dd68 100644 --- a/Resources/fsh-generated/resources/Observation-ISiKKoerpergroesseExample.json +++ b/Resources/fsh-generated/resources/Observation-ISiKKoerpergroesseExample.json @@ -20,11 +20,6 @@ ], "code": { "coding": [ - { - "code": "1153637007", - "system": "http://snomed.info/sct", - "display": "Body height (observable entity)" - }, { "system": "http://loinc.org", "code": "8302-2" @@ -33,6 +28,11 @@ "code": "8302-2", "system": "http://loinc.org", "display": "Body height" + }, + { + "code": "1153637007", + "system": "http://snomed.info/sct", + "display": "Body height (observable entity)" } ], "text": "Körpergröße" diff --git a/Resources/fsh-generated/resources/Observation-ISiKKoerpertemperaturExample.json b/Resources/fsh-generated/resources/Observation-ISiKKoerpertemperaturExample.json index 1d9d3dfd..beacf1b1 100644 --- a/Resources/fsh-generated/resources/Observation-ISiKKoerpertemperaturExample.json +++ b/Resources/fsh-generated/resources/Observation-ISiKKoerpertemperaturExample.json @@ -35,8 +35,8 @@ }, "valueQuantity": { "system": "http://unitsofmeasure.org", - "code": "Cel", "value": 36.8, + "code": "Cel", "unit": "°C" }, "status": "final", diff --git a/Resources/fsh-generated/resources/Observation-ISiKSauerstoffsaettigungExample.json b/Resources/fsh-generated/resources/Observation-ISiKSauerstoffsaettigungExample.json index dc45da16..77279a8c 100644 --- a/Resources/fsh-generated/resources/Observation-ISiKSauerstoffsaettigungExample.json +++ b/Resources/fsh-generated/resources/Observation-ISiKSauerstoffsaettigungExample.json @@ -25,8 +25,8 @@ "display": "Oxygen saturation in Arterial blood" }, { - "system": "http://snomed.info/sct", "code": "442476006", + "system": "http://snomed.info/sct", "display": "Arterial oxygen saturation" } ], @@ -34,8 +34,8 @@ }, "valueQuantity": { "system": "http://unitsofmeasure.org", - "code": "%", "value": 98, + "code": "%", "unit": "%" }, "component": [ diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKAtemfrequenz.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKAtemfrequenz.json index 53eaa989..2f228ff0 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKAtemfrequenz.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKAtemfrequenz.json @@ -106,34 +106,28 @@ "mustSupport": true }, { - "id": "Observation.value[x]:valueQuantity", - "path": "Observation.value[x]", - "sliceName": "valueQuantity", - "type": [ - { - "code": "Quantity" - } - ], + "id": "Observation.valueQuantity", + "path": "Observation.valueQuantity", "mustSupport": true }, { - "id": "Observation.value[x]:valueQuantity.value", - "path": "Observation.value[x].value", + "id": "Observation.valueQuantity.value", + "path": "Observation.valueQuantity.value", "mustSupport": true }, { - "id": "Observation.value[x]:valueQuantity.unit", - "path": "Observation.value[x].unit", + "id": "Observation.valueQuantity.unit", + "path": "Observation.valueQuantity.unit", "mustSupport": true }, { - "id": "Observation.value[x]:valueQuantity.system", - "path": "Observation.value[x].system", + "id": "Observation.valueQuantity.system", + "path": "Observation.valueQuantity.system", "mustSupport": true }, { - "id": "Observation.value[x]:valueQuantity.code", - "path": "Observation.value[x].code", + "id": "Observation.valueQuantity.code", + "path": "Observation.valueQuantity.code", "mustSupport": true } ] diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKBlutdruck.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKBlutdruck.json index 00df1b3c..43612c66 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKBlutdruck.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKBlutdruck.json @@ -123,14 +123,8 @@ "mustSupport": true }, { - "id": "Observation.component:SystolicBP.value[x]:valueQuantity", - "path": "Observation.component.value[x]", - "sliceName": "valueQuantity", - "type": [ - { - "code": "Quantity" - } - ], + "id": "Observation.component:SystolicBP.valueQuantity", + "path": "Observation.component.valueQuantity", "mustSupport": true }, { @@ -155,14 +149,8 @@ "mustSupport": true }, { - "id": "Observation.component:DiastolicBP.value[x]:valueQuantity", - "path": "Observation.component.value[x]", - "sliceName": "valueQuantity", - "type": [ - { - "code": "Quantity" - } - ], + "id": "Observation.component:DiastolicBP.valueQuantity", + "path": "Observation.component.valueQuantity", "mustSupport": true } ] diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKEkg.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKEkg.json index 01e55dc9..9a99be41 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKEkg.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKEkg.json @@ -98,26 +98,43 @@ { "id": "Observation.component.value[x]", "path": "Observation.component.value[x]", + "slicing": { + "discriminator": [ + { + "type": "type", + "path": "$this" + } + ], + "ordered": false, + "rules": "open" + }, "mustSupport": true }, { - "id": "Observation.component.value[x].origin", - "path": "Observation.component.value[x].origin", + "id": "Observation.component.valueSampledData", + "path": "Observation.component.valueSampledData", + "min": 1, + "max": "1", "mustSupport": true }, { - "id": "Observation.component.value[x].period", - "path": "Observation.component.value[x].period", + "id": "Observation.component.valueSampledData.origin", + "path": "Observation.component.valueSampledData.origin", "mustSupport": true }, { - "id": "Observation.component.value[x].dimensions", - "path": "Observation.component.value[x].dimensions", + "id": "Observation.component.valueSampledData.period", + "path": "Observation.component.valueSampledData.period", "mustSupport": true }, { - "id": "Observation.component.value[x].data", - "path": "Observation.component.value[x].data", + "id": "Observation.component.valueSampledData.dimensions", + "path": "Observation.component.valueSampledData.dimensions", + "mustSupport": true + }, + { + "id": "Observation.component.valueSampledData.data", + "path": "Observation.component.valueSampledData.data", "mustSupport": true } ] diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKGCS.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKGCS.json index a0f5068a..a5bc7dba 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKGCS.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKGCS.json @@ -94,21 +94,38 @@ { "id": "Observation.value[x]", "path": "Observation.value[x]", + "slicing": { + "discriminator": [ + { + "type": "type", + "path": "$this" + } + ], + "ordered": false, + "rules": "open" + }, "mustSupport": true }, { - "id": "Observation.value[x].value", - "path": "Observation.value[x].value", + "id": "Observation.valueQuantity", + "path": "Observation.valueQuantity", + "min": 1, + "max": "1", "mustSupport": true }, { - "id": "Observation.value[x].system", - "path": "Observation.value[x].system", + "id": "Observation.valueQuantity.value", + "path": "Observation.valueQuantity.value", "mustSupport": true }, { - "id": "Observation.value[x].code", - "path": "Observation.value[x].code", + "id": "Observation.valueQuantity.system", + "path": "Observation.valueQuantity.system", + "mustSupport": true + }, + { + "id": "Observation.valueQuantity.code", + "path": "Observation.valueQuantity.code", "mustSupport": true }, { @@ -137,9 +154,8 @@ "mustSupport": true }, { - "id": "Observation.component.value[x]:valueQuantity", - "path": "Observation.component.value[x]", - "sliceName": "valueQuantity", + "id": "Observation.component.valueQuantity", + "path": "Observation.component.valueQuantity", "min": 0, "max": "1", "type": [ @@ -150,18 +166,18 @@ "mustSupport": true }, { - "id": "Observation.component.value[x]:valueQuantity.unit", - "path": "Observation.component.value[x].unit", + "id": "Observation.component.valueQuantity.unit", + "path": "Observation.component.valueQuantity.unit", "mustSupport": true }, { - "id": "Observation.component.value[x]:valueQuantity.system", - "path": "Observation.component.value[x].system", + "id": "Observation.component.valueQuantity.system", + "path": "Observation.component.valueQuantity.system", "mustSupport": true }, { - "id": "Observation.component.value[x]:valueQuantity.code", - "path": "Observation.component.value[x].code", + "id": "Observation.component.valueQuantity.code", + "path": "Observation.component.valueQuantity.code", "mustSupport": true }, { diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKHerzfrequenz.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKHerzfrequenz.json index f5a36029..66847875 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKHerzfrequenz.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKHerzfrequenz.json @@ -106,34 +106,28 @@ "mustSupport": true }, { - "id": "Observation.value[x]:valueQuantity", - "path": "Observation.value[x]", - "sliceName": "valueQuantity", - "type": [ - { - "code": "Quantity" - } - ], + "id": "Observation.valueQuantity", + "path": "Observation.valueQuantity", "mustSupport": true }, { - "id": "Observation.value[x]:valueQuantity.value", - "path": "Observation.value[x].value", + "id": "Observation.valueQuantity.value", + "path": "Observation.valueQuantity.value", "mustSupport": true }, { - "id": "Observation.value[x]:valueQuantity.unit", - "path": "Observation.value[x].unit", + "id": "Observation.valueQuantity.unit", + "path": "Observation.valueQuantity.unit", "mustSupport": true }, { - "id": "Observation.value[x]:valueQuantity.system", - "path": "Observation.value[x].system", + "id": "Observation.valueQuantity.system", + "path": "Observation.valueQuantity.system", "mustSupport": true }, { - "id": "Observation.value[x]:valueQuantity.code", - "path": "Observation.value[x].code", + "id": "Observation.valueQuantity.code", + "path": "Observation.valueQuantity.code", "mustSupport": true } ] diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpergewicht.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpergewicht.json index b0457091..1fa6e301 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpergewicht.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpergewicht.json @@ -106,34 +106,28 @@ "mustSupport": true }, { - "id": "Observation.value[x]:valueQuantity", - "path": "Observation.value[x]", - "sliceName": "valueQuantity", - "type": [ - { - "code": "Quantity" - } - ], + "id": "Observation.valueQuantity", + "path": "Observation.valueQuantity", "mustSupport": true }, { - "id": "Observation.value[x]:valueQuantity.value", - "path": "Observation.value[x].value", + "id": "Observation.valueQuantity.value", + "path": "Observation.valueQuantity.value", "mustSupport": true }, { - "id": "Observation.value[x]:valueQuantity.unit", - "path": "Observation.value[x].unit", + "id": "Observation.valueQuantity.unit", + "path": "Observation.valueQuantity.unit", "mustSupport": true }, { - "id": "Observation.value[x]:valueQuantity.system", - "path": "Observation.value[x].system", + "id": "Observation.valueQuantity.system", + "path": "Observation.valueQuantity.system", "mustSupport": true }, { - "id": "Observation.value[x]:valueQuantity.code", - "path": "Observation.value[x].code", + "id": "Observation.valueQuantity.code", + "path": "Observation.valueQuantity.code", "mustSupport": true } ] diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpergroesse.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpergroesse.json index fe65d21e..16f48c38 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpergroesse.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpergroesse.json @@ -106,34 +106,28 @@ "mustSupport": true }, { - "id": "Observation.value[x]:valueQuantity", - "path": "Observation.value[x]", - "sliceName": "valueQuantity", - "type": [ - { - "code": "Quantity" - } - ], + "id": "Observation.valueQuantity", + "path": "Observation.valueQuantity", "mustSupport": true }, { - "id": "Observation.value[x]:valueQuantity.value", - "path": "Observation.value[x].value", + "id": "Observation.valueQuantity.value", + "path": "Observation.valueQuantity.value", "mustSupport": true }, { - "id": "Observation.value[x]:valueQuantity.unit", - "path": "Observation.value[x].unit", + "id": "Observation.valueQuantity.unit", + "path": "Observation.valueQuantity.unit", "mustSupport": true }, { - "id": "Observation.value[x]:valueQuantity.system", - "path": "Observation.value[x].system", + "id": "Observation.valueQuantity.system", + "path": "Observation.valueQuantity.system", "mustSupport": true }, { - "id": "Observation.value[x]:valueQuantity.code", - "path": "Observation.value[x].code", + "id": "Observation.valueQuantity.code", + "path": "Observation.valueQuantity.code", "mustSupport": true } ] diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpertemperatur.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpertemperatur.json index 188ab992..da58c9a3 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpertemperatur.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpertemperatur.json @@ -106,34 +106,28 @@ "mustSupport": true }, { - "id": "Observation.value[x]:valueQuantity", - "path": "Observation.value[x]", - "sliceName": "valueQuantity", - "type": [ - { - "code": "Quantity" - } - ], + "id": "Observation.valueQuantity", + "path": "Observation.valueQuantity", "mustSupport": true }, { - "id": "Observation.value[x]:valueQuantity.value", - "path": "Observation.value[x].value", + "id": "Observation.valueQuantity.value", + "path": "Observation.valueQuantity.value", "mustSupport": true }, { - "id": "Observation.value[x]:valueQuantity.unit", - "path": "Observation.value[x].unit", + "id": "Observation.valueQuantity.unit", + "path": "Observation.valueQuantity.unit", "mustSupport": true }, { - "id": "Observation.value[x]:valueQuantity.system", - "path": "Observation.value[x].system", + "id": "Observation.valueQuantity.system", + "path": "Observation.valueQuantity.system", "mustSupport": true }, { - "id": "Observation.value[x]:valueQuantity.code", - "path": "Observation.value[x].code", + "id": "Observation.valueQuantity.code", + "path": "Observation.valueQuantity.code", "mustSupport": true } ] diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKKopfumfang.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKKopfumfang.json index 568e8872..dd37b9b7 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKKopfumfang.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKKopfumfang.json @@ -106,34 +106,28 @@ "mustSupport": true }, { - "id": "Observation.value[x]:valueQuantity", - "path": "Observation.value[x]", - "sliceName": "valueQuantity", - "type": [ - { - "code": "Quantity" - } - ], + "id": "Observation.valueQuantity", + "path": "Observation.valueQuantity", "mustSupport": true }, { - "id": "Observation.value[x]:valueQuantity.value", - "path": "Observation.value[x].value", + "id": "Observation.valueQuantity.value", + "path": "Observation.valueQuantity.value", "mustSupport": true }, { - "id": "Observation.value[x]:valueQuantity.unit", - "path": "Observation.value[x].unit", + "id": "Observation.valueQuantity.unit", + "path": "Observation.valueQuantity.unit", "mustSupport": true }, { - "id": "Observation.value[x]:valueQuantity.system", - "path": "Observation.value[x].system", + "id": "Observation.valueQuantity.system", + "path": "Observation.valueQuantity.system", "mustSupport": true }, { - "id": "Observation.value[x]:valueQuantity.code", - "path": "Observation.value[x].code", + "id": "Observation.valueQuantity.code", + "path": "Observation.valueQuantity.code", "mustSupport": true } ] diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKSauerstoffsaettigung.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKSauerstoffsaettigung.json index 5dcff85c..9da81861 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKSauerstoffsaettigung.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKSauerstoffsaettigung.json @@ -102,34 +102,28 @@ "mustSupport": true }, { - "id": "Observation.value[x]:valueQuantity", - "path": "Observation.value[x]", - "sliceName": "valueQuantity", - "type": [ - { - "code": "Quantity" - } - ], + "id": "Observation.valueQuantity", + "path": "Observation.valueQuantity", "mustSupport": true }, { - "id": "Observation.value[x]:valueQuantity.value", - "path": "Observation.value[x].value", + "id": "Observation.valueQuantity.value", + "path": "Observation.valueQuantity.value", "mustSupport": true }, { - "id": "Observation.value[x]:valueQuantity.unit", - "path": "Observation.value[x].unit", + "id": "Observation.valueQuantity.unit", + "path": "Observation.valueQuantity.unit", "mustSupport": true }, { - "id": "Observation.value[x]:valueQuantity.system", - "path": "Observation.value[x].system", + "id": "Observation.valueQuantity.system", + "path": "Observation.valueQuantity.system", "mustSupport": true }, { - "id": "Observation.value[x]:valueQuantity.code", - "path": "Observation.value[x].code", + "id": "Observation.valueQuantity.code", + "path": "Observation.valueQuantity.code", "mustSupport": true } ] From c86d495e16e0aa6f971008796df1066183a6db38 Mon Sep 17 00:00:00 2001 From: patrick-werner Date: Thu, 1 Feb 2024 13:49:05 +0100 Subject: [PATCH 4/9] fix: commited updated GCS profile json --- .../fsh-generated/resources/StructureDefinition-ISiKGCS.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKGCS.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKGCS.json index a0f5068a..4e94f54c 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.0", + "version": "4.0.0-rc", "name": "ISiKGCS", "status": "active", "experimental": false, - "date": "2023-07-01", + "date": "2024-02-01", "publisher": "gematik GmbH", "fhirVersion": "4.0.1", "mapping": [ From 3dd4cccd03df89551f7f3a1759dfe73c53eae7f7 Mon Sep 17 00:00:00 2001 From: patrick-werner Date: Thu, 1 Feb 2024 12:51:19 +0000 Subject: [PATCH 5/9] auto-generated FHIR files by GitHub Actions (CI FSH to FHIR Validation) --- .../Observation-ISiKAtemfrequenzExample.json | 2 +- .../Observation-ISiKBlutdruckExample.json | 6 +-- .../resources/Observation-ISiKEkgExample.json | 2 +- .../resources/Observation-ISiKGCSExample.json | 2 +- .../Observation-ISiKHerzfrequenzExample.json | 2 +- ...Observation-ISiKKoerpergroesseExample.json | 10 ++-- ...ervation-ISiKKoerpertemperaturExample.json | 2 +- ...ation-ISiKSauerstoffsaettigungExample.json | 4 +- .../StructureDefinition-ISiKAtemfrequenz.json | 26 +++++++---- .../StructureDefinition-ISiKBlutdruck.json | 20 ++++++-- .../StructureDefinition-ISiKEkg.json | 33 ++++--------- .../StructureDefinition-ISiKGCS.json | 46 ++++++------------- .../StructureDefinition-ISiKHerzfrequenz.json | 26 +++++++---- ...tructureDefinition-ISiKKoerpergewicht.json | 26 +++++++---- ...tructureDefinition-ISiKKoerpergroesse.json | 26 +++++++---- ...ctureDefinition-ISiKKoerpertemperatur.json | 26 +++++++---- .../StructureDefinition-ISiKKopfumfang.json | 26 +++++++---- ...reDefinition-ISiKSauerstoffsaettigung.json | 26 +++++++---- 18 files changed, 166 insertions(+), 145 deletions(-) diff --git a/Resources/fsh-generated/resources/Observation-ISiKAtemfrequenzExample.json b/Resources/fsh-generated/resources/Observation-ISiKAtemfrequenzExample.json index 1c8d0f49..6cd5e792 100644 --- a/Resources/fsh-generated/resources/Observation-ISiKAtemfrequenzExample.json +++ b/Resources/fsh-generated/resources/Observation-ISiKAtemfrequenzExample.json @@ -36,8 +36,8 @@ }, "valueQuantity": { "system": "http://unitsofmeasure.org", - "value": 26, "code": "/min", + "value": 26, "unit": "Atemzüge pro Minute" }, "status": "final", diff --git a/Resources/fsh-generated/resources/Observation-ISiKBlutdruckExample.json b/Resources/fsh-generated/resources/Observation-ISiKBlutdruckExample.json index 92019115..f8ca5f96 100644 --- a/Resources/fsh-generated/resources/Observation-ISiKBlutdruckExample.json +++ b/Resources/fsh-generated/resources/Observation-ISiKBlutdruckExample.json @@ -26,8 +26,8 @@ "display": "Blood pressure panel with all children optional" }, { - "code": "75367002", "system": "http://snomed.info/sct", + "code": "75367002", "display": "Blood pressure (observable entity)" } ], @@ -45,8 +45,8 @@ }, "valueQuantity": { "system": "http://unitsofmeasure.org", - "value": 107, "code": "mm[Hg]", + "value": 107, "unit": "mmHg" } }, @@ -61,8 +61,8 @@ }, "valueQuantity": { "system": "http://unitsofmeasure.org", - "value": 60, "code": "mm[Hg]", + "value": 60, "unit": "mmHg" } } diff --git a/Resources/fsh-generated/resources/Observation-ISiKEkgExample.json b/Resources/fsh-generated/resources/Observation-ISiKEkgExample.json index fd23163e..35723fdb 100644 --- a/Resources/fsh-generated/resources/Observation-ISiKEkgExample.json +++ b/Resources/fsh-generated/resources/Observation-ISiKEkgExample.json @@ -14,8 +14,8 @@ "display": "EKG study" }, { - "code": "271921002", "system": "http://snomed.info/sct", + "code": "271921002", "display": "Electrocardiogram finding (observable entity)" } ] diff --git a/Resources/fsh-generated/resources/Observation-ISiKGCSExample.json b/Resources/fsh-generated/resources/Observation-ISiKGCSExample.json index 88919414..d474ee29 100644 --- a/Resources/fsh-generated/resources/Observation-ISiKGCSExample.json +++ b/Resources/fsh-generated/resources/Observation-ISiKGCSExample.json @@ -25,8 +25,8 @@ "display": "Glasgow coma score total" }, { - "code": "248241002", "system": "http://snomed.info/sct", + "code": "248241002", "display": "Glasgow coma score (observable entity)" } ] diff --git a/Resources/fsh-generated/resources/Observation-ISiKHerzfrequenzExample.json b/Resources/fsh-generated/resources/Observation-ISiKHerzfrequenzExample.json index f7048eb0..e3e49cb0 100644 --- a/Resources/fsh-generated/resources/Observation-ISiKHerzfrequenzExample.json +++ b/Resources/fsh-generated/resources/Observation-ISiKHerzfrequenzExample.json @@ -35,8 +35,8 @@ }, "valueQuantity": { "system": "http://unitsofmeasure.org", - "value": 63, "code": "/min", + "value": 63, "unit": "per minute" }, "status": "final", diff --git a/Resources/fsh-generated/resources/Observation-ISiKKoerpergroesseExample.json b/Resources/fsh-generated/resources/Observation-ISiKKoerpergroesseExample.json index 6c31dd68..4e9f2996 100644 --- a/Resources/fsh-generated/resources/Observation-ISiKKoerpergroesseExample.json +++ b/Resources/fsh-generated/resources/Observation-ISiKKoerpergroesseExample.json @@ -20,6 +20,11 @@ ], "code": { "coding": [ + { + "code": "1153637007", + "system": "http://snomed.info/sct", + "display": "Body height (observable entity)" + }, { "system": "http://loinc.org", "code": "8302-2" @@ -28,11 +33,6 @@ "code": "8302-2", "system": "http://loinc.org", "display": "Body height" - }, - { - "code": "1153637007", - "system": "http://snomed.info/sct", - "display": "Body height (observable entity)" } ], "text": "Körpergröße" diff --git a/Resources/fsh-generated/resources/Observation-ISiKKoerpertemperaturExample.json b/Resources/fsh-generated/resources/Observation-ISiKKoerpertemperaturExample.json index beacf1b1..1d9d3dfd 100644 --- a/Resources/fsh-generated/resources/Observation-ISiKKoerpertemperaturExample.json +++ b/Resources/fsh-generated/resources/Observation-ISiKKoerpertemperaturExample.json @@ -35,8 +35,8 @@ }, "valueQuantity": { "system": "http://unitsofmeasure.org", - "value": 36.8, "code": "Cel", + "value": 36.8, "unit": "°C" }, "status": "final", diff --git a/Resources/fsh-generated/resources/Observation-ISiKSauerstoffsaettigungExample.json b/Resources/fsh-generated/resources/Observation-ISiKSauerstoffsaettigungExample.json index 77279a8c..dc45da16 100644 --- a/Resources/fsh-generated/resources/Observation-ISiKSauerstoffsaettigungExample.json +++ b/Resources/fsh-generated/resources/Observation-ISiKSauerstoffsaettigungExample.json @@ -25,8 +25,8 @@ "display": "Oxygen saturation in Arterial blood" }, { - "code": "442476006", "system": "http://snomed.info/sct", + "code": "442476006", "display": "Arterial oxygen saturation" } ], @@ -34,8 +34,8 @@ }, "valueQuantity": { "system": "http://unitsofmeasure.org", - "value": 98, "code": "%", + "value": 98, "unit": "%" }, "component": [ diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKAtemfrequenz.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKAtemfrequenz.json index ae764cf7..b812ff46 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKAtemfrequenz.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKAtemfrequenz.json @@ -106,28 +106,34 @@ "mustSupport": true }, { - "id": "Observation.valueQuantity", - "path": "Observation.valueQuantity", + "id": "Observation.value[x]:valueQuantity", + "path": "Observation.value[x]", + "sliceName": "valueQuantity", + "type": [ + { + "code": "Quantity" + } + ], "mustSupport": true }, { - "id": "Observation.valueQuantity.value", - "path": "Observation.valueQuantity.value", + "id": "Observation.value[x]:valueQuantity.value", + "path": "Observation.value[x].value", "mustSupport": true }, { - "id": "Observation.valueQuantity.unit", - "path": "Observation.valueQuantity.unit", + "id": "Observation.value[x]:valueQuantity.unit", + "path": "Observation.value[x].unit", "mustSupport": true }, { - "id": "Observation.valueQuantity.system", - "path": "Observation.valueQuantity.system", + "id": "Observation.value[x]:valueQuantity.system", + "path": "Observation.value[x].system", "mustSupport": true }, { - "id": "Observation.valueQuantity.code", - "path": "Observation.valueQuantity.code", + "id": "Observation.value[x]:valueQuantity.code", + "path": "Observation.value[x].code", "mustSupport": true } ] diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKBlutdruck.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKBlutdruck.json index 1b4d1260..b43b8534 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKBlutdruck.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKBlutdruck.json @@ -123,8 +123,14 @@ "mustSupport": true }, { - "id": "Observation.component:SystolicBP.valueQuantity", - "path": "Observation.component.valueQuantity", + "id": "Observation.component:SystolicBP.value[x]:valueQuantity", + "path": "Observation.component.value[x]", + "sliceName": "valueQuantity", + "type": [ + { + "code": "Quantity" + } + ], "mustSupport": true }, { @@ -149,8 +155,14 @@ "mustSupport": true }, { - "id": "Observation.component:DiastolicBP.valueQuantity", - "path": "Observation.component.valueQuantity", + "id": "Observation.component:DiastolicBP.value[x]:valueQuantity", + "path": "Observation.component.value[x]", + "sliceName": "valueQuantity", + "type": [ + { + "code": "Quantity" + } + ], "mustSupport": true } ] diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKEkg.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKEkg.json index 39185400..86bcb908 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKEkg.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKEkg.json @@ -98,43 +98,26 @@ { "id": "Observation.component.value[x]", "path": "Observation.component.value[x]", - "slicing": { - "discriminator": [ - { - "type": "type", - "path": "$this" - } - ], - "ordered": false, - "rules": "open" - }, "mustSupport": true }, { - "id": "Observation.component.valueSampledData", - "path": "Observation.component.valueSampledData", - "min": 1, - "max": "1", + "id": "Observation.component.value[x].origin", + "path": "Observation.component.value[x].origin", "mustSupport": true }, { - "id": "Observation.component.valueSampledData.origin", - "path": "Observation.component.valueSampledData.origin", + "id": "Observation.component.value[x].period", + "path": "Observation.component.value[x].period", "mustSupport": true }, { - "id": "Observation.component.valueSampledData.period", - "path": "Observation.component.valueSampledData.period", + "id": "Observation.component.value[x].dimensions", + "path": "Observation.component.value[x].dimensions", "mustSupport": true }, { - "id": "Observation.component.valueSampledData.dimensions", - "path": "Observation.component.valueSampledData.dimensions", - "mustSupport": true - }, - { - "id": "Observation.component.valueSampledData.data", - "path": "Observation.component.valueSampledData.data", + "id": "Observation.component.value[x].data", + "path": "Observation.component.value[x].data", "mustSupport": true } ] diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKGCS.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKGCS.json index f1702cd5..4e94f54c 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKGCS.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKGCS.json @@ -94,38 +94,21 @@ { "id": "Observation.value[x]", "path": "Observation.value[x]", - "slicing": { - "discriminator": [ - { - "type": "type", - "path": "$this" - } - ], - "ordered": false, - "rules": "open" - }, "mustSupport": true }, { - "id": "Observation.valueQuantity", - "path": "Observation.valueQuantity", - "min": 1, - "max": "1", + "id": "Observation.value[x].value", + "path": "Observation.value[x].value", "mustSupport": true }, { - "id": "Observation.valueQuantity.value", - "path": "Observation.valueQuantity.value", + "id": "Observation.value[x].system", + "path": "Observation.value[x].system", "mustSupport": true }, { - "id": "Observation.valueQuantity.system", - "path": "Observation.valueQuantity.system", - "mustSupport": true - }, - { - "id": "Observation.valueQuantity.code", - "path": "Observation.valueQuantity.code", + "id": "Observation.value[x].code", + "path": "Observation.value[x].code", "mustSupport": true }, { @@ -154,8 +137,9 @@ "mustSupport": true }, { - "id": "Observation.component.valueQuantity", - "path": "Observation.component.valueQuantity", + "id": "Observation.component.value[x]:valueQuantity", + "path": "Observation.component.value[x]", + "sliceName": "valueQuantity", "min": 0, "max": "1", "type": [ @@ -166,18 +150,18 @@ "mustSupport": true }, { - "id": "Observation.component.valueQuantity.unit", - "path": "Observation.component.valueQuantity.unit", + "id": "Observation.component.value[x]:valueQuantity.unit", + "path": "Observation.component.value[x].unit", "mustSupport": true }, { - "id": "Observation.component.valueQuantity.system", - "path": "Observation.component.valueQuantity.system", + "id": "Observation.component.value[x]:valueQuantity.system", + "path": "Observation.component.value[x].system", "mustSupport": true }, { - "id": "Observation.component.valueQuantity.code", - "path": "Observation.component.valueQuantity.code", + "id": "Observation.component.value[x]:valueQuantity.code", + "path": "Observation.component.value[x].code", "mustSupport": true }, { diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKHerzfrequenz.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKHerzfrequenz.json index af0fbcf5..3159740e 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKHerzfrequenz.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKHerzfrequenz.json @@ -106,28 +106,34 @@ "mustSupport": true }, { - "id": "Observation.valueQuantity", - "path": "Observation.valueQuantity", + "id": "Observation.value[x]:valueQuantity", + "path": "Observation.value[x]", + "sliceName": "valueQuantity", + "type": [ + { + "code": "Quantity" + } + ], "mustSupport": true }, { - "id": "Observation.valueQuantity.value", - "path": "Observation.valueQuantity.value", + "id": "Observation.value[x]:valueQuantity.value", + "path": "Observation.value[x].value", "mustSupport": true }, { - "id": "Observation.valueQuantity.unit", - "path": "Observation.valueQuantity.unit", + "id": "Observation.value[x]:valueQuantity.unit", + "path": "Observation.value[x].unit", "mustSupport": true }, { - "id": "Observation.valueQuantity.system", - "path": "Observation.valueQuantity.system", + "id": "Observation.value[x]:valueQuantity.system", + "path": "Observation.value[x].system", "mustSupport": true }, { - "id": "Observation.valueQuantity.code", - "path": "Observation.valueQuantity.code", + "id": "Observation.value[x]:valueQuantity.code", + "path": "Observation.value[x].code", "mustSupport": true } ] diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpergewicht.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpergewicht.json index d3ffcc58..6444a1cf 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpergewicht.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpergewicht.json @@ -106,28 +106,34 @@ "mustSupport": true }, { - "id": "Observation.valueQuantity", - "path": "Observation.valueQuantity", + "id": "Observation.value[x]:valueQuantity", + "path": "Observation.value[x]", + "sliceName": "valueQuantity", + "type": [ + { + "code": "Quantity" + } + ], "mustSupport": true }, { - "id": "Observation.valueQuantity.value", - "path": "Observation.valueQuantity.value", + "id": "Observation.value[x]:valueQuantity.value", + "path": "Observation.value[x].value", "mustSupport": true }, { - "id": "Observation.valueQuantity.unit", - "path": "Observation.valueQuantity.unit", + "id": "Observation.value[x]:valueQuantity.unit", + "path": "Observation.value[x].unit", "mustSupport": true }, { - "id": "Observation.valueQuantity.system", - "path": "Observation.valueQuantity.system", + "id": "Observation.value[x]:valueQuantity.system", + "path": "Observation.value[x].system", "mustSupport": true }, { - "id": "Observation.valueQuantity.code", - "path": "Observation.valueQuantity.code", + "id": "Observation.value[x]:valueQuantity.code", + "path": "Observation.value[x].code", "mustSupport": true } ] diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpergroesse.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpergroesse.json index 2d1c6507..c9e5d0f1 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpergroesse.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpergroesse.json @@ -106,28 +106,34 @@ "mustSupport": true }, { - "id": "Observation.valueQuantity", - "path": "Observation.valueQuantity", + "id": "Observation.value[x]:valueQuantity", + "path": "Observation.value[x]", + "sliceName": "valueQuantity", + "type": [ + { + "code": "Quantity" + } + ], "mustSupport": true }, { - "id": "Observation.valueQuantity.value", - "path": "Observation.valueQuantity.value", + "id": "Observation.value[x]:valueQuantity.value", + "path": "Observation.value[x].value", "mustSupport": true }, { - "id": "Observation.valueQuantity.unit", - "path": "Observation.valueQuantity.unit", + "id": "Observation.value[x]:valueQuantity.unit", + "path": "Observation.value[x].unit", "mustSupport": true }, { - "id": "Observation.valueQuantity.system", - "path": "Observation.valueQuantity.system", + "id": "Observation.value[x]:valueQuantity.system", + "path": "Observation.value[x].system", "mustSupport": true }, { - "id": "Observation.valueQuantity.code", - "path": "Observation.valueQuantity.code", + "id": "Observation.value[x]:valueQuantity.code", + "path": "Observation.value[x].code", "mustSupport": true } ] diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpertemperatur.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpertemperatur.json index 8b8d3237..1c8946de 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpertemperatur.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpertemperatur.json @@ -106,28 +106,34 @@ "mustSupport": true }, { - "id": "Observation.valueQuantity", - "path": "Observation.valueQuantity", + "id": "Observation.value[x]:valueQuantity", + "path": "Observation.value[x]", + "sliceName": "valueQuantity", + "type": [ + { + "code": "Quantity" + } + ], "mustSupport": true }, { - "id": "Observation.valueQuantity.value", - "path": "Observation.valueQuantity.value", + "id": "Observation.value[x]:valueQuantity.value", + "path": "Observation.value[x].value", "mustSupport": true }, { - "id": "Observation.valueQuantity.unit", - "path": "Observation.valueQuantity.unit", + "id": "Observation.value[x]:valueQuantity.unit", + "path": "Observation.value[x].unit", "mustSupport": true }, { - "id": "Observation.valueQuantity.system", - "path": "Observation.valueQuantity.system", + "id": "Observation.value[x]:valueQuantity.system", + "path": "Observation.value[x].system", "mustSupport": true }, { - "id": "Observation.valueQuantity.code", - "path": "Observation.valueQuantity.code", + "id": "Observation.value[x]:valueQuantity.code", + "path": "Observation.value[x].code", "mustSupport": true } ] diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKKopfumfang.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKKopfumfang.json index c2191cd2..d6893a13 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKKopfumfang.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKKopfumfang.json @@ -106,28 +106,34 @@ "mustSupport": true }, { - "id": "Observation.valueQuantity", - "path": "Observation.valueQuantity", + "id": "Observation.value[x]:valueQuantity", + "path": "Observation.value[x]", + "sliceName": "valueQuantity", + "type": [ + { + "code": "Quantity" + } + ], "mustSupport": true }, { - "id": "Observation.valueQuantity.value", - "path": "Observation.valueQuantity.value", + "id": "Observation.value[x]:valueQuantity.value", + "path": "Observation.value[x].value", "mustSupport": true }, { - "id": "Observation.valueQuantity.unit", - "path": "Observation.valueQuantity.unit", + "id": "Observation.value[x]:valueQuantity.unit", + "path": "Observation.value[x].unit", "mustSupport": true }, { - "id": "Observation.valueQuantity.system", - "path": "Observation.valueQuantity.system", + "id": "Observation.value[x]:valueQuantity.system", + "path": "Observation.value[x].system", "mustSupport": true }, { - "id": "Observation.valueQuantity.code", - "path": "Observation.valueQuantity.code", + "id": "Observation.value[x]:valueQuantity.code", + "path": "Observation.value[x].code", "mustSupport": true } ] diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKSauerstoffsaettigung.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKSauerstoffsaettigung.json index bee8e0d6..c40c2767 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKSauerstoffsaettigung.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKSauerstoffsaettigung.json @@ -102,28 +102,34 @@ "mustSupport": true }, { - "id": "Observation.valueQuantity", - "path": "Observation.valueQuantity", + "id": "Observation.value[x]:valueQuantity", + "path": "Observation.value[x]", + "sliceName": "valueQuantity", + "type": [ + { + "code": "Quantity" + } + ], "mustSupport": true }, { - "id": "Observation.valueQuantity.value", - "path": "Observation.valueQuantity.value", + "id": "Observation.value[x]:valueQuantity.value", + "path": "Observation.value[x].value", "mustSupport": true }, { - "id": "Observation.valueQuantity.unit", - "path": "Observation.valueQuantity.unit", + "id": "Observation.value[x]:valueQuantity.unit", + "path": "Observation.value[x].unit", "mustSupport": true }, { - "id": "Observation.valueQuantity.system", - "path": "Observation.valueQuantity.system", + "id": "Observation.value[x]:valueQuantity.system", + "path": "Observation.value[x].system", "mustSupport": true }, { - "id": "Observation.valueQuantity.code", - "path": "Observation.valueQuantity.code", + "id": "Observation.value[x]:valueQuantity.code", + "path": "Observation.value[x].code", "mustSupport": true } ] From 9340369d9ce4a69501ad3badf458839b8b1cf155 Mon Sep 17 00:00:00 2001 From: patrick-werner Date: Wed, 7 Feb 2024 17:53:47 +0100 Subject: [PATCH 6/9] changed SCT code fixing from pattern to VS binding --- ...Observation-ISiKKoerpergroesseExample.json | 10 ++++----- .../StructureDefinition-ISiKHerzfrequenz.json | 10 ++++----- ...tructureDefinition-ISiKKoerpergewicht.json | 10 ++++----- ...tructureDefinition-ISiKKoerpergroesse.json | 10 ++++----- ...ctureDefinition-ISiKKoerpertemperatur.json | 10 ++++----- .../StructureDefinition-ISiKKopfumfang.json | 10 ++++----- .../ValueSet-ISiKHerzfrequenzSCTVS.json | 22 +++++++++++++++++++ .../ValueSet-ISiKKoerpergewichtSCTVS.json | 22 +++++++++++++++++++ .../ValueSet-ISiKKoerpergroesseSCTVS.json | 22 +++++++++++++++++++ .../ValueSet-ISiKKoerpertemperaturSCTVS.json | 22 +++++++++++++++++++ .../ValueSet-ISiKKopfumfangSCTVS.json | 22 +++++++++++++++++++ Resources/input/fsh/ISiK-Herzfrequenz.fsh | 8 ++++++- Resources/input/fsh/ISiK-Koerpergewicht.fsh | 8 ++++++- Resources/input/fsh/ISiK-Koerpergroesse.fsh | 8 ++++++- .../input/fsh/ISiK-Koerpertemperatur.fsh | 8 ++++++- Resources/input/fsh/ISiK-Kopfumfang.fsh | 8 ++++++- 16 files changed, 175 insertions(+), 35 deletions(-) create mode 100644 Resources/fsh-generated/resources/ValueSet-ISiKHerzfrequenzSCTVS.json create mode 100644 Resources/fsh-generated/resources/ValueSet-ISiKKoerpergewichtSCTVS.json create mode 100644 Resources/fsh-generated/resources/ValueSet-ISiKKoerpergroesseSCTVS.json create mode 100644 Resources/fsh-generated/resources/ValueSet-ISiKKoerpertemperaturSCTVS.json create mode 100644 Resources/fsh-generated/resources/ValueSet-ISiKKopfumfangSCTVS.json diff --git a/Resources/fsh-generated/resources/Observation-ISiKKoerpergroesseExample.json b/Resources/fsh-generated/resources/Observation-ISiKKoerpergroesseExample.json index 4e9f2996..6c31dd68 100644 --- a/Resources/fsh-generated/resources/Observation-ISiKKoerpergroesseExample.json +++ b/Resources/fsh-generated/resources/Observation-ISiKKoerpergroesseExample.json @@ -20,11 +20,6 @@ ], "code": { "coding": [ - { - "code": "1153637007", - "system": "http://snomed.info/sct", - "display": "Body height (observable entity)" - }, { "system": "http://loinc.org", "code": "8302-2" @@ -33,6 +28,11 @@ "code": "8302-2", "system": "http://loinc.org", "display": "Body height" + }, + { + "code": "1153637007", + "system": "http://snomed.info/sct", + "display": "Body height (observable entity)" } ], "text": "Körpergröße" diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKHerzfrequenz.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKHerzfrequenz.json index 3159740e..61882de7 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKHerzfrequenz.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKHerzfrequenz.json @@ -79,11 +79,11 @@ "id": "Observation.code.coding:snomed", "path": "Observation.code.coding", "sliceName": "snomed", - "patternCoding": { - "code": "364075005", - "system": "http://snomed.info/sct" - }, - "mustSupport": true + "mustSupport": true, + "binding": { + "strength": "required", + "valueSet": "https://gematik.de/fhir/isik/v3/VitalparameterUndKoerpermasze/ValueSet/ISiKHerzfrequenzSCTVS" + } }, { "id": "Observation.subject", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpergewicht.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpergewicht.json index 6444a1cf..2a675f8e 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpergewicht.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpergewicht.json @@ -79,11 +79,11 @@ "id": "Observation.code.coding:snomed", "path": "Observation.code.coding", "sliceName": "snomed", - "patternCoding": { - "code": "27113001", - "system": "http://snomed.info/sct" - }, - "mustSupport": true + "mustSupport": true, + "binding": { + "strength": "required", + "valueSet": "https://gematik.de/fhir/isik/v3/VitalparameterUndKoerpermasze/ValueSet/ISiKKoerpergewichtSCTVS" + } }, { "id": "Observation.subject", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpergroesse.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpergroesse.json index c9e5d0f1..14ab200c 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpergroesse.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpergroesse.json @@ -79,11 +79,11 @@ "id": "Observation.code.coding:snomed", "path": "Observation.code.coding", "sliceName": "snomed", - "patternCoding": { - "code": "1153637007", - "system": "http://snomed.info/sct" - }, - "mustSupport": true + "mustSupport": true, + "binding": { + "strength": "required", + "valueSet": "https://gematik.de/fhir/isik/v3/VitalparameterUndKoerpermasze/ValueSet/ISiKKoerpergroesseSCTVS" + } }, { "id": "Observation.subject", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpertemperatur.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpertemperatur.json index 1c8946de..237c273b 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpertemperatur.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpertemperatur.json @@ -79,11 +79,11 @@ "id": "Observation.code.coding:snomed", "path": "Observation.code.coding", "sliceName": "snomed", - "patternCoding": { - "code": "386725007", - "system": "http://snomed.info/sct" - }, - "mustSupport": true + "mustSupport": true, + "binding": { + "strength": "required", + "valueSet": "https://gematik.de/fhir/isik/v3/VitalparameterUndKoerpermasze/ValueSet/ISiKKoerpertemperaturSCTVS" + } }, { "id": "Observation.subject", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKKopfumfang.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKKopfumfang.json index d6893a13..2535e932 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKKopfumfang.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKKopfumfang.json @@ -79,11 +79,11 @@ "id": "Observation.code.coding:snomed", "path": "Observation.code.coding", "sliceName": "snomed", - "patternCoding": { - "code": "363812007", - "system": "http://snomed.info/sct" - }, - "mustSupport": true + "mustSupport": true, + "binding": { + "strength": "required", + "valueSet": "https://gematik.de/fhir/isik/v3/VitalparameterUndKoerpermasze/ValueSet/ISiKKopfumfangSCTVS" + } }, { "id": "Observation.subject", diff --git a/Resources/fsh-generated/resources/ValueSet-ISiKHerzfrequenzSCTVS.json b/Resources/fsh-generated/resources/ValueSet-ISiKHerzfrequenzSCTVS.json new file mode 100644 index 00000000..18ad9fb8 --- /dev/null +++ b/Resources/fsh-generated/resources/ValueSet-ISiKHerzfrequenzSCTVS.json @@ -0,0 +1,22 @@ +{ + "resourceType": "ValueSet", + "status": "draft", + "name": "ISiKHerzfrequenzSCTVS", + "id": "ISiKHerzfrequenzSCTVS", + "title": "ISiKHerzfrequenzSCTVS", + "description": "ValueSet des Herzfrequenz SnomedCT Codes in ISiK", + "url": "https://gematik.de/fhir/isik/v3/VitalparameterUndKoerpermasze/ValueSet/ISiKHerzfrequenzSCTVS", + "compose": { + "include": [ + { + "system": "http://snomed.info/sct", + "concept": [ + { + "code": "364075005", + "display": "Herzfrequenz" + } + ] + } + ] + } +} diff --git a/Resources/fsh-generated/resources/ValueSet-ISiKKoerpergewichtSCTVS.json b/Resources/fsh-generated/resources/ValueSet-ISiKKoerpergewichtSCTVS.json new file mode 100644 index 00000000..4da4477d --- /dev/null +++ b/Resources/fsh-generated/resources/ValueSet-ISiKKoerpergewichtSCTVS.json @@ -0,0 +1,22 @@ +{ + "resourceType": "ValueSet", + "status": "draft", + "name": "ISiKKoerpergewichtSCTVS", + "id": "ISiKKoerpergewichtSCTVS", + "title": "ISiKKoerpergewichtSCTVS", + "description": "ValueSet des Körpergewichts SnomedCT Codes in ISiK", + "url": "https://gematik.de/fhir/isik/v3/VitalparameterUndKoerpermasze/ValueSet/ISiKKoerpergewichtSCTVS", + "compose": { + "include": [ + { + "system": "http://snomed.info/sct", + "concept": [ + { + "code": "27113001", + "display": "Körpergewicht" + } + ] + } + ] + } +} diff --git a/Resources/fsh-generated/resources/ValueSet-ISiKKoerpergroesseSCTVS.json b/Resources/fsh-generated/resources/ValueSet-ISiKKoerpergroesseSCTVS.json new file mode 100644 index 00000000..320034d9 --- /dev/null +++ b/Resources/fsh-generated/resources/ValueSet-ISiKKoerpergroesseSCTVS.json @@ -0,0 +1,22 @@ +{ + "resourceType": "ValueSet", + "status": "draft", + "name": "ISiKKoerpergroesseSCTVS", + "id": "ISiKKoerpergroesseSCTVS", + "title": "ISiKKoerpergroesseSCTVS", + "description": "ValueSet des Körpergroesse SnomedCT Codes in ISiK", + "url": "https://gematik.de/fhir/isik/v3/VitalparameterUndKoerpermasze/ValueSet/ISiKKoerpergroesseSCTVS", + "compose": { + "include": [ + { + "system": "http://snomed.info/sct", + "concept": [ + { + "code": "1153637007", + "display": "Body height" + } + ] + } + ] + } +} diff --git a/Resources/fsh-generated/resources/ValueSet-ISiKKoerpertemperaturSCTVS.json b/Resources/fsh-generated/resources/ValueSet-ISiKKoerpertemperaturSCTVS.json new file mode 100644 index 00000000..49065961 --- /dev/null +++ b/Resources/fsh-generated/resources/ValueSet-ISiKKoerpertemperaturSCTVS.json @@ -0,0 +1,22 @@ +{ + "resourceType": "ValueSet", + "status": "draft", + "name": "ISiKKoerpertemperaturSCTVS", + "id": "ISiKKoerpertemperaturSCTVS", + "title": "ISiKKoerpertemperaturSCTVS", + "description": "ValueSet des Körpergewicht SnomedCT Codes in ISiK", + "url": "https://gematik.de/fhir/isik/v3/VitalparameterUndKoerpermasze/ValueSet/ISiKKoerpertemperaturSCTVS", + "compose": { + "include": [ + { + "system": "http://snomed.info/sct", + "concept": [ + { + "code": "386725007", + "display": "Körpergewicht" + } + ] + } + ] + } +} diff --git a/Resources/fsh-generated/resources/ValueSet-ISiKKopfumfangSCTVS.json b/Resources/fsh-generated/resources/ValueSet-ISiKKopfumfangSCTVS.json new file mode 100644 index 00000000..19ece9c7 --- /dev/null +++ b/Resources/fsh-generated/resources/ValueSet-ISiKKopfumfangSCTVS.json @@ -0,0 +1,22 @@ +{ + "resourceType": "ValueSet", + "status": "draft", + "name": "ISiKKopfumfangSCTVS", + "id": "ISiKKopfumfangSCTVS", + "title": "ISiKKopfumfangSCTVS", + "description": "ValueSet des Kopfumfang SnomedCT Codes in ISiK", + "url": "https://gematik.de/fhir/isik/v3/VitalparameterUndKoerpermasze/ValueSet/ISiKKopfumfangSCTVS", + "compose": { + "include": [ + { + "system": "http://snomed.info/sct", + "concept": [ + { + "code": "363812007", + "display": "Kopfumfang" + } + ] + } + ] + } +} diff --git a/Resources/input/fsh/ISiK-Herzfrequenz.fsh b/Resources/input/fsh/ISiK-Herzfrequenz.fsh index b7441674..78c824f4 100644 --- a/Resources/input/fsh/ISiK-Herzfrequenz.fsh +++ b/Resources/input/fsh/ISiK-Herzfrequenz.fsh @@ -8,7 +8,7 @@ Id: ISiKHerzfrequenz * code MS * coding[loinc] MS * coding[snomed] MS - * coding[snomed] = $sct#364075005 + * coding[snomed] from ISiKHerzfrequenzSCTVS * subject MS * encounter MS * effective[x] MS @@ -19,6 +19,12 @@ Id: ISiKHerzfrequenz * valueQuantity.system MS * valueQuantity.code MS +ValueSet: ISiKHerzfrequenzSCTVS +Id: ISiKHerzfrequenzSCTVS +Title: "ISiKHerzfrequenzSCTVS" +Description: "ValueSet des Herzfrequenz SnomedCT Codes in ISiK" +* $sct#364075005 "Herzfrequenz" + Instance: ISiKHerzfrequenzExample InstanceOf: ISiKHerzfrequenz Usage: #example diff --git a/Resources/input/fsh/ISiK-Koerpergewicht.fsh b/Resources/input/fsh/ISiK-Koerpergewicht.fsh index 31274a40..4a242218 100644 --- a/Resources/input/fsh/ISiK-Koerpergewicht.fsh +++ b/Resources/input/fsh/ISiK-Koerpergewicht.fsh @@ -8,7 +8,7 @@ Id: ISiKKoerpergewicht * code MS * coding[loinc] MS * coding[snomed] MS - * coding[snomed] = $sct#27113001 + * coding[snomed] from ISiKKoerpergewichtSCTVS * subject MS * encounter MS * effective[x] MS @@ -19,6 +19,12 @@ Id: ISiKKoerpergewicht * valueQuantity.system MS * valueQuantity.code MS +ValueSet: ISiKKoerpergewichtSCTVS +Id: ISiKKoerpergewichtSCTVS +Title: "ISiKKoerpergewichtSCTVS" +Description: "ValueSet des Körpergewichts SnomedCT Codes in ISiK" +* $sct#27113001 "Körpergewicht" + Instance: ISiKKoerpergewichtExample InstanceOf: ISiKKoerpergewicht Usage: #example diff --git a/Resources/input/fsh/ISiK-Koerpergroesse.fsh b/Resources/input/fsh/ISiK-Koerpergroesse.fsh index fb3c1dd7..10b0c923 100644 --- a/Resources/input/fsh/ISiK-Koerpergroesse.fsh +++ b/Resources/input/fsh/ISiK-Koerpergroesse.fsh @@ -8,7 +8,7 @@ Id: ISiKKoerpergroesse * code MS * coding[loinc] MS * coding[snomed] MS - * coding[snomed] = $sct#1153637007 + * coding[snomed] from ISiKKoerpergroesseSCTVS * subject MS * encounter MS * effective[x] MS @@ -19,6 +19,12 @@ Id: ISiKKoerpergroesse * valueQuantity.system MS * valueQuantity.code MS +ValueSet: ISiKKoerpergroesseSCTVS +Id: ISiKKoerpergroesseSCTVS +Title: "ISiKKoerpergroesseSCTVS" +Description: "ValueSet des Körpergroesse SnomedCT Codes in ISiK" +* $sct#1153637007 "Body height" + Instance: ISiKKoerpergroesseExample InstanceOf: ISiKKoerpergroesse Usage: #example diff --git a/Resources/input/fsh/ISiK-Koerpertemperatur.fsh b/Resources/input/fsh/ISiK-Koerpertemperatur.fsh index e276abca..c5d4bd99 100644 --- a/Resources/input/fsh/ISiK-Koerpertemperatur.fsh +++ b/Resources/input/fsh/ISiK-Koerpertemperatur.fsh @@ -8,7 +8,7 @@ Id: ISiKKoerpertemperatur * code MS * coding[loinc] MS * coding[snomed] MS - * coding[snomed] = $sct#386725007 + * coding[snomed] from ISiKKoerpertemperaturSCTVS * subject MS * encounter MS * effective[x] MS @@ -19,6 +19,12 @@ Id: ISiKKoerpertemperatur * valueQuantity.system MS * valueQuantity.code MS +ValueSet: ISiKKoerpertemperaturSCTVS +Id: ISiKKoerpertemperaturSCTVS +Title: "ISiKKoerpertemperaturSCTVS" +Description: "ValueSet des Körpergewicht SnomedCT Codes in ISiK" +* $sct#386725007 "Körpergewicht" + Instance: ISiKKoerpertemperaturExample InstanceOf: ISiKKoerpertemperatur Usage: #example diff --git a/Resources/input/fsh/ISiK-Kopfumfang.fsh b/Resources/input/fsh/ISiK-Kopfumfang.fsh index 3d8fd400..3cd6e083 100644 --- a/Resources/input/fsh/ISiK-Kopfumfang.fsh +++ b/Resources/input/fsh/ISiK-Kopfumfang.fsh @@ -8,7 +8,7 @@ Id: ISiKKopfumfang * code MS * coding[loinc] MS * coding[snomed] MS - * coding[snomed] = $sct#363812007 + * coding[snomed] from ISiKKopfumfangSCTVS * subject MS * encounter MS * effective[x] MS @@ -19,6 +19,12 @@ Id: ISiKKopfumfang * valueQuantity.system MS * valueQuantity.code MS +ValueSet: ISiKKopfumfangSCTVS +Id: ISiKKopfumfangSCTVS +Title: "ISiKKopfumfangSCTVS" +Description: "ValueSet des Kopfumfang SnomedCT Codes in ISiK" +* $sct#363812007 "Kopfumfang" + Instance: ISiKKopfumfangExample InstanceOf: ISiKKopfumfang Usage: #example From d5a8e40d6f0894d55d84ff34042e3ac366492f2e Mon Sep 17 00:00:00 2001 From: patrick-werner Date: Mon, 4 Mar 2024 15:30:52 +0100 Subject: [PATCH 7/9] updated basisprofile dependency --- Resources/fsh-generated/fsh-index.json | 226 +++++++++++++++++++++++++ Resources/fsh-generated/fsh-index.txt | 29 ++++ Resources/sushi-config.yaml | 2 +- package.json | 2 +- 4 files changed, 257 insertions(+), 2 deletions(-) create mode 100644 Resources/fsh-generated/fsh-index.json create mode 100644 Resources/fsh-generated/fsh-index.txt diff --git a/Resources/fsh-generated/fsh-index.json b/Resources/fsh-generated/fsh-index.json new file mode 100644 index 00000000..be97bef2 --- /dev/null +++ b/Resources/fsh-generated/fsh-index.json @@ -0,0 +1,226 @@ +[ + { + "outputFile": "CapabilityStatement-ISiK-capabilityStatement-vitalparameter-server.json", + "fshName": "ISiK-capabilityStatement-vitalparameter-server", + "fshType": "Instance", + "fshFile": "ISiK-CapabilityStatement.fsh", + "startLine": 1, + "endLine": 88 + }, + { + "outputFile": "Device-ExampleDevice.json", + "fshName": "ExampleDevice", + "fshType": "Instance", + "fshFile": "instances.fsh", + "startLine": 14, + "endLine": 17 + }, + { + "outputFile": "Observation-ISiKAtemfrequenzExample.json", + "fshName": "ISiKAtemfrequenzExample", + "fshType": "Instance", + "fshFile": "ISiK-Atemfrequenz.fsh", + "startLine": 22, + "endLine": 34 + }, + { + "outputFile": "Observation-ISiKBlutdruckExample.json", + "fshName": "ISiKBlutdruckExample", + "fshType": "Instance", + "fshFile": "ISiK-Blutdruck.fsh", + "startLine": 26, + "endLine": 45 + }, + { + "outputFile": "Observation-ISiKEkgExample.json", + "fshName": "ISiKEkgExample", + "fshType": "Instance", + "fshFile": "ISiK-Ekg.fsh", + "startLine": 22, + "endLine": 47 + }, + { + "outputFile": "Observation-ISiKGCSExample.json", + "fshName": "ISiKGCSExample", + "fshType": "Instance", + "fshFile": "ISiK-GCS.fsh", + "startLine": 27, + "endLine": 42 + }, + { + "outputFile": "Observation-ISiKHerzfrequenzExample.json", + "fshName": "ISiKHerzfrequenzExample", + "fshType": "Instance", + "fshFile": "ISiK-Herzfrequenz.fsh", + "startLine": 28, + "endLine": 40 + }, + { + "outputFile": "Observation-ISiKKoerpergewichtExample.json", + "fshName": "ISiKKoerpergewichtExample", + "fshType": "Instance", + "fshFile": "ISiK-Koerpergewicht.fsh", + "startLine": 28, + "endLine": 40 + }, + { + "outputFile": "Observation-ISiKKoerpergroesseExample.json", + "fshName": "ISiKKoerpergroesseExample", + "fshType": "Instance", + "fshFile": "ISiK-Koerpergroesse.fsh", + "startLine": 28, + "endLine": 40 + }, + { + "outputFile": "Observation-ISiKKoerpertemperaturExample.json", + "fshName": "ISiKKoerpertemperaturExample", + "fshType": "Instance", + "fshFile": "ISiK-Koerpertemperatur.fsh", + "startLine": 28, + "endLine": 40 + }, + { + "outputFile": "Observation-ISiKKopfumfangExample.json", + "fshName": "ISiKKopfumfangExample", + "fshType": "Instance", + "fshFile": "ISiK-Kopfumfang.fsh", + "startLine": 28, + "endLine": 40 + }, + { + "outputFile": "Observation-ISiKSauerstoffsaettigungExample.json", + "fshName": "ISiKSauerstoffsaettigungExample", + "fshType": "Instance", + "fshFile": "ISiK-Sauerstoffsaettigung.fsh", + "startLine": 21, + "endLine": 40 + }, + { + "outputFile": "Patient-PatientinMusterfrau.json", + "fshName": "PatientinMusterfrau", + "fshType": "Instance", + "fshFile": "instances.fsh", + "startLine": 1, + "endLine": 12 + }, + { + "outputFile": "StructureDefinition-ISiKAtemfrequenz.json", + "fshName": "ISiKAtemfrequenz", + "fshType": "Profile", + "fshFile": "ISiK-Atemfrequenz.fsh", + "startLine": 1, + "endLine": 20 + }, + { + "outputFile": "StructureDefinition-ISiKBlutdruck.json", + "fshName": "ISiKBlutdruck", + "fshType": "Profile", + "fshFile": "ISiK-Blutdruck.fsh", + "startLine": 1, + "endLine": 24 + }, + { + "outputFile": "StructureDefinition-ISiKEkg.json", + "fshName": "ISiKEkg", + "fshType": "Profile", + "fshFile": "ISiK-Ekg.fsh", + "startLine": 1, + "endLine": 20 + }, + { + "outputFile": "StructureDefinition-ISiKGCS.json", + "fshName": "ISiKGCS", + "fshType": "Profile", + "fshFile": "ISiK-GCS.fsh", + "startLine": 1, + "endLine": 25 + }, + { + "outputFile": "StructureDefinition-ISiKHerzfrequenz.json", + "fshName": "ISiKHerzfrequenz", + "fshType": "Profile", + "fshFile": "ISiK-Herzfrequenz.fsh", + "startLine": 1, + "endLine": 20 + }, + { + "outputFile": "StructureDefinition-ISiKKoerpergewicht.json", + "fshName": "ISiKKoerpergewicht", + "fshType": "Profile", + "fshFile": "ISiK-Koerpergewicht.fsh", + "startLine": 1, + "endLine": 20 + }, + { + "outputFile": "StructureDefinition-ISiKKoerpergroesse.json", + "fshName": "ISiKKoerpergroesse", + "fshType": "Profile", + "fshFile": "ISiK-Koerpergroesse.fsh", + "startLine": 1, + "endLine": 20 + }, + { + "outputFile": "StructureDefinition-ISiKKoerpertemperatur.json", + "fshName": "ISiKKoerpertemperatur", + "fshType": "Profile", + "fshFile": "ISiK-Koerpertemperatur.fsh", + "startLine": 1, + "endLine": 20 + }, + { + "outputFile": "StructureDefinition-ISiKKopfumfang.json", + "fshName": "ISiKKopfumfang", + "fshType": "Profile", + "fshFile": "ISiK-Kopfumfang.fsh", + "startLine": 1, + "endLine": 20 + }, + { + "outputFile": "StructureDefinition-ISiKSauerstoffsaettigung.json", + "fshName": "ISiKSauerstoffsaettigung", + "fshType": "Profile", + "fshFile": "ISiK-Sauerstoffsaettigung.fsh", + "startLine": 1, + "endLine": 19 + }, + { + "outputFile": "ValueSet-ISiKHerzfrequenzSCTVS.json", + "fshName": "ISiKHerzfrequenzSCTVS", + "fshType": "ValueSet", + "fshFile": "ISiK-Herzfrequenz.fsh", + "startLine": 22, + "endLine": 26 + }, + { + "outputFile": "ValueSet-ISiKKoerpergewichtSCTVS.json", + "fshName": "ISiKKoerpergewichtSCTVS", + "fshType": "ValueSet", + "fshFile": "ISiK-Koerpergewicht.fsh", + "startLine": 22, + "endLine": 26 + }, + { + "outputFile": "ValueSet-ISiKKoerpergroesseSCTVS.json", + "fshName": "ISiKKoerpergroesseSCTVS", + "fshType": "ValueSet", + "fshFile": "ISiK-Koerpergroesse.fsh", + "startLine": 22, + "endLine": 26 + }, + { + "outputFile": "ValueSet-ISiKKoerpertemperaturSCTVS.json", + "fshName": "ISiKKoerpertemperaturSCTVS", + "fshType": "ValueSet", + "fshFile": "ISiK-Koerpertemperatur.fsh", + "startLine": 22, + "endLine": 26 + }, + { + "outputFile": "ValueSet-ISiKKopfumfangSCTVS.json", + "fshName": "ISiKKopfumfangSCTVS", + "fshType": "ValueSet", + "fshFile": "ISiK-Kopfumfang.fsh", + "startLine": 22, + "endLine": 26 + } +] diff --git a/Resources/fsh-generated/fsh-index.txt b/Resources/fsh-generated/fsh-index.txt new file mode 100644 index 00000000..cc9cd35c --- /dev/null +++ b/Resources/fsh-generated/fsh-index.txt @@ -0,0 +1,29 @@ +Output File Name Type FSH File Lines +CapabilityStatement-ISiK-capabilityStatement-vitalparameter-server.json ISiK-capabilityStatement-vitalparameter-server Instance ISiK-CapabilityStatement.fsh 1 - 88 +Device-ExampleDevice.json ExampleDevice Instance instances.fsh 14 - 17 +Observation-ISiKAtemfrequenzExample.json ISiKAtemfrequenzExample Instance ISiK-Atemfrequenz.fsh 22 - 34 +Observation-ISiKBlutdruckExample.json ISiKBlutdruckExample Instance ISiK-Blutdruck.fsh 26 - 45 +Observation-ISiKEkgExample.json ISiKEkgExample Instance ISiK-Ekg.fsh 22 - 47 +Observation-ISiKGCSExample.json ISiKGCSExample Instance ISiK-GCS.fsh 27 - 42 +Observation-ISiKHerzfrequenzExample.json ISiKHerzfrequenzExample Instance ISiK-Herzfrequenz.fsh 28 - 40 +Observation-ISiKKoerpergewichtExample.json ISiKKoerpergewichtExample Instance ISiK-Koerpergewicht.fsh 28 - 40 +Observation-ISiKKoerpergroesseExample.json ISiKKoerpergroesseExample Instance ISiK-Koerpergroesse.fsh 28 - 40 +Observation-ISiKKoerpertemperaturExample.json ISiKKoerpertemperaturExample Instance ISiK-Koerpertemperatur.fsh 28 - 40 +Observation-ISiKKopfumfangExample.json ISiKKopfumfangExample Instance ISiK-Kopfumfang.fsh 28 - 40 +Observation-ISiKSauerstoffsaettigungExample.json ISiKSauerstoffsaettigungExample Instance ISiK-Sauerstoffsaettigung.fsh 21 - 40 +Patient-PatientinMusterfrau.json PatientinMusterfrau Instance instances.fsh 1 - 12 +StructureDefinition-ISiKAtemfrequenz.json ISiKAtemfrequenz Profile ISiK-Atemfrequenz.fsh 1 - 20 +StructureDefinition-ISiKBlutdruck.json ISiKBlutdruck Profile ISiK-Blutdruck.fsh 1 - 24 +StructureDefinition-ISiKEkg.json ISiKEkg Profile ISiK-Ekg.fsh 1 - 20 +StructureDefinition-ISiKGCS.json ISiKGCS Profile ISiK-GCS.fsh 1 - 25 +StructureDefinition-ISiKHerzfrequenz.json ISiKHerzfrequenz Profile ISiK-Herzfrequenz.fsh 1 - 20 +StructureDefinition-ISiKKoerpergewicht.json ISiKKoerpergewicht Profile ISiK-Koerpergewicht.fsh 1 - 20 +StructureDefinition-ISiKKoerpergroesse.json ISiKKoerpergroesse Profile ISiK-Koerpergroesse.fsh 1 - 20 +StructureDefinition-ISiKKoerpertemperatur.json ISiKKoerpertemperatur Profile ISiK-Koerpertemperatur.fsh 1 - 20 +StructureDefinition-ISiKKopfumfang.json ISiKKopfumfang Profile ISiK-Kopfumfang.fsh 1 - 20 +StructureDefinition-ISiKSauerstoffsaettigung.json ISiKSauerstoffsaettigung Profile ISiK-Sauerstoffsaettigung.fsh 1 - 19 +ValueSet-ISiKHerzfrequenzSCTVS.json ISiKHerzfrequenzSCTVS ValueSet ISiK-Herzfrequenz.fsh 22 - 26 +ValueSet-ISiKKoerpergewichtSCTVS.json ISiKKoerpergewichtSCTVS ValueSet ISiK-Koerpergewicht.fsh 22 - 26 +ValueSet-ISiKKoerpergroesseSCTVS.json ISiKKoerpergroesseSCTVS ValueSet ISiK-Koerpergroesse.fsh 22 - 26 +ValueSet-ISiKKoerpertemperaturSCTVS.json ISiKKoerpertemperaturSCTVS ValueSet ISiK-Koerpertemperatur.fsh 22 - 26 +ValueSet-ISiKKopfumfangSCTVS.json ISiKKopfumfangSCTVS ValueSet ISiK-Kopfumfang.fsh 22 - 26 \ No newline at end of file diff --git a/Resources/sushi-config.yaml b/Resources/sushi-config.yaml index fec5d888..461863f4 100644 --- a/Resources/sushi-config.yaml +++ b/Resources/sushi-config.yaml @@ -3,5 +3,5 @@ fhirVersion: 4.0.1 FSHOnly: true applyExtensionMetadataToRoot: false dependencies: - de.basisprofil.r4: 1.5.0-alpha6 + de.basisprofil.r4: 1.5.0-ballot de.gematik.isik-basismodul: 3.0.1 \ No newline at end of file diff --git a/package.json b/package.json index de02ef2f..fc9e9a4f 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "4.0.1" ], "dependencies": { - "de.basisprofil.r4": "1.5.0-alpha6", + "de.basisprofil.r4": "1.5.0-ballot", "de.gematik.isik-basismodul": "3.0.1" } } From 7eb74d03b65ac5b1e1070558db296b61d7150f9d Mon Sep 17 00:00:00 2001 From: patrick-werner Date: Tue, 5 Mar 2024 12:07:00 +0100 Subject: [PATCH 8/9] =?UTF-8?q?added=20section=20about=20"Daten=C3=BCberna?= =?UTF-8?q?hme"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ImplementationGuide/markdown/RestApi.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ImplementationGuide/markdown/RestApi.md b/ImplementationGuide/markdown/RestApi.md index 6388db3d..33abb33e 100644 --- a/ImplementationGuide/markdown/RestApi.md +++ b/ImplementationGuide/markdown/RestApi.md @@ -1,3 +1,7 @@ # REST-API Es gelten die Festlegungen aus dem [Basismodul](https://simplifier.net/guide/implementierungsleitfadenisik-basismodul/I-markdown-UebergreifendeFestlegungen-UebergreifendeFestlegungen-Rest?version=current). + +## Datenübernahme - Zusammenspiel von KIS & PDMS + +Jedes System ist für seine eigenen Daten verantwortlich, ein aktives Pushen per `POST` Interaktion ist nicht vorgesehen. Im Falle einer gewollten Datenübernahme zwischen Systemen greifen diese gegenseitig mittels `GET`Interaktion aufeinander zu und querien die zu übernehmenden Daten selbstständig. \ No newline at end of file From 63bf42746720d12f632ca9662aaac58646f52d9f Mon Sep 17 00:00:00 2001 From: patrick-werner Date: Tue, 5 Mar 2024 12:09:57 +0100 Subject: [PATCH 9/9] fix: wording --- ImplementationGuide/markdown/RestApi.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ImplementationGuide/markdown/RestApi.md b/ImplementationGuide/markdown/RestApi.md index 33abb33e..cc9a9dde 100644 --- a/ImplementationGuide/markdown/RestApi.md +++ b/ImplementationGuide/markdown/RestApi.md @@ -4,4 +4,4 @@ Es gelten die Festlegungen aus dem [Basismodul](https://simplifier.net/guide/imp ## Datenübernahme - Zusammenspiel von KIS & PDMS -Jedes System ist für seine eigenen Daten verantwortlich, ein aktives Pushen per `POST` Interaktion ist nicht vorgesehen. Im Falle einer gewollten Datenübernahme zwischen Systemen greifen diese gegenseitig mittels `GET`Interaktion aufeinander zu und querien die zu übernehmenden Daten selbstständig. \ No newline at end of file +Jedes System ist für seine eigenen Daten verantwortlich, ein aktives Pushen per `POST` Interaktion ist nicht vorgesehen. Im Falle einer gewollten Datenübernahme zwischen Systemen greifen diese gegenseitig mittels `GET`Interaktion aufeinander zu und fragen die zu übernehmenden Daten selbstständig ab. \ No newline at end of file