Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js
===================================================================
diff -u -r27821 -r28301
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js	(.../sterilizationLoadingForm.js)	(revision 27821)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js	(.../sterilizationLoadingForm.js)	(revision 28301)
@@ -7,7 +7,8 @@
 var waitSterileLoadingTousseGrid;//待灭菌装载的器械包
 var reviewedBasketId;
 var firstSterilingTypeOfTousseInBasket;//灭菌篮筐内的第一个器械包的灭菌程序
-
+var sterilizationLoadingAudio = document.getElementById('sterilizationLoadingAudio');
+var sterilizationLoadingAudio2 = document.getElementById('sterilizationLoadingAudio2');
 //是否在待灭菌装载器械包列表中，显示“科室”列和搜索框
 var showDepartOfTousseInstanceSterile = sstsConfig.showDepartOfTousseInstanceSterile?true:false;
 var showDepartOfTousseInstanceSterileName = sstsConfig.showDepartOfTousseInstanceSterile?"科室:":"";
@@ -421,7 +422,6 @@
 	SterileLoadingTableManager.scanBarcodeAndAddTousseToBasket(barcode,getTousseStoreBarcodes(),basketBarcode,function(jsonStr){
 		//篮筐物品明细grid列表的包的灭菌方式
 		var sterilingModeFromBasketGoodsDetailGrid = getSterilingModeFromBasketGoodsDetailGrid();
-		
 	    //hiddenMask();
 		//console.log('barcode2='+barcode+','+new Date().format('y-m-d H:i:s') + '.' + new Date().getMilliseconds());
 		var obj = Ext.util.JSON.decode(jsonStr);
@@ -433,7 +433,7 @@
 		//保存篮筐实例ID，用作删除固定条码的物品操作
 		if(typeof(obj.reviewedBasketId)!="undefined"){ 
 		    reviewedBasketId = obj.reviewedBasketId;
-	    } 
+		} 
 		if(returnType=="basketNotFound"){//条码不存在
 			showResult("找不到该包或篮筐。");
 			Ext.getCmp('barcode').setValue("");
@@ -548,7 +548,6 @@
 				});
 				tousseStore.insert(0,currentTousseInstance);//最新扫描的器械包放到第一行
 				
-				
 				//console.log('barcode5='+barcode+','+new Date().format('y-m-d H:i:s') + '.' + new Date().getMilliseconds());
 				//刷新后台速度太慢
 				//waitSterileLoadingTousseStore.reload();
@@ -582,12 +581,21 @@
 				});
 				}*/
 				//改为由js操作来控制
-
 				var speakBasket = new SpeakBasket();
 				speakBasket.addGoods('',obj.tousseName,obj.amount);
-				newAddAudioTips("sterilizationLoadingAudio","",speakBasket);
-				
-				//console.log('barcode6='+barcode+','+new Date().format('y-m-d H:i:s') + '.' + new Date().getMilliseconds());
+				var smartSpeaker = new SmartSpeaker();
+				if(smartSpeaker.type == "滴声提示"){
+					if(!!window.ActiveXObject || "ActiveXObject" in window){
+						sterilizationLoadingAudio.setAttribute("src",WWWROOT +"/disinfectsystem/touchScreen/recycle/audio/simpleTips.wav");
+					}else {
+						sterilizationLoadingAudio2.setAttribute("src",WWWROOT +"/disinfectsystem/touchScreen/recycle/audio/simpleTips.wav");
+						sterilizationLoadingAudio2.setAttribute("autoplay","autoplay");
+					}	
+				}else{
+					if(speakBasket){
+						speakBasket.speakContent();
+					}		
+				}
 				//待灭菌装载列表数据源重新刷新
                 waitSterileLoadingTousseStore.reload();
 			} else {