Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
===================================================================
diff -u -r22327 -r22332
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 22327)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 22332)
@@ -3580,7 +3580,7 @@
     		subFixedBarcodeQuerySql = "(select barcode from TousseInstance ti1 join barcodeDevice b1 on b1.id=ti1.id where ti1.tousseFixedBarcode=1 and ti1.tousseDefinition_id=tdancestor.id and rownum <= 1)";
     	}
     	//不追溯的固定条码查询
-        String fixedBarcodeQuerySql = "select distinct "+ subFixedBarcodeQuerySql +" fixedBarcode from " + TousseInstance.class.getSimpleName() + " po "
+        String fixedBarcodeQuerySql = "select "+ subFixedBarcodeQuerySql +" fixedBarcode,bd.barcode from " + TousseInstance.class.getSimpleName() + " po "
         		+ " join " + BarcodeDevice.class.getSimpleName() + " bd on po.id=bd.id "
         		+ " join " + TousseDefinition.class.getSimpleName() + " td on po.tousseDefinition_id=td.id "
         		+ " join " + TousseDefinition.class.getSimpleName() + " tdAncestor on td.ancestorId=tdAncestor.id "
@@ -3590,31 +3590,14 @@
         try {
         	rs = objectDao.executeSql(fixedBarcodeQuerySql);
         	while(rs.next()){
-        		String barcode = rs.getString("fixedBarcode");
-        		if(!fixedBarcodes.contains(barcode)){
-        			fixedBarcodes.add(barcode);
+        		String fixedBarcode = rs.getString("fixedBarcode");
+        		if(!fixedBarcodes.contains(fixedBarcode)){
+        			fixedBarcodes.add(fixedBarcode);
         		}
-        	}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}finally{
-			DatabaseUtil.closeResultSetAndStatement(rs);
-		}
-        
-        //要追溯的唯一条码查询
-        String uniqueBarcodeQuerySql = "select bd.barcode from " + TousseInstance.class.getSimpleName() + " po "
-        		+ " join " + BarcodeDevice.class.getSimpleName() + " bd on po.id=bd.id "
-        		+ " join " + TousseDefinition.class.getSimpleName() + " td on po.tousseDefinition_id=td.id "
-        		+ " join " + TousseDefinition.class.getSimpleName() + " tdAncestor on td.ancestorId=tdAncestor.id "
-        		+ " join sterilization_tousseInstance st on po.id=st.tousseInstance_id "
-        		+ " where st.sterilizationRecord_id =" + sterilizationRecord.getId() + " and tdAncestor.isTraceable='" + Constants.STR_YES + "'";
-        try {
-        	rs = objectDao.executeSql(uniqueBarcodeQuerySql);
-        	while(rs.next()){
         		String barcode = rs.getString("barcode");
         		if(!barcodes.contains(barcode)){
-        			barcodes.add(barcode);
-        		}
+        		    barcodes.add(barcode);
+                }
         	}
 		} catch (Exception e) {
 			e.printStackTrace();
Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java
===================================================================
diff -u -r22327 -r22332
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java	(.../SterilizationRecordManager.java)	(revision 22327)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java	(.../SterilizationRecordManager.java)	(revision 22332)
@@ -334,10 +334,10 @@
 
     /**
      * 将该灭菌记录未入筐的器械包的条码分别添加至条码集合中
-     * 需要追溯的物品条码添加至barcodes集合中,不需要追溯的物品条码添加至fixedBarcodes集合中
+     * 不需要追溯物品的唯一条码添加至barcodes集合中,不需要追溯物品的固定条码添加至fixedBarcodes集合中
      * @param sterilizationRecord 灭菌记录
-     * @param barcodes 需要追溯的物品条码集合
-     * @param fixedBarcodes 不需要追溯的物品条码集合
+     * @param barcodes 不需要追溯物品的唯一条码集合
+     * @param fixedBarcodes 不需要追溯物品的固定条码集合
      */
     public void fillBarcodeToListFromSterilizationRecordWithoutReviewedBasket(SterilizationRecord sterilizationRecord , List<String> barcodes , List<String> fixedBarcodes);