Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java =================================================================== diff -u -r15437 -r15450 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 15437) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 15450) @@ -951,7 +951,7 @@ buildSqlForGetInvoicePlanByOrgUnitCodingsAndTousseType(orgUnitCodings, applyDate, tousseType); // sql += " ORDER BY sequence, applicationTime"; // return objectDao.findBySql(InvoicePlan.class.getSimpleName(), sql); - String hql = String.format("select distinct po from %s po inner join fetch po.applicationItems %s ORDER BY sequence, applicationTime", InvoicePlan.class.getSimpleName(),sql); + String hql = String.format("select distinct po from %s po inner join fetch po.applicationItems %s and (po.type!='%s') ORDER BY sequence, applicationTime", InvoicePlan.class.getSimpleName(),sql,InvoicePlan.TYPE_OPERATION_RESERVATION_APPLICATION); return objectDao.findByHql(hql); }