Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
===================================================================
diff -u -r24134 -r24166
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 24134)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 24166)
@@ -1404,7 +1404,7 @@
                 +" (select count(*) from TousseInstance tt where tt.reviewBasket_id = t.reviewBasket_id) reviewBasketAmount,"
                 +" (select rb.sterilizerPosition from ReviewedBasket rb join Container c on rb.container_id = c.id  where rb.id=t.reviewBasket_id) sterilizerPosition, "
                 + " t.id id, t.depart depart, t.departCoding departCoding, t.tousseName name, td.tousseType, t.tousseName, b.barcode, t.validUntil, t.sterilingType,"
-                + " t.orgUnitCoding, t.orgUnitName, t.foreignProxyItem_Id, t.proxyDisinfection_Id,t.reviewTime,t.isUrgentTousse,tdAncestor.isTraceable  "
+                + " t.orgUnitCoding, t.orgUnitName, t.foreignProxyItem_Id, t.proxyDisinfection_Id,t.reviewTime,t.isUrgentTousse,tdAncestor.isTraceable,t.SterilingMode  "
                 + queryFixedBarcodeSql
                 + "from tousseinstance t, barcodedevice b , cssdHandleTousses tt , TousseDefinition td , TousseDefinition tdAncestor "
                 + "where t.id = b.id and tt.tousseDefinitionId=td.ancestorID and t.tousseDefinition_id=td.id and td.ancestorID=tdAncestor.id "
@@ -1417,6 +1417,7 @@
                 + "(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 + "' ";
+        logger.debug("sql:" + sql1);
         buildTousseSimpleVOs(vos, sql1);
         
         
@@ -1429,12 +1430,13 @@
                     
                         + " t.depart depart, t.departCoding departCoding,t.tousseName name, td.tousseType, t.tousseName, b.barcode, t.validUntil, t.sterilingType,"
                         + "t.orgUnitCoding, t.orgUnitName, t.foreignProxyItem_Id, t.proxyDisinfection_Id,t.reviewTime,t.isUrgentTousse , '"+ Constants.STR_YES +"' isTraceable  "
-                        + ",null fixedBarcode "
+                        + ",t.SterilingMode,null fixedBarcode "
                         + "from tousseinstance t, barcodedevice b , TousseDefinition td "
                         + "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 + "'";
+            logger.debug("sql:" + sql2);
             buildTousseSimpleVOs(vos, sql2);
             
             //3、自定义器械包
@@ -1445,12 +1447,13 @@
                     +" (select rb.sterilizerPosition from ReviewedBasket rb join Container c on rb.container_id = c.id  where rb.id=t.reviewBasket_id) sterilizerPosition, "
                         + " t.depart depart, t.departCoding departCoding,t.tousseName name, td.tousseType, t.tousseName, b.barcode, t.validUntil, t.sterilingType,"
                         + "t.orgUnitCoding, t.orgUnitName, t.foreignProxyItem_Id, t.proxyDisinfection_Id,t.reviewTime,t.isUrgentTousse , '"+ Constants.STR_YES +"' isTraceable  "
-                        + ",null fixedBarcode "
+                        + ",t.SterilingMode,null fixedBarcode "
                         + "from tousseinstance t, barcodedevice b , TousseDefinition td "
                         + "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 + "'";
+            logger.debug("sql:" + sql3);
             buildTousseSimpleVOs(vos, sql3);
             
             //4、外部代理灭菌
@@ -1466,13 +1469,14 @@
                     +" (select count(*) from TousseInstance tt where tt.reviewBasket_id = t.reviewBasket_id) reviewBasketAmount,"
                     +" (select rb.sterilizerPosition from ReviewedBasket rb join Container c on rb.container_id = c.id  where rb.id=t.reviewBasket_id) sterilizerPosition, "
                     + " t.depart depart, t.departCoding departCoding,t.tousseName name, td.tousseType, t.tousseName, b.barcode, t.validUntil, t.sterilingType,"
-                    + "t.orgUnitCoding, t.orgUnitName, t.foreignProxyItem_Id, t.proxyDisinfection_Id,t.reviewTime,t.isUrgentTousse,tdAncestor.isTraceable,"
+                    + "t.orgUnitCoding, t.orgUnitName, t.foreignProxyItem_Id, t.proxyDisinfection_Id,t.reviewTime,t.isUrgentTousse,tdAncestor.isTraceable,t.SterilingMode,"
                     + firstBarcodeSql
                     + "from tousseinstance t, barcodedevice b , TousseDefinition td , TousseDefinition tdAncestor "
                     + "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 + "'";
+            logger.debug("sql:" + sql4);
             buildTousseSimpleVOs(vos, sql4);
         return vos;
     }