Merge pull request #136 from gematik/feat/maintenance-update

Feat/maintenance update
gematik · Nov 30, 2023 · 8b25832 · 8b25832
2 parents e13e80b + 1b863a6
commit 8b25832
Show file tree

Hide file tree

Showing 14 changed files with 27 additions and 41 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -6,9 +6,7 @@ name: CI (FHIR Validation)
 on:
   # Triggers the workflow on push or pull request events but only for the master branch
   push:
-    branches: [ master ]
   pull_request:
-    branches: [ master ]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:

diff --git a/Resources/fsh-generated/resources/Observation-ISiKAtemfrequenzExample.json b/Resources/fsh-generated/resources/Observation-ISiKAtemfrequenzExample.json
@@ -16,8 +16,7 @@
           "code": "vital-signs",
           "display": "Vital Signs"
         }
-      ],
-      "text": "Vital Signs"
+      ]
     }
   ],
   "code": {

diff --git a/Resources/fsh-generated/resources/Observation-ISiKKopfumfangExample.json b/Resources/fsh-generated/resources/Observation-ISiKKopfumfangExample.json
@@ -16,8 +16,7 @@
           "code": "vital-signs",
           "display": "Vital Signs"
         }
-      ],
-      "text": "Vital Signs"
+      ]
     }
   ],
   "code": {

diff --git a/Resources/input/fsh/ISiK-Atemfrequenz.fsh b/Resources/input/fsh/ISiK-Atemfrequenz.fsh
@@ -22,8 +22,7 @@ Usage: #example
 * meta.profile[0] = "http://hl7.org/fhir/StructureDefinition/resprate"
 * meta.profile[+] = "http://fhir.de/StructureDefinition/observation-de-vitalsign-atemfrequenz"
 * status = #final
-* category = $observation-category#vital-signs "Vital Signs"
-* category.text = "Vital Signs"
+* category[vs-cat] = $observation-category#vital-signs "Vital Signs"
 * code = $loinc#9279-1 "Respiratory rate"
 * code.text = "Atemfrequenz"
 * subject = Reference(PatientinMusterfrau)

diff --git a/Resources/input/fsh/ISiK-Blutdruck.fsh b/Resources/input/fsh/ISiK-Blutdruck.fsh
@@ -27,7 +27,7 @@ InstanceOf: ISiKBlutdruck
 Usage: #example
 * meta.profile[0] = "http://fhir.de/StructureDefinition/observation-de-vitalsign-blutdruck"
 * status = #final
-* category = $observation-category#vital-signs "Vital Signs"
+* 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"
 * subject = Reference(PatientinMusterfrau)
@@ -36,7 +36,7 @@ Usage: #example
 * interpretation = $v3-ObservationInterpretation#L "low"
 * interpretation.text = "Below low normal"
 * bodySite = $sct#368209003 "Right arm"
-* component[0].code.coding[0] = $loinc#8480-6
-* component[=].valueQuantity = 107 'mm[Hg]' "mmHg"
-* component[+].code.coding[0] = $loinc#8462-4
-* component[=].valueQuantity = 60 'mm[Hg]' "mmHg"
+* component[SystolicBP].code.coding[0] = $loinc#8480-6
+* component[SystolicBP].valueQuantity = 107 'mm[Hg]' "mmHg"
+* component[DiastolicBP].code.coding[0] = $loinc#8462-4
+* component[DiastolicBP].valueQuantity = 60 'mm[Hg]' "mmHg"
diff --git a/Resources/input/fsh/ISiK-GCS.fsh b/Resources/input/fsh/ISiK-GCS.fsh
@@ -31,9 +31,9 @@ Usage: #example
 * status = #final
 * subject = Reference(PatientinMusterfrau)
 * effectiveDateTime = "2020-10-11"
-* component[+].valueQuantity = 4 '1' "Punktwert"
-* component[=].code.coding[0] = $loinc#9267-6
-* component[+].valueQuantity = 4 '1' "Punktwert"
-* component[=].code.coding[0] = $loinc#9268-4
-* component[+].valueQuantity = 3 '1' "Punktwert"
-* component[=].code.coding[0] = $loinc#9270-0
+* 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
diff --git a/Resources/input/fsh/ISiK-Herzfrequenz.fsh b/Resources/input/fsh/ISiK-Herzfrequenz.fsh
@@ -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 = $observation-category#vital-signs
+* category[vs-cat] = $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
@@ -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 = $observation-category#vital-signs
+* category[vs-cat] = $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
@@ -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 = $observation-category#vital-signs
+* category[vs-cat] = $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
@@ -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 = $observation-category#vital-signs
+* category[vs-cat] = $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
@@ -22,8 +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 = $observation-category#vital-signs "Vital Signs"
-* category.text = "Vital Signs"
+* category[vs-cat] = $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
@@ -21,7 +21,7 @@ InstanceOf: ISiKSauerstoffsaettigung
 Usage: #example
 * meta.profile[0] = "http://fhir.de/StructureDefinition/observation-de-vitalsign-sauerstoffsaettigung"
 * status = #final
-* category = $observation-category#vital-signs
+* 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"

diff --git a/Resources/input/fsh/instances.fsh b/Resources/input/fsh/instances.fsh
@@ -1,13 +1,13 @@
 Instance: PatientinMusterfrau
 InstanceOf: https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKPatient
 Usage: #example
-* identifier[0].type = http://terminology.hl7.org/CodeSystem/v2-0203#MR
-* identifier[=].system = "https://fhir.krankenhaus.example/NamingSystem/PID"
-* identifier[=].value = "TestPID"
+* identifier[Patientennummer].type = http://terminology.hl7.org/CodeSystem/v2-0203#MR
+* identifier[Patientennummer].system = "https://fhir.krankenhaus.example/NamingSystem/PID"
+* identifier[Patientennummer].value = "TestPID"
 * active = true
-* name[0].use = #official
-* name[=].family = "Fürstin von Musterfrau"
-* name[=].given = "Erika"
+* name[Name].use = #official
+* name[Name].family = "Fürstin von Musterfrau"
+* name[Name].given = "Erika"
 * gender = #female
 * birthDate = "1964-08-12"
 

diff --git a/Resources/sushi-config.yaml b/Resources/sushi-config.yaml
@@ -2,14 +2,6 @@ canonical: https://gematik.de/fhir/isik/v3/VitalparameterUndKoerpermasze
 fhirVersion: 4.0.1
 FSHOnly: true
 applyExtensionMetadataToRoot: false
-id: Implementierungsleitfaden ISiK-Modul Vitalparameter und Körpermaße
-name: Implementierungsleitfaden ISiK-Modul Vitalparameter und Körpermaße
-status: active
-version: 3.0.0
-publisher:
-  name: gematik GmbH
-  url: https://www.gematik.de/
-  email: [email protected]
 dependencies:
   de.basisprofil.r4: 1.4.0
-  de.gematik.isik-basismodul: 3.0.0
+  de.gematik.isik-basismodul: 3.0.0