Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml
===================================================================
diff -u -re12570fc8c5e8a16e27875635daee81422ea3abb -re81cebefb7bc95553f32e6ba505706683f9c12b4
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml	(.../PreTreatmentCreate.qml)	(revision e12570fc8c5e8a16e27875635daee81422ea3abb)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml	(.../PreTreatmentCreate.qml)	(revision e81cebefb7bc95553f32e6ba505706683f9c12b4)
@@ -221,7 +221,7 @@
                     if(!valid) {
                         vTreatmentCreate.heparinDispensingRateRejectReason  = Variables.noRejectReason
                     }
-                    vTreatmentCreate.heparinDispensingRate                  = value
+                    vTreatmentCreate.heparinDispensingRate                  = _heparinDispensingRateSwitch.checked ? value : 0
                 }
                 //            ToDo: create a component for Switch,
                 //            ToDo: Consider putting the new CheckBox component into the SliderCreateTreatment component and set via boolean property
@@ -301,7 +301,7 @@
                     if(!valid) {
                         vTreatmentCreate.heparinBolusVolumeRejectReason = Variables.noRejectReason
                     }
-                    vTreatmentCreate.heparinBolusVolume                 = value
+                    vTreatmentCreate.heparinBolusVolume                 = _heparinBolusVolumeSwitch.checked ? value : 0
                 }
 
                 //            ToDo: create a component for this,
@@ -740,7 +740,7 @@
                     if(!valid) {
                         vTreatmentCreate.bloodPressureMeasureIntervalRejectReason   = Variables.noRejectReason
                     }
-                    vTreatmentCreate.bloodPressureMeasureInterval                   = value
+                    vTreatmentCreate.bloodPressureMeasureInterval                   = _bloodPressureIntervalSwitch.checked ? value : 0
                 }
 
                 //            ToDo: create a component for this,