Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionForm.js
===================================================================
diff -u -r32998 -r33001
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionForm.js	(.../proxyDisinfectionForm.js)	(revision 32998)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionForm.js	(.../proxyDisinfectionForm.js)	(revision 33001)
@@ -360,9 +360,11 @@
 		}
 	}
 	var oldSterilizationMode = '';
+	var arrLen = 0;
 	function getNodeStore(){
 		var rootNode = top.Ext.getCmp('proxyDisinfectionTree').getRootNode();
 		var arr = [];
+		arrLen = 0;
 		rootNode.eachChild(function (pNode) {
 			var mode = pNode.attributes.sterilizationMode;
 			if (pNode.attributes.type == '器械包') {
@@ -379,13 +381,13 @@
 			}
 		})
 		if(arr.length > 1){
-			showResult('该篮筐有多种不同灭菌方式的物品,不能装载物品,请先将筐内灭菌方式不同的物品移除');
-			return
+			oldSterilizationMode = arr[0];
+			arrLen = 2;
 		}else if(arr.length == 1){
 			oldSterilizationMode = arr[0];
+			arrLen = 1;
 		}
 	}
-	var isFirstScan = true;
 	//根据条码获取包信息
 	function loadBasketOrTousseInstance() {
 		getNodeStore();
@@ -397,27 +399,25 @@
 			barcode: barcode,
 			handleDepartCoding: currentDepartCoding
 		}
-		//只有代理单没有灭菌方式且第一次扫描时不需要传sterilizationMode
-		if(isFirstScan && oldSterilizationMode !== ''){
+		//灭菌单没有物品时不需要传参
+		if(arrLen == 1){
 			params.sterilizationMode = oldSterilizationMode;
-		}else if(!isFirstScan){
-			params.sterilizationMode = oldSterilizationMode;
 		}
 		Ext.Ajax.request({
 			url: WWWROOT + '/disinfectSystem/proxyDisinfectionAction!loadBasketOrTousseInstance.do',
 			params: params,
 			success: function (response, options) {
 				var result = Ext.decode(response.responseText);
 				if (result.success) {
-					if(isFirstScan){
-						isFirstScan = false;
+					if(arrLen == 2){
+						showResult('该篮筐有多种不同灭菌方式的物品,不能装载物品,请先将筐内灭菌方式不同的物品移除');
+						return true;
 					}
 					var receiveTousse = result.receiveTousse || false;
 					var sterilizationMode = result.sterilizationMode || '';
 					if (receiveTousse == true) {
 						var rootNode = top.Ext.getCmp('proxyDisinfectionTree').getRootNode();
 						var index = 0;
-						var boxIndex = 0;
 						var isBox = false;
 						rootNode.eachChild(function (pNode) {
 							if (pNode.attributes.type == '器械包') {