Index: ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js
===================================================================
diff -u -r30751 -r30859
--- ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js	(.../reviewView.js)	(revision 30751)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js	(.../reviewView.js)	(revision 30859)
@@ -576,28 +576,36 @@
 	var needValidateRecords = [];
 	//验证右边grid选中的项是否是 相同的灭菌方式
 	for ( var i = 0;i<records.length;i++) {
-		var sType = records[i].data['sterilingType'];
+		var sType = records[i].data['sterilingType'] || '';
 		
 		if(sType != '无'){
 			//同步的ajax请求校验该灭菌程序能否进入审核列表,如果不能,则本次循环continue
 			var sterilingTypeCanAddToReview = true;
-			DWREngine.setAsync(false);
-			SterilisationTableManager.validateSterilingTypeCanAddToReview(sType , function(jsonResult){
-				if(!jsonResult.success){
-					if(jsonResult.message){
-						showResult(jsonResult.message , null , sstsConfig.messagePauseTimeOnReviewPage);
-					}else{
-						showResult("条码为" + records[i].data['barcode'] + "的" + records[i].data['tousseDefinition.name'] + "的灭菌程序 " + sType + " 不能通过<进入"+reviewViewText+"列表>添加" , null , sstsConfig.messagePauseTimeOnReviewPage);
-					}
-					sterilingTypeCanAddToReview = false;
-				}
+			if(sType == null || sType == ''){
 				//导入材料清单需要用到tousseDefinitionId，tousseDefinitionName
 				if(records[i].data['tousseDefinition.name'] && records[i].data['tousseDefinition.id']){
 					records[i].data.tousseDefinitionId = records[i].data['tousseDefinition.id'];
 					records[i].data.tousseDefinitionName = records[i].data['tousseDefinition.name']
 				}
-			});
-			DWREngine.setAsync(true);
+			}else {
+				DWREngine.setAsync(false);
+				SterilisationTableManager.validateSterilingTypeCanAddToReview(sType , function(jsonResult){
+					if(!jsonResult.success){
+						if(jsonResult.message){
+							showResult(jsonResult.message , null , sstsConfig.messagePauseTimeOnReviewPage);
+						}else{
+							showResult("条码为" + records[i].data['barcode'] + "的" + records[i].data['tousseDefinition.name'] + "的灭菌程序 " + sType + " 不能通过<进入"+reviewViewText+"列表>添加" , null , sstsConfig.messagePauseTimeOnReviewPage);
+						}
+						sterilingTypeCanAddToReview = false;
+					}
+					//导入材料清单需要用到tousseDefinitionId，tousseDefinitionName
+					if(records[i].data['tousseDefinition.name'] && records[i].data['tousseDefinition.id']){
+						records[i].data.tousseDefinitionId = records[i].data['tousseDefinition.id'];
+						records[i].data.tousseDefinitionName = records[i].data['tousseDefinition.name']
+					}
+				});
+				DWREngine.setAsync(true);
+			}
 			if(sterilingTypeCanAddToReview == false){
 				delete records[i];
 				continue;
@@ -615,18 +623,14 @@
 		if(tempSM == null){
 			tempSM = sType;
 		}
-		if(sType != tempSM){
+
+		if(sType == null || sType == ''){
 			rightGridVaildPass = false;
 		}
 	}
 	if(rightGridVaildPass == false){
-		top.Ext.MessageBox.confirm("提示","所选的器械包灭菌程序不一致,要继续"+reviewViewText+"吗？",function(btn){
-			if(btn == 'yes'){
-				addTousse(needValidateRecords);
-			}else{
-				return false;
-			}
-		});
+		addTousse(needValidateRecords);
+		return;
 	}else{
 		var store = Ext.getCmp('forReviewGrid').getStore();
 		var leftGridVaildPass = true;