Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
===================================================================
diff -u -r18725 -r18735
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js	(.../sterilizationRecordForm.js)	(revision 18725)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js	(.../sterilizationRecordForm.js)	(revision 18735)
@@ -842,310 +842,6 @@
 			}
 			statisticsTousseAndBasket();  //每次成功扫描条码后统计一下器械包的数量和灭菌篮筐的数量
 		},
-//		success : function(response, options) {
-//			if(checkRepeat(barcodeStr)){
-//				showResult("输入的条码已存在！");
-//				return;
-//			};
-//			var result = response.responseText;
-//			var speakContent = null;
-//			var speakBasket = new SpeakBasket();
-//			if (result != null && result != 'null') {
-//				var str = result.split(",");
-//				var flag = str[1];
-//				if(flag == 0){//器械包(单个)
-//					var sterilingType = str[3];//灭菌程序
-//					var tousseDepart = str[4];//科室
-//					if(sterilingType && sterilingType.length > 0){
-//						var sterilization = top.Ext.getCmp('sterilizationType').getValue();
-//						if(sterilization == null || sterilization.length == 0 ){
-//							top.Ext.getCmp('sterilizationType').setValue(sterilingType);
-//						}else if(sterilingType != sterilization){
-//							showResultWithoutSpeak(str[2]+"的灭菌程序为【"+sterilingType+"】");
-//						}
-//					}
-//					
-//					var rootNode = sterilizationColumnTree.getRootNode();
-//					var parentNode = createNode(true,barcodeStr,str[2],tousseDepart,'器械包',true,position);
-//					
-//					var firstChildNode = rootNode.item(0);
-//					if(firstChildNode == null || firstChildNode == undefined){
-//						rootNode.appendChild(parentNode);
-//					}else{
-//						rootNode.insertBefore(parentNode,firstChildNode);
-//					}
-//					speakBasket.addGoods('',str[2],1);
-//					if(str[6] == "是"){
-//						showResultWithoutSpeak("此外来器械包含有植入物，需要做生物监测！");
-//					}
-//				}else if(flag == 1){//容器(单个灭菌框或虚拟篮筐)
-//					var sterilingType = "";
-//					if (str.length <= 3) {
-//						showResult('篮筐内无待灭菌物品');
-//						return;
-//					}
-//					for(var i=3;i<str.length;i++) {
-//						var array = str[i].split(":");
-//						var temp = array[2];  //灭菌程序
-//						var bigPackage = array[3];
-//						if(bigPackage == true || bigPackage == 'true'){//超大超重包，灭菌方式
-//							if(array[4] != null && array[4].length > 0){
-//								sterilingType = array[4];
-//								top.Ext.getCmp('sterilizationType').setValue(array[4]);
-//								showResultWithoutSpeak("超大、超重外来器械必须用"+array[4]+"灭菌！");
-//							}else{
-//								showResultWithoutSpeak("超大超重外来器械需要配置灭菌方式！");
-//							}
-//							break;
-//						}
-//						if(sterilingType == ""){
-//							sterilingType = temp;
-//						}else{
-//							if(sterilingType != temp){
-//								showResultWithoutSpeak(str[2]+"中包含不同的灭菌程序的物品！");
-//							}
-//						}
-//					}
-//					var sterilization = top.Ext.getCmp('sterilizationType').getValue();
-//					if(sterilization != null && sterilization.length > 0 && sterilization != sterilingType){
-//						showResultWithoutSpeak(str[2] + '中物品与所选灭菌程序不匹配');
-//					}else{
-//						top.Ext.getCmp('sterilizationType').setValue(sterilingType);
-//					}
-//					var rootNode = sterilizationColumnTree.getRootNode();
-//					var parentNode = createNode(true,barcodeStr,str[2],'','篮筐',true,position);
-//					speakContent = str[2];
-//					var firstChildNode = rootNode.item(0);
-//					if(firstChildNode == null || firstChildNode == undefined){
-//						rootNode.appendChild(parentNode);
-//					}else{
-//						rootNode.insertBefore(parentNode,firstChildNode);
-//					}
-//					for(var i=3;i<str.length;i++) {
-//						var array = str[i].split(":");
-//						var barcode =array[0];//条码
-//						var name = array[1];//包名
-//						var tousseDepart = array[3];//科室
-//						var childNode = createNode(false,barcode,name,tousseDepart,'器械包',false,'');
-//						parentNode.appendChild(childNode);
-//						speakBasket.addGoods(str[2],name,1);
-//					}
-//					//加载灭菌参数
-//					SterilizationRecordTableManager.getParameter(top.Ext.getCmp('sterilizationType').getValue(),function(result){
-//						if(result != null && result.length > 0){
-//							top.Ext.getCmp('parameter').setValue(result);
-//						}
-//					});
-//				}else if(flag == 2){//不追溯器械包
-//					for(var i=2;i<str.length;i++){
-//						var array = str[i].split(":");
-//						var barcode =array[0];
-//						var name = array[1];
-//						var tousseDepart = array[3];//科室
-//						if(checkRepeat(barcode)){
-//							showResult("输入的条码已存在！");
-//							return;
-//						};
-//						var rootNode = sterilizationColumnTree.getRootNode();
-//						var parentNode = createNode(true,barcode,name,tousseDepart,'器械包',true,position);
-//						
-//						var firstChildNode = rootNode.item(0);
-//						if(firstChildNode == null || firstChildNode == undefined){
-//							rootNode.appendChild(parentNode);
-//						}else{
-//							rootNode.insertBefore(parentNode,firstChildNode);
-//						}
-//						speakBasket.addGoods('',array[1],1);
-//						removePendingSterilizationGoods(barcode);
-//					}
-//					speakContent = sterilizationColumnTree.getRootNode().text;
-//				}else if(flag == 3){//首尾器械包,since2015-10-27
-//					var alreadyAdd = 0;
-//					var sterilingType = "";
-//					if (str.length <= 3) {
-//						showResult('篮筐内无待灭菌物品');
-//						return;
-//					}
-//					for(var i=3;i<str.length;i++) {
-//						var array = str[i].split(":");
-//						var temp = array[2];
-//						var bigPackage = array[4];
-//						if(bigPackage == true || bigPackage == 'true'){//超大超重包，灭菌方式
-//							if(array[5] != null && array[5].length > 0){
-//								sterilingType = array[5];
-//								top.Ext.getCmp('sterilizationType').setValue(array[5]);
-//								showResultWithoutSpeak("超大、超重外来器械必须用"+array[5]+"灭菌！");
-//							}else{
-//								showResultWithoutSpeak("超大超重外来器械需要配置灭菌方式！");
-//							}
-//							break;
-//						}
-//						if(sterilingType == ""){
-//							sterilingType = temp;
-//						}else{
-//							if(sterilingType != temp){
-//								showResultWithoutSpeak("扫描到的结果中包含不同的灭菌程序的物品！");
-//							}
-//						}
-//					}
-//					var sterilization = top.Ext.getCmp('sterilizationType').getValue();
-//					if(sterilization != null && sterilization.length > 0 && sterilization != sterilingType){
-//						showResultWithoutSpeak(str[2] + '中物品与所选灭菌程序不匹配');
-//					}else{
-//						top.Ext.getCmp('sterilizationType').setValue(sterilingType);
-//					}
-//					var rootNode = sterilizationColumnTree.getRootNode();
-//					speakContent = rootNode.text;
-//					for(var i=3;i<str.length;i++) {
-//						var array = str[i].split(":");
-//						var barcode =array[0];
-//						var exists = false;
-//						rootNode.eachChild(function(pNode){
-//							if(pNode.attributes.barcode == barcode) {  //此包已经扫描过了
-//								exists = true;
-//								return false;
-//							}
-//							if(pNode.childNodes){
-//								pNode.eachChild(function(cNode){
-//									if(cNode.attributes.barcode == barcode) {  //此包已经入审核篮筐的
-//										exists = true;
-//										return false;
-//									}
-//								});
-//							}
-//						});
-//						if(!exists){  //此包没有扫描过并且没有入审核篮筐
-//							var name = array[1];
-//							var tousseDepart = array[3];//科室
-//							var parentNode = createNode(true,barcode,name,tousseDepart,'器械包',true,position);
-//							
-//							var firstChildNode = rootNode.item(0);
-//							if(firstChildNode == null || firstChildNode == undefined){
-//								rootNode.appendChild(parentNode);
-//							}else{
-//								rootNode.insertBefore(parentNode,firstChildNode);
-//							}
-//							speakBasket.addGoods('',array[1],1);
-//							alreadyAdd++;
-//						}
-//					}
-//					//加载灭菌参数
-//					SterilizationRecordTableManager.getParameter(top.Ext.getCmp('sterilizationType').getValue(),function(result){
-//						if(result != null && result.length > 0){
-//							top.Ext.getCmp('parameter').setValue(result);
-//						}
-//					});
-//					if(alreadyAdd == 0){
-//						showResult('未找到符合条件的器械包或器械包已扫描至表格中.');
-//						speakContent = null;
-//					}
-//				}else if(flag == 4){//首尾虚拟篮筐,since2015-10-27
-//					var alreadyAdd = 0;
-//					var sterilingType = "";
-//					if (str.length <= 3) {
-//						showResult('篮筐内无待灭菌物品');
-//						return;
-//					}
-//					for(var i=3;i<str.length;i++) {
-//						var array = str[i].split(":");
-//						var temp = array[3];  //灭菌程序
-//						var bigPackage = array[4];
-//						if(bigPackage == true || bigPackage == 'true'){//超大超重包，灭菌方式
-//							if(array[5] != null && array[5].length > 0){
-//								sterilingType = array[5];
-//								top.Ext.getCmp('sterilizationType').setValue(sterilingType);
-//								showResultWithoutSpeak("超大、超重外来器械必须用"+sterilingType+"灭菌！");
-//							}else{
-//								showResultWithoutSpeak("超大超重外来器械需要配置灭菌方式！");
-//							}
-//							break;
-//						}
-//						if(sterilingType == ""){
-//							sterilingType = temp;
-//						}else{
-//							if(sterilingType != temp){
-//								showResultWithoutSpeak(array[0]+"中包含不同的灭菌程序的物品！");
-//							}
-//						}
-//					}
-//					var sterilization = top.Ext.getCmp('sterilizationType').getValue();
-//					if(sterilization != null && sterilization.length > 0 && sterilization != sterilingType){
-//						showResultWithoutSpeak('扫描到的某个或物品与所选灭菌程序不匹配');
-//					}else{
-//						top.Ext.getCmp('sterilizationType').setValue(sterilingType);
-//					}
-//					var rootNode = sterilizationColumnTree.getRootNode();
-//					speakContent = rootNode.text;
-//					for(var i=3;i<str.length;i++) {
-//						var array = str[i].split(":");//0:虚拟篮筐,1:器械包条码,2:器械包名称,3:灭菌程序,456...
-//						var virtualBasket =array[0];
-//						var barcode =array[1];
-//						var exists = false;
-//						
-//						var currentParentNode;
-//						rootNode.eachChild(function(pNode){
-//							if(pNode.attributes.barcode == virtualBasket) {
-//								currentParentNode = pNode;
-//								exists = true;
-//								return false;
-//							}
-//						});
-//						if(!exists){
-//							var tousseDepart = array[4];//科室
-//							currentParentNode = createNode(true,virtualBasket,"虚拟篮筐",'','篮筐',true,position);
-//							
-//							var firstChildNode = rootNode.item(0);
-//							if(firstChildNode == null || firstChildNode == undefined){
-//								rootNode.appendChild(currentParentNode);
-//							}else{
-//								rootNode.insertBefore(currentParentNode,firstChildNode);
-//							}
-//							
-//							var childNode = createNode(false,barcode,array[2],tousseDepart,'器械包',false,'');
-//							currentParentNode.appendChild(childNode);
-//							speakBasket.addGoods('',array[2],1);
-//							alreadyAdd++;
-//						}else{
-//							var existsCNode = false;//虚拟篮筐的机制
-//							if(currentParentNode.childNodes){
-//								currentParentNode.eachChild(function(cNode){
-//									if(cNode.attributes.barcode == barcode) {
-//										existsCNode = true;
-//										return false;
-//									}
-//								});
-//							}
-//							if(!existsCNode){
-//								var tousseDepart = array[4];//科室
-//								var childNode = createNode(false,barcode,array[2],tousseDepart,'器械包',false,'');
-//								currentParentNode.appendChild(childNode);
-//								speakBasket.addGoods('',array[2],1);
-//								alreadyAdd++;
-//							}
-//						}
-//					}
-//					//加载灭菌参数
-//					SterilizationRecordTableManager.getParameter(top.Ext.getCmp('sterilizationType').getValue(),function(result){
-//						if(result != null && result.length > 0){
-//							top.Ext.getCmp('parameter').setValue(result);
-//						}
-//					});
-//					if(alreadyAdd == 0){
-//						showResult('未找到符合条件的器械包或器械包已扫描至表格中.');
-//						speakContent = null;
-//					}
-//				}else{
-//					showResult(str[2]);
-//				}
-//				if (flag == 0 || flag == 1 || flag == 3) {
-//					removePendingSterilizationGoods(barcodeStr);
-//				}
-//				speakBasket.speakContent();
-//			}else{
-//				showResult("您扫描的物品非已审核的器械包或篮筐！");
-//			}
-//			statisticsTousseAndBasket();  //每次成功扫描条码后统计一下器械包的数量和灭菌篮筐的数量
-//		},
 		failure : function(response, options) {
 			var result = Ext.decode(response.responseText);
 			showResult(result);
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/SterilizationTest.java
===================================================================
diff -u -r18729 -r18735
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/SterilizationTest.java	(.../SterilizationTest.java)	(revision 18729)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/SterilizationTest.java	(.../SterilizationTest.java)	(revision 18735)
@@ -9,6 +9,7 @@
 import org.testng.AssertJUnit;
 import org.testng.annotations.Test;
 
+import test.forgon.disinfectsystem.selenium.Login;
 import test.forgon.disinfectsystem.selenium.factory.WaitFactory;
 import test.forgon.disinfectsystem.selenium.sterilization.helper.SterilizationHelper;
 import test.forgon.disinfectsystem.selenium.tools.Utils;
@@ -84,13 +85,14 @@
 			String tempBarcode = notEntryBasketTousseBarcods.get(0);
 			Utils.retryingFindAndDoAction(By.id("inputBarcode"),
 					Utils.ACTION_SENDKEYS, basketBarcode + "\n");
-			for (int i = 0; i < 2; i++) {
+			int length = notEntryBasketTousseBarcods.size();
+			for (int i = 0; i < length; i++) {
 				Utils.retryingFindAndDoAction(By.id("inputBarcode"),
 						Utils.ACTION_SENDKEYS,
 						notEntryBasketTousseBarcods.get(i) + "\n");
 			}
-			Utils.retryingFindAndDoAction(By.id("btnBatchAddTousse"),
-					Utils.ACTION_CLICK); // 一键入炉
+//			Utils.retryingFindAndDoAction(By.id("btnBatchAddTousse"),
+//					Utils.ACTION_CLICK); // 一键入炉
 
 			// 保存灭菌记录
 			Utils.retryingFindAndDoAction(By.id("saveBtn"), Utils.ACTION_CLICK);
Fisheye: Tag 18735 refers to a dead (removed) revision in file `ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/service/impl/ZsyySterilization.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 18735 refers to a dead (removed) revision in file `ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/service/impl/OtherSterilization.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 18735 refers to a dead (removed) revision in file `ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/service/impl/Zd5ySterilization.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 18735 refers to a dead (removed) revision in file `ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/service/impl/GdsySterilization.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 18735 refers to a dead (removed) revision in file `ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/service/Sterilization.java'.
Fisheye: No comparison available.  Pass `N' to diff?