Index: sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml
===================================================================
diff -u -r7e503c5459ec77a2816d6c7789da9b206cedbe8a -rec7f919fdb70ff29a8de627937e4ad7008e59c1c
--- sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml	(.../PreTreatmentConnectionStack.qml)	(revision 7e503c5459ec77a2816d6c7789da9b206cedbe8a)
+++ sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml	(.../PreTreatmentConnectionStack.qml)	(revision ec7f919fdb70ff29a8de627937e4ad7008e59c1c)
@@ -41,6 +41,12 @@
     }
 
     PreTreatmentBase { id: _preTreatmentVitals // BP/HR Entry
+        function update(vSystolic, vDiastolic ,vHeartRate) {
+            _bphrEntry.systolic   = vSystolic   ? vSystolic  : ""
+            _bphrEntry.diastolic  = vDiastolic  ? vDiastolic : ""
+            _bphrEntry.heartRate  = vHeartRate  ? vHeartRate : ""
+        }
+
         header.stepIndex        : 6
         header.confirmText.text : _bphrEntry.isValid ? qsTr("CONFIRM") : qsTr("SKIP")
         header.backVisible      : true
@@ -70,13 +76,14 @@
             }
             else {
                 vTreatmentVitals.doSkip() // only for logging
+            }
 
+        }
+        Connections { target: vTreatmentVitals
+            onDidTrigger: {
+                _preTreatmentVitals.update( vSystolic, vDiastolic, vHeartRate )
             }
         }
-        onVisibleChanged: {
-            if ( visible )  vTreatmentVitals.doReset()
-                            vTreatmentVitals.enableUpdate = visible
-        }
     }
 
     PreTreatmentBase { id: _preTreatmentPatientConnection