Index: ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js
===================================================================
diff -u -r14127 -r14469
--- ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js	(.../routineMonitoringView.js)	(revision 14127)
+++ ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js	(.../routineMonitoringView.js)	(revision 14469)
@@ -496,7 +496,7 @@
 				labelWidth : 90,
 				items : [{
 					xtype : 'combo',
-					fieldLabel : "监测项1",
+					fieldLabel : "监测项",
 					valueField : 'inspectItem',
 					displayField : 'inspectItem',
 					store : inspectItemStore,
@@ -868,7 +868,7 @@
 				labelWidth : 90,
 				items : [{
 					xtype : 'combo',
-					fieldLabel : "监测项2",
+					fieldLabel : "监测项",
 					valueField : 'inspectItem',
 					displayField : 'inspectItem',
 					store : inspectItemStore,
@@ -1478,10 +1478,10 @@
 		}
 	}
 	
-	submitForm();
+	submitForm(thiz);
 }
 
-function submitForm(){
+function submitForm(thiz){
 	top.Ext.getCmp('qualityMonitoringItems').setValue(Ext.encode(qualityMonitoringArray));
 	
 	top.Ext.getCmp('addRoutineMonitoringForm').form.submit( {
@@ -1496,6 +1496,7 @@
 		},
 		failure : function(form, action) {
 			alert('failure = ' + action.failureType);
+			thiz.enable();
 		}
 	});
 }
Index: ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoringmanager/qualitymonitoring/service/QualityMonitoringManagerImpl.java
===================================================================
diff -u -r14425 -r14469
--- ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoringmanager/qualitymonitoring/service/QualityMonitoringManagerImpl.java	(.../QualityMonitoringManagerImpl.java)	(revision 14425)
+++ ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoringmanager/qualitymonitoring/service/QualityMonitoringManagerImpl.java	(.../QualityMonitoringManagerImpl.java)	(revision 14469)
@@ -266,18 +266,18 @@
 				}
 			}
 
-			String[] material = materialInfo.split(";");
+			String[] material = StringUtils.isNotBlank(materialInfo) ? materialInfo.split(";") : null;
 			if ("质量监测".equals(qualityMonitoring.getType())) {
 				if (StringUtils.isNotBlank(materialInfo)) {
 					
 					// 清洗不干净物品入筐
 					String containerBarcode = StrutsParamUtils.getPraramValue("containerBarcode", null);
 					ClassifyBasket basket = null;
-					if(material.length > 0){
+					if(material != null && material.length > 0){
 						basket = getUnWashClassifyBasket(containerBarcode);
 					}
 					
-					for (int i = 0; i < material.length; i++) {
+					for (int i = 0; material != null && i < material.length; i++) {
 						QualityMonitoring newMonitoring = new QualityMonitoring();
 						String[] nameAndAmount = material[i].split(":");
 						String name = nameAndAmount[0];