Merge pull request #592 from hl7germany/fix/relax_vitalsign_constraints

Fix/relax vitalsign constraints
hl7germany · Sep 9, 2024 · 87158e9 · 87158e9
2 parents d713c01 + e84e460
commit 87158e9
Show file tree

Hide file tree

Showing 14 changed files with 113 additions and 19 deletions.
diff --git a/resources/fsh-generated/fsh-index.json b/resources/fsh-generated/fsh-index.json
@@ -1237,7 +1237,7 @@
     "fshType": "Profile",
     "fshFile": "profiles/VitalSignDE.fsh",
     "startLine": 1,
-    "endLine": 39
+    "endLine": 38
   },
   {
     "outputFile": "StructureDefinition-onlinepruefung-egk.json",

diff --git a/resources/fsh-generated/fsh-index.txt b/resources/fsh-generated/fsh-index.txt
@@ -153,7 +153,7 @@ StructureDefinition-observation-de-vitalsign-koerpergroesse.json        VitalSig
 StructureDefinition-observation-de-vitalsign-koerpertemperatur.json     VitalSignDE_Koerpertemperatur                          Profile     profiles/VitalSignDE_Koerpertemperatur.fsh                           1 - 14
 StructureDefinition-observation-de-vitalsign-kopfumfang.json            VitalSignDE_Kopfumfang                                 Profile     profiles/VitalSignDE_Kopfumfang.fsh                                  1 - 15
 StructureDefinition-observation-de-vitalsign-sauerstoffsaettigung.json  VitalSignDE_Arterielle_Sauerstoffsaettigung            Profile     profiles/VitalSignDE_Artierielle_Sauerstoffsaettigung.fsh            1 - 14
-StructureDefinition-observation-de-vitalsign.json                       VitalSignDE                                            Profile     profiles/VitalSignDE.fsh                                             1 - 39
+StructureDefinition-observation-de-vitalsign.json                       VitalSignDE                                            Profile     profiles/VitalSignDE.fsh                                             1 - 38
 StructureDefinition-onlinepruefung-egk.json                             ExtensionGkvOnlinepruefungEgk                          Extension   extensions/ExtensionGkvOnlinepruefungEgk.fsh                         1 - 31
 StructureDefinition-ruhender-leistungsanspruch.json                     ExtensionGkvRuhenderLeistungsanspruch                  Extension   extensions/ExtensionGkvRuhenderLeistungsanspruch.fsh                 1 - 26
 StructureDefinition-seitenlokalisation.json                             ExtensionSeitenlokalisation                            Extension   extensions/ExtensionSeitenlokalisation.fsh                           1 - 14

diff --git a/resources/fsh-generated/resources/StructureDefinition-observation-de-pflegegrad.json b/resources/fsh-generated/resources/StructureDefinition-observation-de-pflegegrad.json
@@ -69,15 +69,40 @@
       {
         "id": "Observation.effective[x]",
         "path": "Observation.effective[x]",
+        "slicing": {
+          "discriminator": [
+            {
+              "type": "type",
+              "path": "$this"
+            }
+          ],
+          "ordered": false,
+          "rules": "open"
+        },
         "min": 1,
+        "type": [
+          {
+            "code": "dateTime"
+          },
+          {
+            "code": "Period"
+          }
+        ]
+      },
+      {
+        "id": "Observation.effective[x]:effectivePeriod",
+        "path": "Observation.effective[x]",
+        "sliceName": "effectivePeriod",
+        "min": 0,
+        "max": "1",
         "type": [
           {
             "code": "Period"
           }
         ]
       },
       {
-        "id": "Observation.effective[x].start",
+        "id": "Observation.effective[x]:effectivePeriod.start",
         "path": "Observation.effective[x].start",
         "min": 1
       },

diff --git a/...es/fsh-generated/resources/StructureDefinition-observation-de-vitalsign-atemfrequenz.json b/...es/fsh-generated/resources/StructureDefinition-observation-de-vitalsign-atemfrequenz.json
@@ -78,8 +78,14 @@
         "min": 1
       },
       {
-        "id": "Observation.value[x]",
+        "id": "Observation.value[x]:valueQuantity",
         "path": "Observation.value[x]",
+        "sliceName": "valueQuantity",
+        "type": [
+          {
+            "code": "Quantity"
+          }
+        ],
         "patternQuantity": {
           "code": "/min",
           "system": "http://unitsofmeasure.org"

diff --git a/...urces/fsh-generated/resources/StructureDefinition-observation-de-vitalsign-blutdruck.json b/...urces/fsh-generated/resources/StructureDefinition-observation-de-vitalsign-blutdruck.json
@@ -82,6 +82,17 @@
         "path": "Observation.value[x]",
         "max": "0"
       },
+      {
+        "id": "Observation.value[x]:valueQuantity",
+        "path": "Observation.value[x]",
+        "sliceName": "valueQuantity",
+        "max": "0",
+        "type": [
+          {
+            "code": "Quantity"
+          }
+        ]
+      },
       {
         "id": "Observation.component",
         "path": "Observation.component",

diff --git a/...es/fsh-generated/resources/StructureDefinition-observation-de-vitalsign-herzfrequenz.json b/...es/fsh-generated/resources/StructureDefinition-observation-de-vitalsign-herzfrequenz.json
@@ -78,8 +78,14 @@
         "min": 1
       },
       {
-        "id": "Observation.value[x]",
+        "id": "Observation.value[x]:valueQuantity",
         "path": "Observation.value[x]",
+        "sliceName": "valueQuantity",
+        "type": [
+          {
+            "code": "Quantity"
+          }
+        ],
         "patternQuantity": {
           "code": "/min",
           "system": "http://unitsofmeasure.org"

diff --git a/.../fsh-generated/resources/StructureDefinition-observation-de-vitalsign-koerpergewicht.json b/.../fsh-generated/resources/StructureDefinition-observation-de-vitalsign-koerpergewicht.json
@@ -79,8 +79,14 @@
         "min": 1
       },
       {
-        "id": "Observation.value[x]",
+        "id": "Observation.value[x]:valueQuantity",
         "path": "Observation.value[x]",
+        "sliceName": "valueQuantity",
+        "type": [
+          {
+            "code": "Quantity"
+          }
+        ],
         "binding": {
           "strength": "required",
           "valueSet": "http://fhir.de/ValueSet/VitalSignDE_Body_Weigth_UCUM"

diff --git a/.../fsh-generated/resources/StructureDefinition-observation-de-vitalsign-koerpergroesse.json b/.../fsh-generated/resources/StructureDefinition-observation-de-vitalsign-koerpergroesse.json
@@ -79,8 +79,14 @@
         "min": 1
       },
       {
-        "id": "Observation.value[x]",
+        "id": "Observation.value[x]:valueQuantity",
         "path": "Observation.value[x]",
+        "sliceName": "valueQuantity",
+        "type": [
+          {
+            "code": "Quantity"
+          }
+        ],
         "binding": {
           "strength": "required",
           "valueSet": "http://fhir.de/ValueSet/VitalSignDE_Body_Length_UCUM"

diff --git a/...h-generated/resources/StructureDefinition-observation-de-vitalsign-koerpertemperatur.json b/...h-generated/resources/StructureDefinition-observation-de-vitalsign-koerpertemperatur.json
@@ -78,8 +78,14 @@
         "min": 1
       },
       {
-        "id": "Observation.value[x]",
+        "id": "Observation.value[x]:valueQuantity",
         "path": "Observation.value[x]",
+        "sliceName": "valueQuantity",
+        "type": [
+          {
+            "code": "Quantity"
+          }
+        ],
         "patternQuantity": {
           "code": "Cel",
           "system": "http://unitsofmeasure.org"

diff --git a/...rces/fsh-generated/resources/StructureDefinition-observation-de-vitalsign-kopfumfang.json b/...rces/fsh-generated/resources/StructureDefinition-observation-de-vitalsign-kopfumfang.json
@@ -78,8 +78,14 @@
         "min": 1
       },
       {
-        "id": "Observation.value[x]",
+        "id": "Observation.value[x]:valueQuantity",
         "path": "Observation.value[x]",
+        "sliceName": "valueQuantity",
+        "type": [
+          {
+            "code": "Quantity"
+          }
+        ],
         "binding": {
           "strength": "required",
           "valueSet": "http://fhir.de/ValueSet/VitalSignDE_Body_Length_UCUM"

diff --git a/...enerated/resources/StructureDefinition-observation-de-vitalsign-sauerstoffsaettigung.json b/...enerated/resources/StructureDefinition-observation-de-vitalsign-sauerstoffsaettigung.json
@@ -78,8 +78,14 @@
         "min": 1
       },
       {
-        "id": "Observation.value[x]",
+        "id": "Observation.value[x]:valueQuantity",
         "path": "Observation.value[x]",
+        "sliceName": "valueQuantity",
+        "type": [
+          {
+            "code": "Quantity"
+          }
+        ],
         "patternQuantity": {
           "code": "%",
           "system": "http://unitsofmeasure.org"

diff --git a/resources/fsh-generated/resources/StructureDefinition-observation-de-vitalsign.json b/resources/fsh-generated/resources/StructureDefinition-observation-de-vitalsign.json
@@ -136,30 +136,47 @@
       {
         "id": "Observation.value[x]",
         "path": "Observation.value[x]",
+        "slicing": {
+          "discriminator": [
+            {
+              "type": "type",
+              "path": "$this"
+            }
+          ],
+          "ordered": false,
+          "rules": "open"
+        }
+      },
+      {
+        "id": "Observation.value[x]:valueQuantity",
+        "path": "Observation.value[x]",
+        "sliceName": "valueQuantity",
+        "min": 0,
+        "max": "1",
         "type": [
           {
             "code": "Quantity"
           }
         ]
       },
       {
-        "id": "Observation.value[x].value",
+        "id": "Observation.value[x]:valueQuantity.value",
         "path": "Observation.value[x].value",
         "min": 1
       },
       {
-        "id": "Observation.value[x].unit",
+        "id": "Observation.value[x]:valueQuantity.unit",
         "path": "Observation.value[x].unit",
         "min": 1
       },
       {
-        "id": "Observation.value[x].system",
+        "id": "Observation.value[x]:valueQuantity.system",
         "path": "Observation.value[x].system",
         "min": 1,
         "patternUri": "http://unitsofmeasure.org"
       },
       {
-        "id": "Observation.value[x].code",
+        "id": "Observation.value[x]:valueQuantity.code",
         "path": "Observation.value[x].code",
         "min": 1,
         "binding": {

diff --git a/resources/input/fsh/profiles/ObservationDePflegegrad.fsh b/resources/input/fsh/profiles/ObservationDePflegegrad.fsh
@@ -11,13 +11,13 @@ Description: "Deutsches Profil zur Abbildung des Pflegegrads eines Patienten inc
 * code.coding[loinc] = $loinc#80391-6
 * subject 1..
 * subject only Reference(Patient)
-* effective[x] only Period
-* effectivePeriod 1..
-* effectivePeriod only Period
+* effective[x] 1..
+* effective[x] only Period or dateTime
+* effectivePeriod
   * start 1..
 * value[x] only CodeableConcept
 * valueCodeableConcept 1..
-* valueCodeableConcept only CodeableConcept
+* valueCodeableConcept
   * coding 1..
   * coding from PflegegradDE (required)
 * bodySite ..0

diff --git a/resources/input/fsh/profiles/VitalSignDE.fsh b/resources/input/fsh/profiles/VitalSignDE.fsh
@@ -22,7 +22,6 @@ Description: "Observation-Profil VitalSignDE ist das Parentprofil der restlichen
 * effective[x] 1..
 * effective[x] only dateTime or Period
   * obeys vs-de-1
-* value[x] only Quantity
 * valueQuantity
   * value 1..
   * unit 1..