Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
===================================================================
diff -u -r26439 -r26535
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 26439)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 26535)
@@ -1472,7 +1472,7 @@
     }
     
     @Override
-	public List<TousseSimpleVO> getAllTousseInstanceVOsInReviewedBasket(List<ReviewedBasket> reviewedBasketList){
+	public List<TousseSimpleVO> getAllTousseInstanceVOsInReviewedBasket(List<ReviewedBasket> reviewedBasketList, boolean queryDiscard){
         if(!CollectionUtils.isNotEmpty(reviewedBasketList)){
             return new ArrayList<TousseSimpleVO>();
         }
@@ -1494,7 +1494,10 @@
         } else if(dbConnection.isOracle()){
             queryFixedBarcodeSql = ",(select barcode from "+ TousseInstance.class.getSimpleName() +" ti1 join "+ BarcodeDevice.class.getSimpleName() +" b1 on b1.id=ti1.id where ti1.tousseFixedBarcode=1 and ti1.tousseDefinition_id=tdAncestor.id and rownum <= 1) fixedBarcode ";
         }
-        
+        String queryDiscardSql = "";
+        if(!queryDiscard){
+        	queryDiscardSql = " and t.status <> '" + TousseInstance.STATUS_DISCARD + "' ";
+        }
         //关联加急对象的sql语句
         String sqlJoin_UrgentLevel = String.format(" left join %s ul on t.urgentLevel_id = ul.id ", UrgentLevel.class.getSimpleName());
         String sqlSelect_UrgentLevel = String.format(" ,ul.colorCode  ulColorCode ,ul.grade  ulGrade, ul.name  ulName , ul.id  ulId ");
@@ -1519,7 +1522,7 @@
                 + "(t.proxyDisinfection_id is null and t.orgUnitCoding='"+currentOrgUnitCode+"' and tt.orgUnitCode='"+currentOrgUnitCode+"') or "
                 + "(t.proxyDisinfection_id is not null and t.proxyDisinfection_id in (select ip.id from invoicePlan ip where ip.handleDepartCoding='"+currentOrgUnitCode+"'))"
                 + ")"
-                + " and t.status <> '" + TousseInstance.STATUS_DISCARD + "' ";
+                + queryDiscardSql;
         logger.debug("sql:" + sql1);
         buildTousseSimpleVOs(vos, sql1);
         
@@ -1539,7 +1542,7 @@
                         + "where t.id = b.id and t.tousseDefinition_id=td.id and td.tousseType in ('"+TousseDefinition.PACKAGE_TYPE_FOREIGN+"','"+TousseDefinition.PACKAGE_TYPE_SPLIT+"') "
                         +" and t.reviewBasket_id in("+reviewedBasketIds+")  and t.reviewBasket_id is not null "
                         + " and t.orgUnitCoding='"+currentOrgUnitCode+"' "
-                        + " and t.status <> '" + TousseInstance.STATUS_DISCARD + "'";
+                        + queryDiscardSql;
             logger.debug("sql:" + sql2);
             buildTousseSimpleVOs(vos, sql2);
             
@@ -1557,7 +1560,7 @@
                         + "where t.id = b.id and t.tousseDefinition_id=td.id and td.tousseType in ('"+TousseDefinition.PACKAGE_TYPE_CUSTOM+"') "
                         +" and t.reviewBasket_id in("+reviewedBasketIds+")  and t.reviewBasket_id is not null "
                         + " and t.orgUnitCoding='"+currentOrgUnitCode+"' "
-                        + " and t.status <> '" + TousseInstance.STATUS_DISCARD + "'";
+                        + queryDiscardSql;
             logger.debug("sql:" + sql3);
             buildTousseSimpleVOs(vos, sql3);
             
@@ -1581,7 +1584,7 @@
                     + "where t.id = b.id and t.tousseDefinition_id=td.id and td.ancestorID=tdAncestor.id and td.tousseType in ('"+TousseDefinition.PACKAGE_TYPE_FOREIGNPROXY+"') "
                     +" and t.reviewBasket_id in("+reviewedBasketIds+")  and t.reviewBasket_id is not null "
                     + " and t.orgUnitCoding='"+currentOrgUnitCode+"' "
-                    + " and t.status <> '" + TousseInstance.STATUS_DISCARD + "'";
+                    + queryDiscardSql;
             logger.debug("sql:" + sql4);
             buildTousseSimpleVOs(vos, sql4);
         return vos;
Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
===================================================================
diff -u -r26447 -r26535
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 26447)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 26535)
@@ -3985,7 +3985,7 @@
         }
         
         //2、查询灭菌记录下篮筐内所有的包
-        List<TousseSimpleVO> tousseAllForReviewedBasket = tousseInstanceManager.getAllTousseInstanceVOsInReviewedBasket(reviewedBasketList);
+        List<TousseSimpleVO> tousseAllForReviewedBasket = tousseInstanceManager.getAllTousseInstanceVOsInReviewedBasket(reviewedBasketList,true);
         //循环每一个篮筐
         for (ReviewedBasket reviewedBasket : reviewedBasketList) {
             String rbRarcode = reviewedBasket.getContainer().getBarcode();
@@ -4249,7 +4249,7 @@
         }
         
         //查询灭菌记录下篮筐内所有的包
-        List<TousseSimpleVO> tousseAllForReviewedBasket = tousseInstanceManager.getAllTousseInstanceVOsInReviewedBasket(reviewedBasketList);
+        List<TousseSimpleVO> tousseAllForReviewedBasket = tousseInstanceManager.getAllTousseInstanceVOsInReviewedBasket(reviewedBasketList,true);
         //循环每一个篮筐
         for (ReviewedBasket reviewedBasket : reviewedBasketList) {
             String rbRarcode = reviewedBasket.getContainer().getBarcode();
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
===================================================================
diff -u -r26405 -r26535
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java	(.../TousseInstanceManager.java)	(revision 26405)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java	(.../TousseInstanceManager.java)	(revision 26535)
@@ -909,8 +909,9 @@
 	/**
 	 * 根据灭菌记录ID获取全部的篮筐下的包
 	 * @param id
+	 * @param queryDiscard 查询已废弃的包
 	 */
-    public List<TousseSimpleVO> getAllTousseInstanceVOsInReviewedBasket(List<ReviewedBasket> reviewedBasketList);
+    public List<TousseSimpleVO> getAllTousseInstanceVOsInReviewedBasket(List<ReviewedBasket> reviewedBasketList, boolean queryDiscard);
     /**
 	 * 设置器械包的灭菌方式。需要先设置包实例的灭菌程序，方法内使用包实例当前的灭菌程序进行灭菌方式的关联查询
 	 * @param packingManagerImpl TODO