Index: ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/service/QualityMonitoringInstanceManagerImpl.java
===================================================================
diff -u -r40497 -r40505
--- ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/service/QualityMonitoringInstanceManagerImpl.java	(.../QualityMonitoringInstanceManagerImpl.java)	(revision 40497)
+++ ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/service/QualityMonitoringInstanceManagerImpl.java	(.../QualityMonitoringInstanceManagerImpl.java)	(revision 40505)
@@ -66,7 +66,6 @@
 import com.forgon.disinfectsystem.recyclingapplication.service.RecyclingApplicationManager;
 import com.forgon.disinfectsystem.sterilizationmanager.sterilizationrecord.service.SterilizationRecordManager;
 import com.forgon.disinfectsystem.tousse.imagefilemanager.service.ImageFileManager;
-import com.forgon.disinfectsystem.tousse.materialdefinition.service.MaterialDefinitionManager;
 import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseDefinitionManager;
 import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseInstanceManager;
 import com.forgon.disinfectsystem.washanddisinfectmanager.washanddisinfectrecord.service.WashAndDisinfectRecordManager;
@@ -96,8 +95,6 @@
 	
 	private ClassifyBasketManager classifyBasketManager;
 	
-	private MaterialDefinitionManager materialDefinitionManager;
-	
 	private BarcodeManager barcodeManager;
 	
 	private TousseInstanceManager tousseInstanceManager;
@@ -159,11 +156,6 @@
 		this.barcodeManager = barcodeManager;
 	}
 
-	public void setMaterialDefinitionManager(
-			MaterialDefinitionManager materialDefinitionManager) {
-		this.materialDefinitionManager = materialDefinitionManager;
-	}
-
 	public void setImageFileManager(ImageFileManager imageFileManager) {
 		this.imageFileManager = imageFileManager;
 	}
@@ -2162,21 +2154,7 @@
 				}
 			}
 			
-			if(StringUtils.isBlank(tousseInstanceInfo) && StringUtils.isBlank(materialInfo)){
-				//抽检器械为空，只保存登记为合格的质量监测记录或者提示抽检器械不能都为空
-				if(StringUtils.equals(tempInstance.getIsQualified(), Constants.STR_YES) 
-						&& (enableRecordsQualifiedOfQualityMonitoringFunction == 1 || enableRecordsQualifiedOfQualityMonitoringFunction == 2)){
-					saveQualityMonitoringInstance_internal(tempInstance, tempMap);
-				}else{
-					throw new RuntimeException("抽检器械和监测项不能都为空");
-				}
-			}else if(enableRecordsQualifiedOfQualityMonitoringFunction == 1 && StringUtils.equals(tempInstance.getIsQualified(), Constants.STR_YES)){
-				//抽检器械不为空
-				//enableRecordsQualifiedOfQualityMonitoringFunction=1时，登记为合格时，不允许录入抽检器械包和抽检器械；
-				throw new RuntimeException("质量监测登记为合格时，不允许录入抽检器械包和抽检器械");
-			}else{
-				this.save(tempInstance, tempMap);
-			}
+			this.save(tempInstance, tempMap);
 			saveQualityMonitoringInstanceList.add(tempInstance);
 		}
 		return saveQualityMonitoringInstanceList;