Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java =================================================================== diff -u -r30183 -r30254 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 30183) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 30254) @@ -1656,7 +1656,7 @@ 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, (case when tdAncestor.isTraceable = '"+ Constants.STR_NO +"' then s.sterilizationMode else t.sterilingMode end) sterilingMode, t.sterilingType," + String sql = "select * from (select distinct 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 " + queryFixedBarcodeSql + sqlSelect_UrgentLevel + " from tousseinstance t" + sqlJoin_UrgentLevel