Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml
===================================================================
diff -u -r9c15c403ee00b776def3aaf8bfb32a3f8c6f2792 -r36981dc04fd7c25285975d4ba5ad8c1ddeb16028
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml	(.../PreTreatmentCreatePatientPrescription.qml)	(revision 9c15c403ee00b776def3aaf8bfb32a3f8c6f2792)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml	(.../PreTreatmentCreatePatientPrescription.qml)	(revision 36981dc04fd7c25285975d4ba5ad8c1ddeb16028)
@@ -12,16 +12,14 @@
     readonly property int cellWidth         : Variables.createRxLabelUnitContainerWidth
     readonly property int cellHeight        : Variables.createRxLabelUnitContainerHeight
     readonly property bool heparinFeatured  : vSettings.heparinSyringePump
-    property bool isHDFFeatured             : vTreatmentCreate.treatmentModality === HeaderBar.Mode_HDF ||
-                                              vTreatmentCreate.treatmentModality === HeaderBar.Mode_HD_Online_Fluid
-    property bool isHeparinOn               : _heparinRxControl.value === PreTreatmentCreatePatientPrescription.ON
+    property bool isHDFFeatured             : vTreatmentCreate.treatmentModality === HeaderBar.Mode_HDF
+    property bool isHeparinOn               :  _heparinRxControl.value === PreTreatmentCreatePatientPrescription.ON
 
     property bool editingEnabled            : true
     property int columnSpacing              : 15
 
     spacing      : Variables.defaultMargin * 3
 
-
     enum HeparinEnabled {
         OFF,
         ON
@@ -65,6 +63,9 @@
             vTreatmentCreate.treatmentDuration          = vTreatmentRanges.treatmentDurationDef
             vTreatmentCreate.ultrafiltrationVolume      = vTreatmentRanges.ultrafiltrationVolumeDef
             vTreatmentCreate.dialysateTemp              = vTreatmentRanges.dialysateTempDef
+            vTreatmentCreate.acidConcentrate            = 0
+            vTreatmentCreate.dryBicarbCartSize          = 0
+            vTreatmentCreate.dialyzerType               = 0
         }
     }
 
@@ -81,6 +82,7 @@
 
     function clear () {
         vTreatmentCreate.patientID          = ""
+        vTreatmentCreate.secondaryPatientID = ""
         _hdfTreatmentModeControl        .clear()
         _subFluidVolume                 .clear()
         _bloodFlowRate                  .clear()
@@ -113,31 +115,15 @@
 
         LabelUnitContainer { id: _patientID
             text                            : qsTr("Patient ID")
+            showEdit                        : true
+            onEditClicked                   : _patientIdEntry.open()
 
-            contentItem : TextEntry { id: _pretreatmentPatientIDEntry
-                clip                        : true
-                textInput.width             : parent.width - Variables.defaultMargin * 4
-                text                        : vTreatmentCreate.patientID
-                anchors.centerIn            : parent
-                textInput.maximumLength     : 20  // LEAHI-PRS-236
-                textInput.rightPadding      : Variables.defaultMargin
-                textInput.leftPadding       : Variables.defaultMargin * 14
-                textInput.inputMethodHints  : Qt.ImhPreferLowercase
-                textInput.echoMode          : TextInput.Normal
-                textInput.validator         : RegExpValidator { regExp: Variables.regExp_PatientID }
-                line.visible                : false
-                enabled                     : _root.editingEnabled
-
-                Text { id: _patientIDPlaceHolderText
-                    text                : Variables.emptyEntry
-                    anchors.fill        : parent
-                    rightPadding        : 125
-                    horizontalAlignment : Text.AlignRight
-                    font.pixelSize      : Fonts.fontPixelValueControl
-                    color               : Colors.offWhite
-                    visible             :   _pretreatmentPatientIDEntry.textInput.text.length === 0 &&
-                                          ! _pretreatmentPatientIDEntry.textInput.activeFocus
-                }
+            contentItem : Text { id: _patientIDText
+                anchors.centerIn    : parent
+                horizontalAlignment : Text.AlignRight
+                font.pixelSize      : Fonts.fontPixelValueControl
+                color               : Colors.offWhite
+                text                : vTreatmentCreate.patientID !== "" ? vTreatmentCreate.patientID : Variables.emptyEntry
             }
         }
 
@@ -155,9 +141,6 @@
                 currentIndex        : vTreatmentCreate.treatmentModality
                 model               : vTreatmentRanges.treatmentModalityOptions
                 centerHorizontally  : true
-                itemsEnabled        : [ vTreatmentCreate.treatmentModality === HeaderBar.Mode_HD    ,   // Mode_HD
-                                        vTreatmentCreate.treatmentModality !== HeaderBar.Mode_HD    ,   // Mode_HDF
-                                        vTreatmentCreate.treatmentModality !== HeaderBar.Mode_HD    ]   // Mode_HD_Online_Fluid
 
                 onActivated         : {
                     if ( ! _treatmentModality.valid ) { vTreatmentCreate.treatmentModalityRejectReason = Variables.noRejectReason }
@@ -202,7 +185,7 @@
             step            : vTreatmentRanges.substitutionVolumeRes
             defaultValue    : vTreatmentRanges.substitutionVolumeDef
             decimal         : Variables.substitutionPrecision
-            value           : vTreatmentCreate.substitutionFluidVolume
+            value           : _root.isHDFFeatured ? vTreatmentCreate.substitutionFluidVolume : 0
             isActive        : vTreatmentCreate.substitutionFluidVolumeSet
 
             onDidActiveChange   : function(vState) {  vTreatmentCreate.substitutionFluidVolumeSet = vState }