Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java =================================================================== diff -u -r14498 -r14561 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 14498) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 14561) @@ -783,8 +783,8 @@ .getAfterRecyclingTousseDeliver(); if (afterRecyclingTousseDeliver) { where4 = String - .format("((recyclingStatus != '%s') or (recyclingStatus is null) or (includeInvoiceItems = %s))", - InvoicePlan.RECYCLINGSTATUS_AWAITRECYCLE, + .format("((recyclingStatus not in ('%s','%s')) or (recyclingStatus is null) or (includeInvoiceItems = %s))", + InvoicePlan.RECYCLINGSTATUS_AWAITRECYCLE,InvoicePlan.RECYCLINGSTATUS_AWAITRECEIVE, InvoicePlan.SIGNED_TRUE); } //外来器械跑代理灭菌流程(过滤二级供应室申请的外来器械申请单)