Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
===================================================================
diff -u -r30024 -r30034
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 30024)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 30034)
@@ -1644,12 +1644,12 @@
             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 ";
         }
         //1、普通器械包、消毒物品、敷料包
-        String sql = "select * from (select distinct t.reviewBasket_id,t.id id, t.depart depart, t.tousseName name, td.includeImplant, b.barcode, t.sterilingType, t.sterilingMode,"
+        String sql = "select * from (select distinct t.reviewBasket_id,t.id id, t.depart depart, t.tousseName name, td.includeImplant, b.barcode, (case when tdAncestor.isTraceable = '"+ Constants.STR_NO +"' then s.sterilizationMode else t.sterilingMode end) sterilingMode, t.sterilingType,"
                 + " t.reviewTime,t.isUrgentTousse,tdAncestor.isTraceable  "
                 + queryFixedBarcodeSql + sqlSelect_UrgentLevel 
                 + " from tousseinstance t" + sqlJoin_UrgentLevel
-                + " , 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 "
+                + " , 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 "
                 + "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+"') "
                 //本供应室处理的器械包实例，但是录入代理灭菌单的器械包实例（只有代理科室才能灭菌）
@@ -1688,12 +1688,12 @@
                         + " and t.status <> '" + TousseInstance.STATUS_DISCARD + "'";
             }
             //4、外部代理灭菌
-            sql += " union all select t.reviewBasket_id,t.id id, t.depart depart,t.tousseName name, td.includeImplant, b.barcode, t.sterilingType, t.sterilingMode,"
+            sql += " union all select t.reviewBasket_id,t.id id, t.depart depart,t.tousseName name, td.includeImplant, b.barcode, (case when tdAncestor.isTraceable = '"+ Constants.STR_NO +"' then s.sterilizationMode else t.sterilingMode end) sterilingMode, t.sterilingType,"
                     + " t.reviewTime,t.isUrgentTousse,tdAncestor.isTraceable  "
                     + ",null fixedBarcode "+ sqlSelect_UrgentLevel
                     + "from tousseinstance t"+ sqlJoin_UrgentLevel
-                    + " , 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 "
+                    + " , 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 "
                     + reviewedBasketSql
                     + " and t.orgUnitCoding='"+currentOrgUnitCode+"' "
                     + " and t.status <> '" + TousseInstance.STATUS_DISCARD + "'";
@@ -1725,12 +1725,12 @@
             } else if(dbConnection.isOracle()){
                 firstBarcodeSql = "(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) fixedBarcode ";
             }
-            sql += " union all select t.reviewBasket_id,t.id id, t.depart depart,t.tousseName name, td.includeImplant, b.barcode, t.sterilingType, t.sterilingMode,"
+            sql += " union all select t.reviewBasket_id,t.id id, t.depart depart,t.tousseName name, td.includeImplant, b.barcode, (case when tdAncestor.isTraceable = '"+ Constants.STR_NO +"' then s.sterilizationMode else t.sterilingMode end) sterilingMode, t.sterilingType,"
                     + "t.reviewTime,t.isUrgentTousse,tdAncestor.isTraceable,"
                     + firstBarcodeSql+ sqlSelect_UrgentLevel
                     + "from tousseinstance t"+ sqlJoin_UrgentLevel
-                    + " , 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 "
+                    + " , 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 "
                     + reviewedBasketSql
                     + " and t.orgUnitCoding='"+currentOrgUnitCode+"' "
                     + " and t.status <> '" + TousseInstance.STATUS_DISCARD + "'";
@@ -1897,6 +1897,7 @@
                 vo.setId(rs.getLong("id"));
                 
                 vo.setSterilingType(rs.getString("SterilingType"));
+                vo.setSterilingMode(rs.getString("SterilingMode"));
                 //如果是否追溯为否,则设置为否,否则都为是
                 String isTraceable = rs.getString("isTraceable");
                 if(StringUtils.equals(Constants.STR_NO, isTraceable)){
@@ -1907,7 +1908,6 @@
                 }else{
                 	vo.setBarcode(rs.getString("barcode"));
                 	vo.setDepart(rs.getString("depart"));
-                	vo.setSterilingMode(rs.getString("SterilingMode"));
                 	vo.setReviewTime(ForgonDateUtils.safelyFormatDate(rs.getTimestamp("reviewTime"), Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMM, ""));
                 }
                 vo.setIsUrgentTousse(rs.getString("isUrgentTousse"));
@@ -5546,6 +5546,7 @@
                             ItemDefinitionVO itemDefinition = vo.getItemDefinition();
                             obj.put("includeImplant", (itemDefinition != null && itemDefinition.getIncludeImplant() != null) ? 
                             		itemDefinition.getIncludeImplant() : "");
+                            obj.put("sterilingMode", vo.getSterilingMode());
                             bMap.put(key, obj);
                         }
                     }else{