Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
===================================================================
diff -u -r30680 -r30739
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 30680)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 30739)
@@ -875,7 +875,7 @@
                 + " ,null isUrgentTousse, null ulId,null ulGrade ,null ulName,null ulColorCode "
                 + " from TousseInstance ti  "
                 + "join barcodeDevice b on b.id=ti.id join toussedefinition td on ti.tousseDefinition_id=td.id join toussedefinition tdancestor on td.ancestorID=tdancestor.id "
-                + "join Sterilisation s on s.sterilisation = tdancestor.sterilingMethod " 
+                + "left join Sterilisation s on s.sterilisation = tdancestor.sterilingMethod " 
                 + " where 1=1 and ti.comboTousseInstanceId is null and tdancestor.isTraceable='否' "+keyWordSearchSql+" "
                 + "and ti.status='"+TousseInstance.STATUS_REVIEWED+"' and ti.comboTousseInstanceId is null "+departSearchSql+" and ti.reviewBasket_id is null and ((ti.proxyDisinfection_id is null and ti.orgUnitCoding='"+orgUnitCoding+"') "
                 + "or (ti.proxyDisinfection_id is not null and ti.proxyDisinfection_id in "
@@ -919,7 +919,7 @@
                 + "from TousseInstance ti "
                 + " join barcodeDevice b on b.id=ti.id join toussedefinition td on ti.tousseDefinition_id=td.id "
                 + " join toussedefinition tdancestor on td.ancestorID=tdancestor.id "
-                + " join Sterilisation s on s.sterilisation = tdancestor.sterilingMethod " 
+                + " left join Sterilisation s on s.sterilisation = tdancestor.sterilingMethod " 
                 + " where 1=1 and tdancestor.isTraceable='否' "+keyWordSearchSql+" "
                 + "and ti.status='"+TousseInstance.STATUS_REVIEWED+"' and ti.comboTousseInstanceId is null   "+departSearchSql+" and ti.reviewBasket_id is null "
                 + "and ti.orgunitcoding='"+orgUnitCoding+"' group by tdancestor.id,tdancestor.name,s.sterilizationMode)) tt " + orderSql + ") t "
@@ -1425,8 +1425,8 @@
                 + "t.orgUnitCoding, t.orgUnitName, t.foreignProxyItem_Id, t.proxyDisinfection_Id,t.reviewTime,t.isUrgentTousse,tdAncestor.isTraceable  "
                 + queryFixedBarcodeSql + sqlSelect_UrgentLevel 
                 + " from tousseinstance t" + sqlJoin_UrgentLevel
-                + " , barcodedevice b , cssdHandleTousses tt , TousseDefinition td , TousseDefinition tdAncestor, Sterilisation s "
-                + "where t.id = b.id and tt.tousseDefinitionId=td.ancestorID and t.tousseDefinition_id=td.id and td.ancestorID=tdAncestor.id and s.sterilisation = tdAncestor.sterilingMethod "
+                + " , barcodedevice b , cssdHandleTousses tt , TousseDefinition td , TousseDefinition tdAncestor left join Sterilisation s on s.sterilisation = tdAncestor.sterilingMethod "
+                + "where t.id = b.id and tt.tousseDefinitionId=td.ancestorID and t.tousseDefinition_id=td.id and td.ancestorID=tdAncestor.id  "
                 + "and t.reviewBasket_id =" + reviewedBasket.getId()
                 + " and t.comboTousseInstanceId is null and td.tousseType in ('"+TousseDefinition.PACKAGE_TYPE_INSIDE+"','"+TousseDefinition.PACKAGE_TYPE_DISINFECTION+"','"+TousseDefinition.PACKAGE_TYPE_DRESSING+"','"+TousseDefinition.PACKAGE_TYPE_COMBO+"') "
                 //本供应室处理的器械包实例，但是录入代理灭菌单的器械包实例（只有代理科室才能灭菌）
@@ -1477,8 +1477,8 @@
                     + "t.orgUnitCoding, t.orgUnitName, t.foreignProxyItem_Id, t.proxyDisinfection_Id,t.reviewTime,t.isUrgentTousse,tdAncestor.isTraceable  "
                     + ",null fixedBarcode "+ sqlSelect_UrgentLevel
                     + "from tousseinstance t"+ sqlJoin_UrgentLevel
-                    + " , barcodedevice b , TousseDefinition td , TousseDefinition tdAncestor, Sterilisation s "
-                    + "where t.id = b.id and t.tousseDefinition_id=td.id and td.ancestorID=tdAncestor.id and s.sterilisation = tdAncestor.sterilingMethod and td.tousseType in ('"+TousseDefinition.PACKAGE_TYPE_FOREIGNPROXY+"') and t.reviewBasket_id ="
+                    + " , barcodedevice b , TousseDefinition td , TousseDefinition tdAncestor left join Sterilisation s on s.sterilisation = tdAncestor.sterilingMethod "
+                    + "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 ="
                     + reviewedBasket.getId()
                     + " and t.orgUnitCoding='"+currentOrgUnitCode+"' "
                     + departmentCodeSql
@@ -1521,8 +1521,8 @@
                     + "t.orgUnitCoding, t.orgUnitName, t.foreignProxyItem_Id, t.proxyDisinfection_Id,t.reviewTime,t.isUrgentTousse,tdAncestor.isTraceable,"
                     + firstBarcodeSql+ sqlSelect_UrgentLevel
                     + "from tousseinstance t"+ sqlJoin_UrgentLevel
