Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualityMonitoringDefinitionView.js
===================================================================
diff -u -r35012 -r35040
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualityMonitoringDefinitionView.js	(.../qualityMonitoringDefinitionView.js)	(revision 35012)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualityMonitoringDefinitionView.js	(.../qualityMonitoringDefinitionView.js)	(revision 35040)
@@ -1156,7 +1156,7 @@
 						editable: false,
 						store: new top.Ext.data.SimpleStore({
 							fields: ['value'],
-							data: [['指定日期范围提醒'], ['按月次数提醒'], ['一直提醒']]
+							data: [['指定日期范围提醒'], ['指定次数提醒'], ['一直提醒']]
 						}
 						),
 						value: '一直提醒',
@@ -1171,7 +1171,7 @@
 									top.Ext.getCmp('warningForDate').show();
 									top.Ext.getCmp('warningForFrequencyBox').hide();
 									top.Ext.getCmp('warningFrequency').setValue('');
-								} else if (value == '按月次数提醒') {
+								} else if (value == '指定次数提醒') {
 									top.Ext.getCmp('warningForDate').hide();
 									top.Ext.getCmp('warningStartDateTime').setValue('');
 									top.Ext.getCmp('warningEndDateTime').setValue('');
@@ -1231,7 +1231,7 @@
 								format: 'Y-m-d',
 								altFormats: 'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
 								allowBlank: true,
-								anchor: '95%'
+								anchor: '100%'
 							}]
 						}]
 					}],
@@ -1272,6 +1272,7 @@
 								allowNegative: false,
 								allowDecimals: false,
 								anchor: '98%',
+								minValue:1,
 								allowBlank: true
 							}]
 						}, {
@@ -1774,7 +1775,7 @@
 						top.Ext.getCmp('warningStartDateTime').setValue(formConfig.warningStartDateTime);
 						top.Ext.getCmp('warningEndDateTime').setValue(formConfig.warningEndDateTime);
 						top.Ext.getCmp('warningForFrequencyBox').hide();
-					} else if (formConfig.endMethod == '按月次数提醒') {
+					} else if (formConfig.endMethod == '指定次数提醒') {
 						top.Ext.getCmp('warningForDate').hide();
 						top.Ext.getCmp('warningForFrequencyBox').show();
 						top.Ext.getCmp('warningFrequency').setValue(formConfig.warningFrequency);
@@ -1835,7 +1836,7 @@
 function submitFormDefinitionForm(actionType) {
 	var formPanel = top.Ext.getCmp('formDefinitionForm');
 	if (!isFormValid(formPanel)) {
-		showResult('请正确填写表单各值');
+		showResult('请填写所有的必填项。');
 		return false;
 	}
 
@@ -1884,7 +1885,7 @@
 			showResult('请选择日期范围！');
 			return;
 		}
-	} else if (cycleName == '按月次数提醒') {
+	} else if (cycleName == '指定次数提醒') {
 		if (warningFrequency == '') {
 			showResult('请填写提醒次数！');
 			return;
@@ -1895,7 +1896,11 @@
 		warningUserIds = ''
 		remindAllUsers = '是';
 	} else {
-		warningUserIds = warningUserNames
+		if(warningUserNames == ''){
+			warningUserIds = top.Ext.getCmp('warningUserIds').getValue();
+		}else {
+			warningUserIds = warningUserNames
+		}
 	}
 
 	top.Ext.getCmp('warningUserIds').setValue(warningUserIds);