Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java =================================================================== diff -u -r16516 -r16590 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 16516) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 16590) @@ -4485,16 +4485,19 @@ continue; } } - - if (recyclingedDeliver - && isComboForm - && !isRecyclinged - && StringUtils.isNotBlank(recyclingStatus) - && !"一次性物品".equals(tousseType) - && !TousseDefinition.PACKAGE_TYPE_DRESSING - .equals(tousseType)) { - continue; + // 一次性物品和辅料包在任何情况下都不过滤 + if("一次性物品".equals(tousseType) || TousseDefinition.PACKAGE_TYPE_DRESSING.equals(tousseType)){ + + }else{ + Integer recyclingAmount = applicationItem.getRecyclingAmount(); + if (recyclingedDeliver + && isComboForm + && !isRecyclinged + && StringUtils.isNotBlank(recyclingStatus) && (recyclingAmount == null || recyclingAmount == 0)) { + continue; + } } + // 处理外来器械包申请单(已经打印标签包含病人信息的包) if (InvoicePlan.TYPE_FOREIGNTOUSSEAPPLIACTION