Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java =================================================================== diff -u -r17282 -r17316 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 17282) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 17316) @@ -899,8 +899,8 @@ .getAfterRecyclingTousseDeliver(); if (afterRecyclingTousseDeliver) { where4 = String - .format("((recyclingStatus not in ('%s','%s')) or (recyclingStatus is null) or (includeInvoiceItems = %s))", - InvoicePlan.RECYCLINGSTATUS_AWAITRECYCLE,InvoicePlan.RECYCLINGSTATUS_AWAITRECEIVE, + .format("((recyclingStatus not in ('%s')) or (recyclingStatus is null) or (includeInvoiceItems = %s))", + InvoicePlan.RECYCLINGSTATUS_AWAITRECEIVE, InvoicePlan.SIGNED_TRUE); } //外来器械跑代理灭菌流程(过滤二级供应室申请的外来器械申请单) Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java =================================================================== diff -u -r17248 -r17316 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 17248) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 17316) @@ -4731,8 +4731,9 @@ continue; } } + String isRecycling = applicationItem.getIsRecycling(); // 一次性物品和辅料包在任何情况下都不过滤 - if("一次性物品".equals(tousseType) || TousseDefinition.PACKAGE_TYPE_DRESSING.equals(tousseType)){ + if("一次性物品".equals(tousseType) || TousseDefinition.PACKAGE_TYPE_DRESSING.equals(tousseType) || StringUtils.equals(isRecycling, TousseDefinition.STR_NO)){ }else{ Integer recyclingAmount = applicationItem.getRecyclingAmount();