Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java =================================================================== diff -u -r35745 -r35748 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java (.../ForeignTousseApplicationAction.java) (revision 35745) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java (.../ForeignTousseApplicationAction.java) (revision 35748) @@ -480,6 +480,9 @@ return sterilizationIdMap; } for(TousseInstance ti : tiList){ + if(StringUtils.equals(ti.getStatus(), TousseInstance.STATUS_DELAY_CONFIRM)){ + continue; + } Long sterilizationRecordId = ti.getSterilizationRecord_id(); if(DatabaseUtil.isPoIdValid(sterilizationRecordId)){ sterilizationIdMap.put(ti.getId(), sterilizationRecordId); Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/dwr/table/ForeignTousseApplicationTableManager.java =================================================================== diff -u -r35745 -r35748 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/dwr/table/ForeignTousseApplicationTableManager.java (.../ForeignTousseApplicationTableManager.java) (revision 35745) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/dwr/table/ForeignTousseApplicationTableManager.java (.../ForeignTousseApplicationTableManager.java) (revision 35748) @@ -184,10 +184,11 @@ + ", case when td.parentID is not null then td.parentID else td.id end tdParentId" + ", ti.sterilizationRecord_id sterilizationRecordId " + "from %s ti " - + "join %s td on td.id = ti.tousseDefinition_id where %s ", + + "join %s td on td.id = ti.tousseDefinition_id where %s and ti.status <> '%s' ", TousseInstance.class.getSimpleName(), TousseDefinition.class.getSimpleName(), - SqlUtils.getNonStringFieldInLargeCollectionsPredicate("ti.foreignTousseApp_id", foreignTousseApplicationIdList)); + SqlUtils.getNonStringFieldInLargeCollectionsPredicate("ti.foreignTousseApp_id", foreignTousseApplicationIdList), + TousseInstance.STATUS_DELAY_CONFIRM); ResultSet rs = null; try { rs = objectDao.executeSql(sql);