Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
===================================================================
diff -u -r27331 -r27348
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 27331)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 27348)
@@ -1866,14 +1866,24 @@
      */
     private String buildSqlToQueryTosseeOfReviewedBasket(Set<String> tousseBarcode,Long reviewedBasketId){
     	StringBuffer sbf = new StringBuffer();
+    	String fixedBarcodeQuerySql = "";
+    	if(dbConnection.isSqlServer()){
+    		fixedBarcodeQuerySql = new StringBuffer().append("(select top 1 barcode from  ")
+    		    	.append(TousseInstance.class.getSimpleName())
+    		    	.append(" ti1 join ")
+    		    	.append(BarcodeDevice.class.getSimpleName())
+    		    	.append(" b1 on b1.id=ti1.id where ti1.tousseFixedBarcode=1 and ti1.tousseDefinition_id=td.id)").toString();
+        } else if(dbConnection.isOracle()){
+        	fixedBarcodeQuerySql = new StringBuffer().append("(select barcode from ")
+        			.append(TousseInstance.class.getSimpleName())
+        			.append(" ti1 join ")
+        			.append(BarcodeDevice.class.getSimpleName())
+        			.append(" b1 on b1.id=ti1.id where ti1.tousseFixedBarcode=1 and ti1.tousseDefinition_id=td.id and rownum <= 1)").toString();
+        }
     	sbf.append("select * from (select ti.id,tousseName,ti.status,")
-    	.append("(select top 1 barcode from  ")
+    	.append(fixedBarcodeQuerySql)
+    	.append(" barcode from ")
     	.append(TousseInstance.class.getSimpleName())
-    	.append(" ti1 join ")
-    	.append(BarcodeDevice.class.getSimpleName())
-    	.append(" b1 on b1.id=ti1.id where ti1.tousseFixedBarcode=1 and ti1.tousseDefinition_id=td.id) barcode")
-    	.append(" from ")
-    	.append(TousseInstance.class.getSimpleName())
     	.append(" ti inner join ")
     	.append(TousseDefinition.class.getSimpleName())
     	.append(" td on td.id=ti.tousseDefinition_id inner join ")