Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefOptionalSterilizationManagerImpl.java =================================================================== diff -u -r36442 -r36559 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefOptionalSterilizationManagerImpl.java (.../TousseDefOptionalSterilizationManagerImpl.java) (revision 36442) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefOptionalSterilizationManagerImpl.java (.../TousseDefOptionalSterilizationManagerImpl.java) (revision 36559) @@ -163,7 +163,7 @@ sbf.append(TousseDefOptionalSterilization.class.getSimpleName()); sbf.append(" ts join "); sbf.append(Sterilisation.class.getSimpleName()); - sbf.append(" s on s.id=ts.sterilizationId where ts.tousseDefinitionId=tdc.id and s.sterilisation=?));"); + sbf.append(" s on s.id=ts.sterilizationId where ts.tousseDefinitionId=tdc.id and s.sterilisation=?))"); return con.prepareStatement(sbf.toString()); } }, new PreparedStatementSetter() { @@ -206,7 +206,7 @@ + "join BarcodeDevice bd on bd.id=ti.id " + "left join TousseDefOptionalSterilization ts on ts.tousseDefinitionId=tdc.id " + "left join Sterilisation s on s.id=ts.sterilizationId " - + "where (ti.reviewBasket_ID is null or ti.reviewBasket_ID<>" + basketId +") and " + barcodeInCondition + " and tousseFixedBarcode <> 1;"); + + "where (ti.reviewBasket_ID is null or ti.reviewBasket_ID<>" + basketId +") and " + barcodeInCondition + " and tousseFixedBarcode <> 1"); Map> noHaveBasketMap = getSterilisationOfTi(sbf.toString()); if(MapUtils.isEmpty(noHaveBasketMap)){ noHaveBasketMap = new HashMap>();