Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java =================================================================== diff -u -r28943 -r29216 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 28943) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 29216) @@ -10205,7 +10205,8 @@ + " left outer join fetch po.invoiceItem " + where; List invoices = objectDao.findByHql(invoiceSql); // 只打印已经发货的器械包(退货的器械包目前有“已废弃”、“已灭菌”两种状态) - String tousseSql = "where po.status not in ('" + TousseInstance.STATUS_STERILED + "','" + TousseInstance.STATUS_DISCARD + "') and po.invoice_id in ( select po.id from " + Invoice.class.getSimpleName() + " po " + where + ")"; + String tousseSql = "where po.status not in ('" + TousseInstance.STATUS_STERILED + "','" + TousseInstance.STATUS_DISCARD + "') and (po.invoice_id in ( select po.id from " + Invoice.class.getSimpleName() + " po " + where + ")" + + " or po.invoice2_id in ( select po.id from " + Invoice.class.getSimpleName() + " po " + where + "))"; Map> departCodingInvoiceMap = seperateInvoiceByDepart(invoices); return mergeLoadPrintData(departCodingInvoiceMap,config,loadInvoiceTousseInstance(tousseSql)); }