Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java =================================================================== diff -u -r30894 -r30896 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 30894) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 30896) @@ -1695,7 +1695,7 @@ + " 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, (case when tdAncestor.isTraceable = '"+ Constants.STR_NO +"' then s.sterilizationMode else t.sterilingMode end) sterilingMode, t.sterilingType," + sql += " union all select t.reviewBasket_id,t.id id, t.depart depart,t.tousseName name, td.includeImplant, b.barcode, t.sterilingType, (case when tdAncestor.isTraceable = '"+ Constants.STR_NO +"' then s.sterilizationMode else t.sterilingMode end) sterilingMode," + " t.reviewTime,t.isUrgentTousse,tdAncestor.isTraceable, tdAncestor.id tdAncestorId " + sqlSelect_UrgentLevel + "from tousseinstance t"+ sqlJoin_UrgentLevel @@ -1726,7 +1726,7 @@ + " and t.orgUnitCoding='"+currentOrgUnitCode+"' " + " 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, (case when tdAncestor.isTraceable = '"+ Constants.STR_NO +"' then s.sterilizationMode else t.sterilingMode end) sterilingMode, t.sterilingType," + sql += " union all select t.reviewBasket_id,t.id id, t.depart depart,t.tousseName name, td.includeImplant, b.barcode, t.sterilingType, (case when tdAncestor.isTraceable = '"+ Constants.STR_NO +"' then s.sterilizationMode else t.sterilingMode end) sterilingMode," + "t.reviewTime,t.isUrgentTousse,tdAncestor.isTraceable, tdAncestor.id tdAncestorId " + sqlSelect_UrgentLevel + "from tousseinstance t"+ sqlJoin_UrgentLevel