Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r29408 -r29531
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 29408)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 29531)
@@ -1406,8 +1406,8 @@
   	basketElement += '</li>';
  	var obj = $(basketElement);
     $("#basketsUl").prepend(obj);
-    var json = getBasketJSON(classifyBasketId,basketBarcode,washClassifyType,sequence,basketName,isIdCard);
-    $("#basketsUl li:first").find('input').val(json);
+	var json = getBasketJSON(classifyBasketId,basketBarcode,washClassifyType,sequence,basketName,isIdCard);
+	$("#basketsUl li:first").find('input').val(json);
     toggleItems(obj.find('span')[0]);
 }
 function noticeIdCardUseAmount(useAmount){
@@ -3048,7 +3048,7 @@
     if($('#basketsUl').children().length > 0){
 		var basketsObj = $('#basketsUl').children().eq(0).find('input[type=hidden]').val();
 		basketsObj = JSON.parse(basketsObj);
-		var isIdCard = basketsObj.isIdCard;
+		var isFixedIdCard = basketsObj.isIdCard;
 		var basketName = basketsObj.basketName;
         var tousseName = $('#tousseName'+row).val();
         var tousseDefinitionID = $('#tousseDefinitionID'+row).val();
@@ -3059,7 +3059,7 @@
 		var loadedAmount = parseInt($('#loadedAmount'+row).val(),10);
 		var applicationAmount = parseInt($('#applicationAmount'+row).val(),10);
 		var msg = "";
-		if(isIdCard == true){
+		if(isFixedIdCard == true){
 			if($('#barcodes'+row).val() == ''){
 				msg = '不允许将包放入标识牌的篮筐中，请扫描其它的清洗篮筐！';
 			}else {
@@ -3098,7 +3098,8 @@
          	if(!isUndefinedOrNullOrEmpty(recyclingErrorJsonArrayStr)){
 				var recyclingErrorJsonArray = JSON.parse(recyclingErrorJsonArrayStr);
 				var isIdCardLost = false;
-         		for(var j = 0;j < recyclingErrorJsonArray.length;j++) {
+				console.log(recyclingErrorJsonArray)
+         		for(var j = 0;j < newArray(recyclingErrorJsonArray).length;j++) {
             		if(recyclingErrorJsonArray[j].materialName == '器械包标识牌'){
             			isIdCardLost = true;
             			var errorAmount = parseInt(recyclingErrorJsonArray[j].amount);
@@ -3122,12 +3123,16 @@
                 if(tousseAmount != scannedAmount){
                 	showMsg = $('#tousseName'+row).val()+"扫描的标识牌数量不等于回收数量，如果标识牌丢失，请在回收误差中登记丢失记录!";
                 }
-         	}
+			}
        		
         	if(showMsg != null){
             	alertDiv(showMsg);
             	return false;
-            }
+			}
+			if(isFixedIdCard){
+				alertDiv('不允许将丢失或报损的包放入标识牌的篮筐中，请扫描其它的清洗篮筐！');
+				return;
+			}
         }
         
         var orgUnitName =  $('#depart').val();
@@ -3139,7 +3144,6 @@
 		}
 		setTousseItemLoadedAmountCss(row);
 		refreshAllBasketTotalNum();
-		
 		refreshSplitBasketView();
 		tousseItemTableSort();
     }else{
@@ -6124,8 +6128,13 @@
                 for(var i = 0 ; i< record.classifyBaskets.length ; i++){
 					var basket = record.classifyBaskets[i];
 					var washClassifyType = basket.washClassifyType;
-
-                    createBasketUiElement(basket.containerBarcode,basket.id,record.classifyBaskets[i].containerName,washClassifyType,basket.sequence)
+					var isIdCard = false;
+					if(basket.containerName.indexOf('(标识牌') == -1){
+						isIdCard = false;
+					}else {
+						isIdCard = true;
+					}
+                    createBasketUiElement(basket.containerBarcode,basket.id,basket.containerName,washClassifyType,basket.sequence,isIdCard)
                     
                     for(var j = 0 ; j < basket.classfiedItems.length ; j++){
 						var ci = record.classifyBaskets[i].classfiedItems[j];