Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
===================================================================
diff -u -r34434 -r34468
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 34434)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 34468)
@@ -2155,20 +2155,7 @@
             "join TousseDefinition tdAncestor on td.ancestorID=tdAncestor.id "+
             "where " + SqlUtils.getStringFieldInLargeCollectionsPredicate("b.barcode", tousseInstanceBarcodes); 
         List<TousseSimpleVO> tousseSimpleVOList = getTousseVoDataFromDb(querySql);
-        
-        //判断是否有勾选固定条码，如果有，则去获取下面的包实例条码
-        Collection<String> bList = new ArrayList<String>();
-        //固定条码，不需要入筐
-        List<String> fixedBarcodeList = new ArrayList<String>();
         for (TousseSimpleVO tousseSimpleVO : tousseSimpleVOList) {
-            //if(isCountBarcode(barcode)){
-            if(StringUtils.equals(Constants.STR_NO, tousseSimpleVO.getIsTraceable())){
-                List<String> list = getTousseInsDataByFixedBarcode(tousseSimpleVO.getBarcode(), "", " and status='"+TousseInstance.STATUS_REVIEWED+"' ", "barcode", 1,null,null);
-                for (String bStr : list) {
-                    bList.add(bStr);
-                }
-                fixedBarcodeList.add(tousseSimpleVO.getBarcode());
-            }
             //包要接收了才能进行灭菌装载GDSZYY-131
             if(StringUtils.equals(tousseSimpleVO.getHasReceived(), Constants.STR_NO)){
             	throw new RuntimeException(tousseSimpleVO.getTousseName() + tousseSimpleVO.getBarcode() + "未进行扫描接收，请先打开代理灭菌单进行扫描！");
@@ -2185,7 +2172,6 @@
         if(CollectionUtils.isNotEmpty(excludeBarcodes)){
             //将固定条码下的包实例条码，和唯一条码合并，用于排除数据
             List<String> emptyList = new ArrayList<String>();
-            emptyList.addAll(bList);
             emptyList.addAll(tousseInstanceBarcodes);
             //排除已扫描的数据
             tousseInstanceBarcodes = CollectionUtils.subtract(
@@ -2210,8 +2196,6 @@
             //由于tousseInstanceBarcodes的类型是Arrays$ArrayList类型,不能调用add或addAll方法,所以重新new了一个arrayList对象
             List<String> tousseInstanceBarcodeList = new ArrayList<String>();
             tousseInstanceBarcodeList.addAll(tousseInstanceBarcodes);
-            tousseInstanceBarcodeList.addAll(bList);
-            tousseInstanceBarcodeList.removeAll(fixedBarcodeList);
             
             String barcodeInCondition = SqlUtils.getStringFieldInLargeCollectionsPredicate("barcode", tousseInstanceBarcodeList);
             //获取器械包审核前所在的虚拟篮筐集合