-                    + " , barcodedevice b , TousseDefinition td , TousseDefinition tdAncestor, Sterilisation s "
-                    + "where t.id = b.id and t.tousseDefinition_id=td.id and td.ancestorID=tdAncestor.id and s.sterilisation = tdAncestor.sterilingMethod and td.tousseType in ('"+TousseDefinition.PACKAGE_TYPE_FOREIGNPROXY+"') and t.reviewBasket_id ="
+                    + " , barcodedevice b , TousseDefinition td , TousseDefinition tdAncestor left join Sterilisation s on s.sterilisation = tdAncestor.sterilingMethod "
+                    + "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 ="
                     + reviewedBasket.getId()
                     + " and t.orgUnitCoding='"+currentOrgUnitCode+"' "
                     + departmentCodeSql
@@ -1660,8 +1660,8 @@
                 + " t.reviewTime,t.isUrgentTousse,tdAncestor.isTraceable  "
                 + queryFixedBarcodeSql + sqlSelect_UrgentLevel 
                 + " from tousseinstance t" + sqlJoin_UrgentLevel
-                + " , barcodedevice b , cssdHandleTousses tt , TousseDefinition td , TousseDefinition tdAncestor, Sterilisation s "
-                + "where t.id = b.id and tt.tousseDefinitionId=td.ancestorID and t.tousseDefinition_id=td.id and td.ancestorID=tdAncestor.id and s.sterilisation = tdAncestor.sterilingMethod "
+                + " , barcodedevice b , cssdHandleTousses tt , TousseDefinition td , TousseDefinition tdAncestor left join Sterilisation s on s.sterilisation = tdAncestor.sterilingMethod "
+                + "where t.id = b.id and tt.tousseDefinitionId=td.ancestorID and t.tousseDefinition_id=td.id and td.ancestorID=tdAncestor.id "
                 + "and t.reviewBasket_id " + reviewedBasketSql
                 + " and t.comboTousseInstanceId is null and td.tousseType in ('"+TousseDefinition.PACKAGE_TYPE_INSIDE+"','"+TousseDefinition.PACKAGE_TYPE_DISINFECTION+"','"+TousseDefinition.PACKAGE_TYPE_DRESSING+"','"+TousseDefinition.PACKAGE_TYPE_COMBO+"') "
                 //本供应室处理的器械包实例，但是录入代理灭菌单的器械包实例（只有代理科室才能灭菌）
@@ -1704,8 +1704,8 @@
                     + " t.reviewTime,t.isUrgentTousse,tdAncestor.isTraceable  "
                     + ",null fixedBarcode "+ sqlSelect_UrgentLevel
                     + "from tousseinstance t"+ sqlJoin_UrgentLevel
-                    + " , barcodedevice b , TousseDefinition td , TousseDefinition tdAncestor, Sterilisation s "
-                    + "where t.id = b.id and t.tousseDefinition_id=td.id and td.ancestorID=tdAncestor.id and s.sterilisation = tdAncestor.sterilingMethod and td.tousseType in ('"+TousseDefinition.PACKAGE_TYPE_FOREIGNPROXY+"') and t.reviewBasket_id "
+                    + " , barcodedevice b , TousseDefinition td , TousseDefinition tdAncestor left join Sterilisation s on s.sterilisation = tdAncestor.sterilingMethod "
+                    + "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 "
                     + reviewedBasketSql
                     + " and t.orgUnitCoding='"+currentOrgUnitCode+"' "
                     + " and t.status <> '" + TousseInstance.STATUS_DISCARD + "'";
@@ -1741,8 +1741,8 @@
                     + "t.reviewTime,t.isUrgentTousse,tdAncestor.isTraceable,"
                     + firstBarcodeSql+ sqlSelect_UrgentLevel
                     + "from tousseinstance t"+ sqlJoin_UrgentLevel
-                    + " , barcodedevice b , TousseDefinition td , TousseDefinition tdAncestor, Sterilisation s "
-                    + "where t.id = b.id and t.tousseDefinition_id=td.id and td.ancestorID=tdAncestor.id and s.sterilisation = tdAncestor.sterilingMethod and td.tousseType in ('"+TousseDefinition.PACKAGE_TYPE_FOREIGNPROXY+"') and t.reviewBasket_id "
+                    + " , barcodedevice b , TousseDefinition td , TousseDefinition tdAncestor left join Sterilisation s on s.sterilisation = tdAncestor.sterilingMethod "
+                    + "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 "
                     + reviewedBasketSql
                     + " and t.orgUnitCoding='"+currentOrgUnitCode+"' "
                     + " and t.status <> '" + TousseInstance.STATUS_DISCARD + "'";
@@ -2204,7 +2204,7 @@
                     + "from TousseInstance ti join barcodeDevice b on ti.id=b.id "
                     + "join TousseDefinition td on ti.tousseDefinition_id=td.id  "
                     + "join TousseDefinition tdAncestor on td.ancestorID=tdAncestor.id "
-                    + "join Sterilisation s on s.sterilisation=tdAncestor.sterilingMethod " 
+                    + "left join Sterilisation s on s.sterilisation=tdAncestor.sterilingMethod " 
                     + "where " + SqlUtils.getStringFieldInLargeCollectionsPredicate("b.barcode", tousseInstanceBarcodeList)
                     +" and reviewBasket_id is not null ";
             List<TousseSimpleVO> resultList = getTousseVoDataFromDb(returnSql);