Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java =================================================================== diff -u -r27096 -r27109 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 27096) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 27109) @@ -6482,7 +6482,7 @@ String whereSql = getDisinfectionTousseInstanceSql(invoicePlans, tousseDefinition); whereSql = String.format("%s and %s", whereSql,SqlUtils.getNonStringFieldNotInCollectionsPredicate("po.id", TousseInstanceUtils.getTousseInstanceIds(scannedTousseInstances))); String hql = String.format(" from %s po inner join fetch po.tousseDefinition %s",TousseInstance.class.getSimpleName(), whereSql); - hql += " order by po.validUntil asc "; + hql += " order by po.validUntil,po.id "; List result = objectDao.findByHql(hql , 0 , amount); return result; }