Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r38737 -r38780 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 38737) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 38780) @@ -8096,11 +8096,10 @@ private SterilizationRecord getFirstDraftSterilizationRecord(Sterilizer sterilizer) { if (sterilizer != null && sterilizer.getId() != null) { try { - String hql = String.format(" from %s re where re.sterilizer.id = %s " - + " and re.status = '%s' " - + " order by %s asc, frequency asc", - SterilizationRecord.class.getSimpleName(), sterilizer.getId(), - SterilizationRecord.STERILIZATION_STATUS_DRAFT, dateQueryAdapter.dateToVarchar1("re.startDate")); + String hql = " from "+ SterilizationRecord.class.getSimpleName() +" re where re.sterilizer.id = " + + sterilizer.getId() + + " and re.status = '"+ SterilizationRecord.STERILIZATION_STATUS_DRAFT +"' " + + " order by "+ dateQueryAdapter.dateToVarchar1("re.startDate") +" asc, frequency asc"; List sterilizationRecords = objectDao.findByHql(hql); if(CollectionUtils.isNotEmpty(sterilizationRecords)){ return sterilizationRecords.get(0);