Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
===================================================================
diff -u -r29365 -r29380
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 29365)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 29380)
@@ -5625,10 +5625,6 @@
                 	urgentLevelInfo = new JSONObject();
                 	urgentGrade = 0;
                 }
-                // 不追溯的包不支持打印标签并入炉HBSXKYY-25
-                if(TousseDefinition.STR_NO.equals(tousseOutsideBasket.getIsTraceable())){
-                	continue;
-                }
                 JSONObject obj = new JSONObject();
                 obj.put("depart", tousseOutsideBasket.getDepart());
                 obj.put("objName", tousseOutsideBasket.getTousseName());
@@ -6608,16 +6604,18 @@
 
                 + " union "
 
-                + "(select tdancestor.id ,null depart,tdancestor.name tousseName,null,null sterilingMode,null,ti.taskGroup taskGroup,"
+                + "(select tdancestor.id ,null depart,tdancestor.name tousseName,null,s.sterilizationMode sterilingMode,null,ti.taskGroup taskGroup,"
                 + firstBarcodeSql
                 + "barcode,null reviewTime,count(0) amount, max(tdancestor.includeImplant) " 
                 + nullSql
                 + " from "+ TousseInstance.class.getSimpleName() +" ti "
                 + " join "+ BarcodeDevice.class.getSimpleName() +" b on b.id=ti.id "
                 + "join "+ TousseDefinition.class.getSimpleName() +" td on ti.tousseDefinition_id=td.id join "+ TousseDefinition.class.getSimpleName() +" tdancestor "
-                + "on td.ancestorID=tdancestor.id left join "+ InvoicePlan.class.getSimpleName() +" pd on pd.id=ti.proxyDisinfection_id where 1=1 and tdancestor.isTraceable='"+ Constants.STR_NO +"' and ti.status='"+ TousseInstance.STATUS_REVIEWED +"' and ti.comboTousseInstanceId is null "
+                + "on td.ancestorID=tdancestor.id left join "+ InvoicePlan.class.getSimpleName() +" pd on pd.id=ti.proxyDisinfection_id "
+                + " join " + Sterilisation.class.getSimpleName() + " s on s.sterilisation = td.sterilingMethod"
+                + " where 1=1 and tdancestor.isTraceable='"+ Constants.STR_NO +"' and ti.status='"+ TousseInstance.STATUS_REVIEWED +"' and ti.comboTousseInstanceId is null "
                 + dateSql
-                + " and ti.reviewBasket_id is null and (pd.id is null and ti.orgunitcoding='"+orgUnitCode+"' or pd.id is not null and pd.handleDepartCoding='"+orgUnitCode+"') group by tdancestor.id,tdancestor.name,ti.taskGroup"
+                + " and ti.reviewBasket_id is null and (pd.id is null and ti.orgunitcoding='"+orgUnitCode+"' or pd.id is not null and pd.handleDepartCoding='"+orgUnitCode+"') group by tdancestor.id,tdancestor.name,ti.taskGroup,s.sterilizationMode"
                 + "))t";
         if(StringUtils.isNotBlank(extraOrder)){
         	sql += " order by " + extraOrder;