Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp
===================================================================
diff -u -r14634 -r14735
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp	(.../expressRecycleForTouchScreen.jsp)	(revision 14634)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp	(.../expressRecycleForTouchScreen.jsp)	(revision 14735)
@@ -859,14 +859,14 @@
     	}else{
     		var data = jsonObj.data;
     		loadedAmount = data.amount;
-    		if(isCleanedEntirely == "是"){
-               	addBasketItemElement("",'器械包',orgUnitName,tousseName,"",tousseName,loadedAmount,loadedAmount,"",app_id,tousseDefinitionID,"");
-    		}else{
+    		if(isCleanedEntirely == "否"){
     			var materials = data.materials;
     			for(var i = 0;i < materials.length;i++){
         			var item = materials[i];
         			addBasketItemElement("",'材料',orgUnitName,tousseName,item.materialName,item.materialName,item.materialAmount,loadedAmount,item.basketBarcode,app_id,tousseDefinitionID,item.basketGroupBarcodes);
         		}
+    		}else{
+               	addBasketItemElement("",'器械包',orgUnitName,tousseName,"",tousseName,loadedAmount,loadedAmount,"",app_id,tousseDefinitionID,"");
     		}
     	}
     });
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r14706 -r14735
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 14706)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 14735)
@@ -1268,23 +1268,7 @@
     	}else{
     		var data = jsonObj.data;
     		loadedAmount = data.amount;
-    		if(isCleanedEntirely == "是"){
-    			var basketItem = {
-   					ci_id: "",
-   					type: '器械包',
-   					orgUnitName: orgUnitName,
-   					tousseName: tousseName,
-   					tousseDefinitionID: tousseDefinitionID,
-   					materialName: "",
-   					showName: tousseName,
-   					amount: loadedAmount,
-   					tousseAmount: loadedAmount,
-   					basketBarcode: "",
-   					idCardBarcode: idCardBarcode,
-   					basketGroupBarcodes: ''
-       			};
-               	addBasketItemElement(basketItem);
-    		}else{
+    		if(isCleanedEntirely == "否"){
     			var materials = data.materials;
     			for(var i = 0;i < materials.length;i++){
         			var item = materials[i];
@@ -1304,6 +1288,22 @@
            			};
         			addBasketItemElement(basketItem);
         		}
+    		}else{
+    			var basketItem = {
+       					ci_id: "",
+       					type: '器械包',
+       					orgUnitName: orgUnitName,
+       					tousseName: tousseName,
+       					tousseDefinitionID: tousseDefinitionID,
+       					materialName: "",
+       					showName: tousseName,
+       					amount: loadedAmount,
+       					tousseAmount: loadedAmount,
+       					basketBarcode: "",
+       					idCardBarcode: idCardBarcode,
+       					basketGroupBarcodes: ''
+           			};
+                   	addBasketItemElement(basketItem);
     		}
     	}
     });