Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js
===================================================================
diff -u -r22084 -r22122
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js	(.../sterilizationLoadingForm.js)	(revision 22084)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js	(.../sterilizationLoadingForm.js)	(revision 22122)
@@ -1330,7 +1330,7 @@
 		waitSterileLoadingTousseGridColumnArray.push({header: "科室", width: 105, sortable: true, dataIndex: 'depart',hidden:!showDepartOfTousseInstanceSterile});
 	}
 	waitSterileLoadingTousseGridColumnArray.push({header: "名称", width: 120, sortable: true, dataIndex: 'tousseName'});
-	waitSterileLoadingTousseGridColumnArray.push({header: "条形码", width: 70, sortable: true, dataIndex: 'objBarcode'});
+	waitSterileLoadingTousseGridColumnArray.push({header: "条形码", width: 65, sortable: true, dataIndex: 'objBarcode'});
 	waitSterileLoadingTousseGridColumnArray.push({header: "审核时间", width: 110, sortable: true, dataIndex: 'reviewTime'});
 	waitSterileLoadingTousseGridColumnArray.push({header: "数量", width: 35, sortable: true, dataIndex: 'amount'});
 	waitSterileLoadingTousseGridColumnArray.push({header: "装载", width: 40, sortable: true, dataIndex: 'objBarcode',renderer:renderformBtn});
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
===================================================================
diff -u -r22120 -r22122
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 22120)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 22122)
@@ -1346,8 +1346,13 @@
 		
 		//增加空对象或空集合的判断,防止空指针异常报错
 		if(CollectionUtils.isNotEmpty(excludeBarcodes)){
-			tousseInstanceBarcodes = CollectionUtils.subtract(
-			        bList, excludeBarcodes);
+		    //将固定条码下的包实例条码，和唯一条码合并，用于排除数据
+		    List<String> emptyList = new ArrayList<String>();
+            emptyList.addAll(bList);
+            emptyList.addAll(tousseInstanceBarcodes);
+            //排除已扫描的数据
+            tousseInstanceBarcodes = CollectionUtils.subtract(
+                   emptyList, excludeBarcodes); 
 		}
 		
 		if(CollectionUtils.isNotEmpty(tousseInstanceBarcodes)){