Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml
===================================================================
diff -u -r58d24875f4e9c0115a05cae01b4a4e0a26818396 -rdc8969f6c7bbdb46d2de22622e58e457ceb37df4
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml	(.../PreTreatmentCreateContent.qml)	(revision 58d24875f4e9c0115a05cae01b4a4e0a26818396)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml	(.../PreTreatmentCreateContent.qml)	(revision dc8969f6c7bbdb46d2de22622e58e457ceb37df4)
@@ -114,10 +114,11 @@
                 _preTreatmentCreatePatientPrescription  .ready()
     }
 
-    function validate () {
-        vTreatmentCreate                    .patientID = _preTreatmentCreateTreatmentSettings.patientID
-        vPostTreatmentAdjustmentTreatmentLog.patientID = _preTreatmentCreateTreatmentSettings.patientID // store for the TreatmentLog
-
+    function validate (vFinalConfirmation) {
+        // store for the TreatmentLog
+        vPostTreatmentAdjustmentTreatmentLog.patientID          = vTreatmentCreate.patientID
+        vPostTreatmentAdjustmentTreatmentLog.secondaryPatientID = vTreatmentCreate.secondaryPatientID
+        vTreatmentCreate.finalConfirmation = vFinalConfirmation ? 1 : 0
         vTreatmentCreate.doValidation       (        )
     }
 
@@ -133,8 +134,6 @@
 
     Connections{ target: vTreatmentCreate
         function onDidValidationPass            ( ) {
-            vPostTreatmentAdjustmentTreatmentLog.heparinDispensingRateOff = vTreatmentCreate.heparinDispensingRateOff   = ! vTreatmentCreate.heparinDispensingRate
-            vPostTreatmentAdjustmentTreatmentLog.heparinBolusVolumeOff    = vTreatmentCreate.heparinBolusVolumeOff      = ! vTreatmentCreate.heparinBolusVolume
             activateAndRefresh() // refresh values on validation
             clearErrors()
         }
@@ -152,6 +151,7 @@
 
     HeparinRxAdjustment {   id: _heparinRxAdjustment;   editingEnabled: _root.editingEnabled    }
     UfVolumeAdjustment  {   id: _ufVolumeAdjustment;    editingEnabled: _root.editingEnabled    }
+    PatientIdEntry      {   id: _patientIdEntry;        editingEnabled: _root.editingEnabled    }
 
     MouseArea { // click outside to remove active focus and lower keyboard
         anchors.fill            : parent
@@ -215,10 +215,6 @@
         onActivated: {
             const selectedItem = model[currentIndex]
 
-            // only send  AdjustParametersConfirmRequestData::eCancel when validated
-            // Telling FW user is canceling confirm treatment parameters
-            if ( vTreatmentCreate.parametersValidated ) { vTreatmentCreate.doCancel() }
-
             if      ( selectedItem === _root.editRx     )   { /*All parameters set to edit if parameters are validated */   }
             else if ( selectedItem === _root.selectRx   )   { print("TODO: Open and Select from Prescription Manager")      }
             else if ( selectedItem === _root.clearAll   )   { _root.clear()                                                 }