Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
===================================================================
diff -u -r17937 -r17938
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js	(.../sterilizationRecordForm.js)	(revision 17937)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js	(.../sterilizationRecordForm.js)	(revision 17938)
@@ -66,17 +66,6 @@
 	}
 });
 
-////已废弃,改为下面的变量
-//var jsonStore = new Ext.data.SimpleStore( {
-//	fields : [ 'value'],
-//	data : [
-//	    ['器械包灭菌'],
-//	    ['每天例行监测'], 
-//	    ['更换部件或维护监测'],
-//		['装载监测']
-//	]
-//});
-
 //远程方法请求后台查询灭菌目录
 var sterilizationPurposeJsonStore = new Ext.data.Store({
 	proxy : new Ext.data.HttpProxy({
@@ -533,21 +522,18 @@
 			}
 		}
 	}
-	loadTousseInstance(barcodeStr,sterilizationRecordId,removePendingSterilizationGoods(barcodeStr));
+//	loadTousseInstance(barcodeStr,sterilizationRecordId,removePendingSterilizationGoods(barcodeStr));
+	loadTousseInstance(barcodeStr,sterilizationRecordId);
 }
 //扫描器械包(或灭菌篮筐或虚拟篮筐)条码
-function loadTousseInstance(barcodeStr,sterilizationRecordId,callBack) {
+//function loadTousseInstance(barcodeStr,sterilizationRecordId,callBack) {
+function loadTousseInstance(barcodeStr, sterilizationRecordId) {
 	if(barcodeStr == '' || barcodeStr.length <= 0){
 		showResult("请输入条码！");
 		return;
 	}
-//	var sterilizationPurpose = top.Ext.getCmp('sterilizationPurpose').getValue();
-//	if(sterilizationPurpose == '每天例行监测'){
-//		showResult("例行监测不能灭菌物品！");
-//		return;
-//	}
+
 	var canAddTousse = sterilizationCanAddTousse();  //当前灭菌程序是否可以添加灭菌物品
-	
 	if(!canAddTousse){
 		showResult("当前灭菌程序不能灭菌物品！");
 		return;
@@ -576,7 +562,8 @@
 			var speakBasket = new SpeakBasket();
 			if (result != null && result != 'null') {
 				var str = result.split(",");
-				if(str[1] == 0){//器械包(单个)
+				var flag = str[1];
+				if(flag == 0){//器械包(单个)
 					var sterilingType = str[3];//灭菌程序
 					var tousseDepart = str[4];//科室
 					if(sterilingType.length > 0){
@@ -614,10 +601,10 @@
 					if(str[6] == "是"){
 						showResultWithoutSpeak("此外来器械包含有植入物，需要做生物监测！");
 					}
-					if (callBack){
-						callBack(barcodeStr);
-					}
-				}else if(str[1] == 1){//容器(单个灭菌框或虚拟篮筐)
+//					if (callBack){
+//						callBack(barcodeStr);
+//					}
+				}else if(flag == 1){//容器(单个灭菌框或虚拟篮筐)
 					var sterilingType = "";
 					if (str.length <= 3) {
 						showResult('篮筐内无待灭菌物品');
@@ -670,16 +657,16 @@
 //						addOrUpdateTousseStoreItemCount(array[1],1);
 						speakBasket.addGoods(str[2],name,1);
 					}
-					if (callBack){
-						callBack(barcodeStr);
-					}
+//					if (callBack){
+//						callBack(barcodeStr);
+//					}
 					//加载灭菌参数
 					SterilizationRecordTableManager.getParameter(top.Ext.getCmp('sterilizationType').getValue(),function(result){
 						if(result != null && result.length > 0){
 							top.Ext.getCmp('parameter').setValue(result);
 						}
 					});
-				}else if(str[1] == 2){//不追溯器械包
+				}else if(flag == 2){//不追溯器械包
 					for(var i=2;i<str.length;i++){
 						var array = str[i].split(":");
 						var barcode =array[0];
@@ -703,7 +690,7 @@
 						removePendingSterilizationGoods(barcode);
 					}
 					speakContent = sterilizationColumnTree.getRootNode().text;
-				}else if(str[1] == 3){//首尾器械包,since2015-10-27
+				}else if(flag == 3){//首尾器械包,since2015-10-27
 					var alreadyAdd = 0;
 					var sterilingType = "";
 					if (str.length <= 3) {
@@ -774,9 +761,9 @@
 							alreadyAdd++;
 						}
 					}
-					if (callBack){
-						callBack(barcodeStr);
-					}
+//					if (callBack){
+//						callBack(barcodeStr);
+//					}
 					//加载灭菌参数
 					SterilizationRecordTableManager.getParameter(top.Ext.getCmp('sterilizationType').getValue(),function(result){
 						if(result != null && result.length > 0){
@@ -787,7 +774,7 @@
 						showResult('未找到符合条件的器械包或器械包已扫描至表格中.');
 						speakContent = null;
 					}
-				}else if(str[1] == 4){//首尾虚拟篮筐,since2015-10-27
+				}else if(flag == 4){//首尾虚拟篮筐,since2015-10-27
 					var alreadyAdd = 0;
 					var sterilingType = "";
 					if (str.length <= 3) {
@@ -874,9 +861,9 @@
 							}
 						}
 					}
-					if (callBack){
-						callBack(barcodeStr);
-					}
+//					if (callBack){
+//						callBack(barcodeStr);
+//					}
 					//加载灭菌参数
 					SterilizationRecordTableManager.getParameter(top.Ext.getCmp('sterilizationType').getValue(),function(result){
 						if(result != null && result.length > 0){
@@ -890,7 +877,9 @@
 				}else{
 					showResult(str[2]);
 				}
-				//speaker.speak(speakContent);
+				if (flag == 0 || flag == 1 || flag == 3) {
+					removePendingSterilizationGoods(barcodeStr);
+				}
 				speakBasket.speakContent();
 			}else{
 				showResult("您扫描的物品非已审核的器械包或篮筐！");
@@ -2011,7 +2000,8 @@
 																loadPositionByBarcode(barcode);
 																top.Ext.getCmp('inputBarcode').setValue("");
 															}else if("virtualBasket" == result){  //虚拟篮筐3
-																loadTousseInstance(barcode,recordID,removePendingSterilizationGoods(barcode));
+//																loadTousseInstance(barcode,recordID,removePendingSterilizationGoods(barcode));
+																loadTousseInstance(barcode,recordID);
 																if(hiddenEndBarcode || currentScanMode == 'single'){
 																	top.Ext.getCmp('inputBarcode').setValue("");//如果使用虚拟篮筐机制,扫描成功后需要清除该文本内容
 																}else{
@@ -2088,9 +2078,11 @@
 														var result = response.responseText;
 														if(result != null && result.length > 0){
 															if("virtualBasket" == result){
-																loadTousseInstance(barcode + ";" + barcodeEnd,recordID,removePendingSterilizationGoods(barcode + ";" + barcodeEnd));
+//																loadTousseInstance(barcode + ";" + barcodeEnd,recordID,removePendingSterilizationGoods(barcode + ";" + barcodeEnd));
+																loadTousseInstance(barcode + ";" + barcodeEnd,recordID);
 															}else if(TOUSSEINSTANCE == result){
-																loadTousseInstance(barcode + ";" + barcodeEnd,recordID,removePendingSterilizationGoods(barcode + ";" + barcodeEnd));
+//																loadTousseInstance(barcode + ";" + barcodeEnd,recordID,removePendingSterilizationGoods(barcode + ";" + barcodeEnd));
+																loadTousseInstance(barcode + ";" + barcodeEnd,recordID);
 															}else if("notTheSame" == result){
 																showResult("首尾条码/篮筐类型不一致,必须均为器械包条码或虚拟篮筐编号！");
 															}else if("barcodeEndInvalid" == result){