diff --git a/ImplementationGuide/markdown/RestApi.md b/ImplementationGuide/markdown/RestApi.md index 6388db3d..cc9a9dde 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 fragen die zu übernehmenden Daten selbstständig ab. \ No newline at end of file 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/fsh-generated/resources/Observation-ISiKAtemfrequenzExample.json b/Resources/fsh-generated/resources/Observation-ISiKAtemfrequenzExample.json index ba6e9897..6cd5e792 100644 --- a/Resources/fsh-generated/resources/Observation-ISiKAtemfrequenzExample.json +++ b/Resources/fsh-generated/resources/Observation-ISiKAtemfrequenzExample.json @@ -25,6 +25,11 @@ "system": "http://loinc.org", "code": "9279-1", "display": "Respiratory rate" + }, + { + "code": "86290005", + "system": "http://snomed.info/sct", + "display": "Respiratory rate (observable entity)" } ], "text": "Atemfrequenz" 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..6c31dd68 100644 --- a/Resources/fsh-generated/resources/Observation-ISiKKoerpergroesseExample.json +++ b/Resources/fsh-generated/resources/Observation-ISiKKoerpergroesseExample.json @@ -22,13 +22,17 @@ "coding": [ { "system": "http://loinc.org", + "code": "8302-2" + }, + { "code": "8302-2", + "system": "http://loinc.org", "display": "Body height" }, { - "code": "50373000", + "code": "1153637007", "system": "http://snomed.info/sct", - "display": "Body height measure" + "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 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 40749dc8..b812ff46 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,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": "86290005", + "system": "http://snomed.info/sct" + }, + "mustSupport": true + }, { "id": "Observation.subject", "path": "Observation.subject", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKBlutdruck.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKBlutdruck.json index 8e047863..b43b8534 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 }, { @@ -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 17999aa0..86bcb908 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 70faf445..4e94f54c 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:vs-cat", + "id": "Observation.category:survey", "path": "Observation.category", - "sliceName": "vs-cat", + "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 bf883f8d..61882de7 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 }, { @@ -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", + "mustSupport": true, + "binding": { + "strength": "required", + "valueSet": "https://gematik.de/fhir/isik/v3/VitalparameterUndKoerpermasze/ValueSet/ISiKHerzfrequenzSCTVS" + } + }, { "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 fbc56367..2a675f8e 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 }, { @@ -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", + "mustSupport": true, + "binding": { + "strength": "required", + "valueSet": "https://gematik.de/fhir/isik/v3/VitalparameterUndKoerpermasze/ValueSet/ISiKKoerpergewichtSCTVS" + } + }, { "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 163e829f..14ab200c 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 }, { @@ -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", + "mustSupport": true, + "binding": { + "strength": "required", + "valueSet": "https://gematik.de/fhir/isik/v3/VitalparameterUndKoerpermasze/ValueSet/ISiKKoerpergroesseSCTVS" + } + }, { "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 2d393773..237c273b 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 }, { @@ -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", + "mustSupport": true, + "binding": { + "strength": "required", + "valueSet": "https://gematik.de/fhir/isik/v3/VitalparameterUndKoerpermasze/ValueSet/ISiKKoerpertemperaturSCTVS" + } + }, { "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 e4282ee7..2535e932 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 }, { @@ -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", + "mustSupport": true, + "binding": { + "strength": "required", + "valueSet": "https://gematik.de/fhir/isik/v3/VitalparameterUndKoerpermasze/ValueSet/ISiKKopfumfangSCTVS" + } + }, { "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 3980d568..c40c2767 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 }, { @@ -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/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-Atemfrequenz.fsh b/Resources/input/fsh/ISiK-Atemfrequenz.fsh index 5b5211e9..cc56a7aa 100644 --- a/Resources/input/fsh/ISiK-Atemfrequenz.fsh +++ b/Resources/input/fsh/ISiK-Atemfrequenz.fsh @@ -4,8 +4,11 @@ Id: ISiKAtemfrequenz * insert Meta * status MS * category MS -* category[vs-cat] MS +* category[VSCat] MS * code MS + * coding[loinc] MS + * coding[snomed] MS + * coding[snomed] = $sct#86290005 * subject MS * encounter MS * effective[x] MS @@ -22,8 +25,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" -* code = $loinc#9279-1 "Respiratory rate" +* category[VSCat] = $observation-category#vital-signs "Vital Signs" +* code.coding[loinc] = $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..e1eb4261 100644 --- a/Resources/input/fsh/ISiK-Blutdruck.fsh +++ b/Resources/input/fsh/ISiK-Blutdruck.fsh @@ -4,9 +4,10 @@ Id: ISiKBlutdruck * insert Meta * status MS * category MS -* category[vs-cat] MS +* category[VSCat] MS * code MS -* code.coding MS + * coding[loinc] MS + * coding[snomed] MS * subject MS * encounter MS * effective[x] MS @@ -27,9 +28,11 @@ 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" -* code = $loinc#85354-9 "Blood pressure panel with all children optional" -* code.text = "Systolischer und Diastolischer Blutdruck" +* category[VSCat] = $observation-category#vital-signs "Vital Signs" +* 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 bbc6cd07..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[vs-cat] 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 831c0432..78c824f4 100644 --- a/Resources/input/fsh/ISiK-Herzfrequenz.fsh +++ b/Resources/input/fsh/ISiK-Herzfrequenz.fsh @@ -4,8 +4,11 @@ Id: ISiKHerzfrequenz * insert Meta * status MS * category MS -* category[vs-cat] MS +* category[VSCat] MS * code MS + * coding[loinc] MS + * coding[snomed] MS + * coding[snomed] from ISiKHerzfrequenzSCTVS * subject MS * encounter MS * effective[x] MS @@ -16,14 +19,21 @@ 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 * 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 -* code.coding[0] = $loinc#8867-4 "Heart rate" +* category[VSCat] = $observation-category#vital-signs +* 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 53103507..4a242218 100644 --- a/Resources/input/fsh/ISiK-Koerpergewicht.fsh +++ b/Resources/input/fsh/ISiK-Koerpergewicht.fsh @@ -4,8 +4,11 @@ Id: ISiKKoerpergewicht * insert Meta * status MS * category MS -* category[vs-cat] MS +* category[VSCat] MS * code MS + * coding[loinc] MS + * coding[snomed] MS + * coding[snomed] from ISiKKoerpergewichtSCTVS * subject MS * encounter MS * effective[x] MS @@ -16,13 +19,19 @@ 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 * 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..10b0c923 100644 --- a/Resources/input/fsh/ISiK-Koerpergroesse.fsh +++ b/Resources/input/fsh/ISiK-Koerpergroesse.fsh @@ -4,8 +4,11 @@ Id: ISiKKoerpergroesse * insert Meta * status MS * category MS -* category[vs-cat] MS +* category[VSCat] MS * code MS + * coding[loinc] MS + * coding[snomed] MS + * coding[snomed] from ISiKKoerpergroesseSCTVS * subject MS * encounter MS * effective[x] MS @@ -16,15 +19,21 @@ 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 * 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 -* code.coding[0] = $loinc#8302-2 "Body height" -* code.coding[+] = $sct#50373000 "Body height measure" +* category[VSCat] = $observation-category#vital-signs +* 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 c16928be..c5d4bd99 100644 --- a/Resources/input/fsh/ISiK-Koerpertemperatur.fsh +++ b/Resources/input/fsh/ISiK-Koerpertemperatur.fsh @@ -4,8 +4,11 @@ Id: ISiKKoerpertemperatur * insert Meta * status MS * category MS -* category[vs-cat] MS +* category[VSCat] MS * code MS + * coding[loinc] MS + * coding[snomed] MS + * coding[snomed] from ISiKKoerpertemperaturSCTVS * subject MS * encounter MS * effective[x] MS @@ -16,14 +19,21 @@ 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 * 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 -* code.coding[0] = $loinc#8310-5 "Body temperature" +* category[VSCat] = $observation-category#vital-signs +* 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 0f0df802..3cd6e083 100644 --- a/Resources/input/fsh/ISiK-Kopfumfang.fsh +++ b/Resources/input/fsh/ISiK-Kopfumfang.fsh @@ -4,8 +4,11 @@ Id: ISiKKopfumfang * insert Meta * status MS * category MS -* category[vs-cat] MS +* category[VSCat] MS * code MS + * coding[loinc] MS + * coding[snomed] MS + * coding[snomed] from ISiKKopfumfangSCTVS * subject MS * encounter MS * effective[x] MS @@ -16,14 +19,21 @@ 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 * 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" -* code = $loinc#9843-4 "Head Occipital-frontal circumference" +* category[VSCat] = $observation-category#vital-signs "Vital Signs" +* 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 585a1d79..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[vs-cat] MS +* category[VSCat] MS * code MS + * coding[loinc] MS + * coding[snomed] MS * subject MS * encounter MS * effective[x] MS @@ -21,10 +23,9 @@ InstanceOf: ISiKSauerstoffsaettigung Usage: #example * meta.profile[0] = "http://fhir.de/StructureDefinition/observation-de-vitalsign-sauerstoffsaettigung" * status = #final -* category[vs-cat] = $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" +* category[VSCat] = $observation-category#vital-signs +* 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 e5131392..461863f4 100644 --- a/Resources/sushi-config.yaml +++ b/Resources/sushi-config.yaml @@ -1,7 +1,7 @@ -canonical: https://gematik.de/fhir/isik/v3/VitalparameterUndKoerpermasze -fhirVersion: 4.0.1 -FSHOnly: true -applyExtensionMetadataToRoot: false -dependencies: - de.basisprofil.r4: 1.4.0 - de.gematik.isik-basismodul: 3.0.1 +canonical: https://gematik.de/fhir/isik/v3/VitalparameterUndKoerpermasze +fhirVersion: 4.0.1 +FSHOnly: true +applyExtensionMetadataToRoot: false +dependencies: + 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 0cd7c25b..fc9e9a4f 100644 --- a/package.json +++ b/package.json @@ -1,12 +1,12 @@ -{ - "name": "de.gematik.isik-vitalparameter", - "version": "4.0.0-rc", - "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.1" - } -} +{ + "name": "de.gematik.isik-vitalparameter", + "version": "4.0.0-rc", + "description": "Package Release des ISiK Modul Vitalparameter und Körpermaße", + "fhirVersions": [ + "4.0.1" + ], + "dependencies": { + "de.basisprofil.r4": "1.5.0-ballot", + "de.gematik.isik-basismodul": "3.0.1" + } +}