Index: sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml
===================================================================
diff -u -r3229695c1c67de600c095d52c6f99dacfafb462d -rac23b968f565c2beeb153ca2d554b8f868634512
--- sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml	(.../TreatmentVitals.qml)	(revision 3229695c1c67de600c095d52c6f99dacfafb462d)
+++ sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml	(.../TreatmentVitals.qml)	(revision ac23b968f565c2beeb153ca2d554b8f868634512)
@@ -26,13 +26,8 @@
  * \brief   Treatment Screen Vitals section
  */
 TouchArea { id: _root
-    property alias textRectBloodPressure : _bloodPressure
-    property alias textRectHeartBeat     : _heartBeat
+    readonly property string bloodSDSeparator: " / "
 
-    property int bpSystolic : 0
-    property int bpDiastolic: 0
-    property int heartRate  : 0
-
     x: 0
     y: 0
     title: qsTr("VITALS")
@@ -45,15 +40,15 @@
             labelFont.pixelSize: Fonts.fontPixelVitals
             labelFont.weight: Font.ExtraLight
             labelAutoSize: true
-            label: (bpSystolic ? bpSystolic : "‑‑‑") + " / " + (bpDiastolic ? bpDiastolic : "‑‑")
+            label: Variables.notSetVariable(vTreatmentVitals.systolic, 3) + bloodSDSeparator + Variables.notSetVariable(vTreatmentVitals.diastolic, 2)
             extra: Variables.unitTextBloodPressure
         }
         TextRect { id: _heartBeat
             labelHeight: 40
             labelFont.pixelSize: Fonts.fontPixelVitals
             labelFont.weight: Font.ExtraLight
             labelAutoSize: true
-            label: heartRate ? heartRate : "‑‑"
+            label: Variables.notSetVariable(vTreatmentVitals.heartRate)
             extra: Variables.unitTextHeartBeat
         }
     }