Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualityMonitoringDefinitionView.js
===================================================================
diff -u -r35048 -r35051
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualityMonitoringDefinitionView.js	(.../qualityMonitoringDefinitionView.js)	(revision 35048)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualityMonitoringDefinitionView.js	(.../qualityMonitoringDefinitionView.js)	(revision 35051)
@@ -1273,6 +1273,10 @@
 							xtype:'hidden',
 							id:'hiddenWarningFrequency',
 							name:'hiddenWarningFrequency'
+						},{
+							xtype:'hidden',
+							id:'resetWarnedNumberOfTimes',
+							name:'resetWarnedNumberOfTimes'
 						}, {
 							columnWidth: .25,
 							layout: 'form',
@@ -1752,22 +1756,16 @@
 			id: 'saveBtn',
 			text: '保存',
 			handler: function(){
-				var warningFrequency = top.Ext.getCmp('warningFrequency').getValue();
 				var hiddenWarningFrequency = top.Ext.getCmp('hiddenWarningFrequency').getValue();
-				var endMethod = top.Ext.getCmp('endMethod').getValue();
-				if(endMethod == '指定次数提醒'){
-					if(warningFrequency !== hiddenWarningFrequency){
-						top.Ext.Msg.confirm('请确认', '本次改动是否要重置提醒次数？', function (btn) {
-							if (btn == 'yes') {
-								saveFormDefinition()
-							}else {
-								top.Ext.getCmp('warningFrequency').setValue(hiddenWarningFrequency);
-								saveFormDefinition()
-							}
-						})
-					}else {
-						saveFormDefinition()
-					}
+				if(hiddenWarningFrequency > 0){
+					top.Ext.Msg.confirm('请确认', '本次改动是否要重置提醒次数？', function (btn) {
+						if (btn == 'yes') {
+							top.Ext.getCmp('resetWarnedNumberOfTimes').setValue('是');
+							saveFormDefinition()
+						}else {
+							saveFormDefinition()
+						}
+					})
 				}else {
 					saveFormDefinition()
 				}
@@ -1776,22 +1774,16 @@
 			id: 'deployBtn',
 			text: '部署',
 			handler: function(){
-				var warningFrequency = top.Ext.getCmp('warningFrequency').getValue();
-				var hiddenWarningFrequency = top.Ext.getCmp('warningFrequency').getValue();
-				var endMethod = top.Ext.getCmp('endMethod').getValue();
-				if(endMethod == '指定次数提醒'){
-					if(warningFrequency !== hiddenWarningFrequency){
-						top.Ext.Msg.confirm('请确认', '本次改动是否要重置提醒次数？', function (btn) {
-							if (btn == 'yes') {
-								deployFormDefinition()
-							}else {
-								top.Ext.getCmp('warningFrequency').setValue(hiddenWarningFrequency);
-								deployFormDefinition()
-							}
-						})
-					}else {
-						deployFormDefinition()
-					}
+				var hiddenWarningFrequency = top.Ext.getCmp('hiddenWarningFrequency').getValue();
+				if(hiddenWarningFrequency > 0){
+					top.Ext.Msg.confirm('请确认', '本次改动是否要重置提醒次数？', function (btn) {
+						if (btn == 'yes') {
+							top.Ext.getCmp('resetWarnedNumberOfTimes').setValue('是');
+							deployFormDefinition()
+						}else {
+							deployFormDefinition()
+						}
+					})
 				}else {
 					deployFormDefinition()
 				}
@@ -1857,7 +1849,7 @@
 						top.Ext.getCmp('warningForFrequencyBox').hide();
 					}
 					top.Ext.getCmp('warningFrequency').setValue(formConfig.warningFrequency || 1);
-					top.Ext.getCmp('hiddenWarningFrequency').setValue(formConfig.warningFrequency || 1);
+					top.Ext.getCmp('hiddenWarningFrequency').setValue(formConfig.warnedNumberOfTimes);
 					top.Ext.getCmp('warningUserIds').setValue(formConfig.warningUserIds);
 					top.Ext.getCmp('warningUserNames').setValue(formConfig.warningUserIds);
 					top.Ext.getCmp('warningUserNames').setRawValue(formConfig.warningUserNames);
@@ -1946,8 +1938,9 @@
 
 	var warningUserIds = top.Ext.getCmp('warningUserIds').getValue()
 	var warningUserNames = top.Ext.getCmp('warningUserNames').getValue();
+	var warningUserNames2 = top.Ext.getCmp('warningUserNames').getRawValue();
 	var separateWrite = top.Ext.getCmp('separateWrite').getValue();
-	var remindAllUsers = '';
+	var remindAllUsers = top.Ext.getCmp('remindAllUsers').getValue();
 	if (sstsConfig.enableThePeriodicMonitoringRemindersFunction && entityName == '定期监测') {
 		if (cycleName == '按周') {
 			if (warningWeekDays == '') {
@@ -1975,8 +1968,7 @@
 				return;
 			}
 		}
-	
-		if(warningUserNames == '' && warningUserIds == ''){
+		if(warningUserNames2 == '' && warningUserNames == '' && warningUserIds == ''){
 			showResult('请填写提醒人员！');
 			return;
 		}
Index: ssts-web/src/main/webapp/homepage/portalPage.js
===================================================================
diff -u -r34983 -r35051
--- ssts-web/src/main/webapp/homepage/portalPage.js	(.../portalPage.js)	(revision 34983)
+++ ssts-web/src/main/webapp/homepage/portalPage.js	(.../portalPage.js)	(revision 35051)
@@ -294,7 +294,7 @@
 								   {header: "名称", width: 100, dataIndex: 'formName',renderer : function(v, p, record) {
 									   return "<a href=\"#\" onclick=\"goRoutineMonitoringView();return false;\">"+v+"</a>";
 								   }},
-								   {header: "灭菌结时间", width: 240,dataIndex: 'warningDays'}
+								   {header: "监测时间", width: 240,dataIndex: 'warningDays'}
 							   ],
 							   stripeRows: true,
 							   viewConfig: {