Index: sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml
===================================================================
diff -u -r56e378f7504701b9e9a9dccaf205aef2fd52c58e -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9
--- sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml	(.../TreatmentVitals.qml)	(revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e)
+++ sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml	(.../TreatmentVitals.qml)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
@@ -1,15 +1,15 @@
 /*!
  *
- * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+ * Copyright (c) 2020-2024 Diality Inc. - All Rights Reserved.
  * \copyright
  * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
  * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
  *
- * \file TreatmentVitals.qml
- * \author (last) Behrouz NematiPour
- * \date (last) 30-Jul-2020
- * \author (original) Behrouz NematiPour
- * \date (original) 27-Jan-2020
+ * \file    TreatmentVitals.qml
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      16-Aug-2021
+ * \author  (original)  Behrouz NematiPour
+ * \date    (original)  27-Jan-2020
  *
  */
 
@@ -26,12 +26,10 @@
  * \brief   Treatment Screen Vitals section
  */
 TouchArea { id: _root
-    property alias textRectBloodPressure : _bloodPressure
-    property alias textRectHeartBeat     : _heartBeat
+    readonly property string bloodSDSeparator: " / "
 
     x: 0
     y: 0
-    isTouchable: false
     title: qsTr("VITALS")
 
     Column {
@@ -42,15 +40,15 @@
             labelFont.pixelSize: Fonts.fontPixelVitals
             labelFont.weight: Font.ExtraLight
             labelAutoSize: true
-            label: "120/80"         // value
+            label: Variables.notSetVariable(vTreatmentVitals.systolic, 2) + 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: "130"        // value
+            label: Variables.notSetVariable(vTreatmentVitals.heartRate, 2)
             extra: Variables.unitTextHeartBeat
         }
     }