Index: sources/gui/qml/AlarmItem.qml
===================================================================
diff -u -ra9b3b248a786b93bf6dfd8c29946d708d18dde9a -r9b628a1087942b7bee840ff9f01ee59f314cf943
--- sources/gui/qml/AlarmItem.qml	(.../AlarmItem.qml)	(revision a9b3b248a786b93bf6dfd8c29946d708d18dde9a)
+++ sources/gui/qml/AlarmItem.qml	(.../AlarmItem.qml)	(revision 9b628a1087942b7bee840ff9f01ee59f314cf943)
@@ -46,6 +46,7 @@
     readonly property alias  isSilenced     : vAlarmStatus.alarm_Flag_alarmsSilenced
     readonly property alias  timeout        : vAlarmStatus.alarm_MuteTimeout
     readonly property alias  alarm_AlarmID  : vAlarmStatus.alarm_AlarmID
+    readonly property alias  hasAlarm       : vAlarmStatus.hasAlarm
 
     function clearAlarm() {
         vAlarmStatus.doClearCondition()
Index: sources/gui/qml/dialogs/DiagnosticsDialog.qml
===================================================================
diff -u -ra9b3b248a786b93bf6dfd8c29946d708d18dde9a -r9b628a1087942b7bee840ff9f01ee59f314cf943
--- sources/gui/qml/dialogs/DiagnosticsDialog.qml	(.../DiagnosticsDialog.qml)	(revision a9b3b248a786b93bf6dfd8c29946d708d18dde9a)
+++ sources/gui/qml/dialogs/DiagnosticsDialog.qml	(.../DiagnosticsDialog.qml)	(revision 9b628a1087942b7bee840ff9f01ee59f314cf943)
@@ -539,7 +539,7 @@
         x: col(5)
         y: row(5.5)
         model: [
-            _alarmItem.alarm_AlarmID ,
+            _alarmItem.hasAlarm ? _alarmItem.alarm_AlarmID : 0,
         ]
         label: [
             "Top" ,
Index: sources/gui/qml/pages/MainStack.qml
===================================================================
diff -u -ra9b3b248a786b93bf6dfd8c29946d708d18dde9a -r9b628a1087942b7bee840ff9f01ee59f314cf943
--- sources/gui/qml/pages/MainStack.qml	(.../MainStack.qml)	(revision a9b3b248a786b93bf6dfd8c29946d708d18dde9a)
+++ sources/gui/qml/pages/MainStack.qml	(.../MainStack.qml)	(revision 9b628a1087942b7bee840ff9f01ee59f314cf943)
@@ -156,7 +156,7 @@
         function onStandbyWaitTreatmentChanged  ( vValue ) { /* It depends on the subModes of the standBy. Handled by onHome.  */   }
         function onStandbyWaitDisinfectChanged  ( vValue ) { page( _disinfectStack                  , vValue    )}
 
-        function onValidateParametersChanged    ( vValue ) {       _preTreatmentCreateStack         . clear    ()
+        function onValidateParametersChanged    ( vValue ) {       _preTreatmentCreateStack.clear   ( vValue    ) // vValue == true if enterig the state ( clear only on entering).
                                                              page( _preTreatmentCreateStack         , vValue    )}
         function onPreTreatmentChanged          ( vValue ) { page( _preTreatmentStack               , vValue    )}
         function onInTreatmentChanged           ( vValue ) { page( _treatmentStack                  , vValue    )}
Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateStack.qml
===================================================================
diff -u -ra9b3b248a786b93bf6dfd8c29946d708d18dde9a -r9b628a1087942b7bee840ff9f01ee59f314cf943
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateStack.qml	(.../PreTreatmentCreateStack.qml)	(revision a9b3b248a786b93bf6dfd8c29946d708d18dde9a)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateStack.qml	(.../PreTreatmentCreateStack.qml)	(revision 9b628a1087942b7bee840ff9f01ee59f314cf943)
@@ -50,7 +50,8 @@
               _pretreatmentPatientID.setFocus()
     }
 
-    function clear() {
+    function clear(vValue) {
+        if ( ! vValue ) return // delete only if asked to. // is used on state enter, and not done on exiting.
         _pretreatmentPatientID.clear()
         _pretreatmentCreate.clear()
     }
Index: sources/view/VTreatmentCreate.h
===================================================================
diff -u -ra9b3b248a786b93bf6dfd8c29946d708d18dde9a -r9b628a1087942b7bee840ff9f01ee59f314cf943
--- sources/view/VTreatmentCreate.h	(.../VTreatmentCreate.h)	(revision a9b3b248a786b93bf6dfd8c29946d708d18dde9a)
+++ sources/view/VTreatmentCreate.h	(.../VTreatmentCreate.h)	(revision 9b628a1087942b7bee840ff9f01ee59f314cf943)
@@ -127,7 +127,7 @@
 
     VIEW_DEC_CLASS(VTreatmentCreate)
     VIEW_DEC_SLOT(AdjustParametersValidationResponseData)
-    VIEW_DEC_SLOT(AdjustSerialNumberHDResponseData);
+    VIEW_DEC_SLOT(AdjustSerialNumberHDResponseData)
 
 private:
     QString enumToString(GuiRequestReasons vEnum);