Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java =================================================================== diff -u -r27903 -r27939 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java (.../InvoicePlanOptimizeManagerImpl.java) (revision 27903) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java (.../InvoicePlanOptimizeManagerImpl.java) (revision 27939) @@ -821,11 +821,11 @@ ResultSet rs = null; String querySql = String.format("select ti.tousseName,count(0) cnt from %s ti " + "where ti.orgUnitCoding='%s' and %s " - + "and ti.status='%s' " + + "and ti.status in ('%s','%s') " + "group by ti.tousseName having count(0) > 0", TousseInstance.class.getSimpleName(),AcegiHelper.getCurrentOrgUnitCode(), SqlUtils.getStringFieldInLargeCollectionsPredicate("ti.tousseName", tousseNameList), - TousseInstance.STATUS_STERILED + TousseInstance.STATUS_STERILED,TousseInstance.STATUS_DISINFECTED ); try { rs = objectDao.executeSql(querySql);