Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
===================================================================
diff -u -r41422 -r41423
--- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js	(.../qualitymonitoringInstanceForm.js)	(revision 41422)
+++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js	(.../qualitymonitoringInstanceForm.js)	(revision 41423)
@@ -763,11 +763,20 @@
 //不合格物品登记明细
 function showRecordMaterialDetails(id, filedIndex, optionId, optionsLength) {
 	var tousseAndMaterialAllData = getAllTousseAndMaterialData();
-	if (!tousseAndMaterialAllData || tousseAndMaterialAllData.length == 0) {
-		showResultQM('器械包不能为空！');
+	var scope = Ext.getCmp('scope').getValue();
+	if (!tousseAndMaterialAllData) {
 		return
 	}
-	var scope = Ext.getCmp('scope').getValue();
+	if (tousseAndMaterialAllData.length == 0) {
+		if(scope == '器械包'){
+			showResultQM('器械包不能为空！');
+		}else if(scope == '材料'){
+			showResultQM('抽检器械不能为空！');
+		}else {
+			showResultQM('器械包或抽检器械不能为空！');
+		}
+		return
+	}
 	var win;
 	tousseBagsStore.removeAll();
 	materialInfosStore.removeAll();
@@ -5690,12 +5699,19 @@
 	return configItemOptionArr;
 }
 function getTousseAndMaterialAll() {
+	var scope = Ext.getCmp('scope').getValue();	
 	var allTousseData = getAllTousseAndMaterialData();
 	if(!allTousseData){
 		return
 	}
-	if(allTousseData.length == 0){
-		showResultQM('器械包不能为空！');
+	if (allTousseData.length == 0) {
+		if(scope == '器械包'){
+			showResultQM('器械包不能为空！');
+		}else if(scope == '材料'){
+			showResultQM('抽检器械不能为空！');
+		}else {
+			showResultQM('器械包或抽检器械不能为空！');
+		}
 		return
 	}
 	var tousseAndMaterialAll = {};
@@ -5729,7 +5745,6 @@
 	var tousseName = Ext.getCmp('tousseName').getRawValue();	//第一组的器械包名称
 	var material = Ext.getCmp('material').getValue();			//第一组的材料名称
 	var inspectName = Ext.getCmp('formName').getRawValue();		//监测项
-	var scope = Ext.getCmp('scope').getValue();					//监测范围
 	if (!allTousseOfSterileChecked()) {
 		if (inspectName != '无' && scope != '无' && scope != '灭菌炉记录') {
 			if (sstsConfig.enableRecordsQualifiedOfQualityMonitoringFunction == 2) {