Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
===================================================================
diff -u -r27331 -r27418
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 27331)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 27418)
@@ -868,7 +868,8 @@
 		String orderBy =  " order by sendTime asc";
 		List<Invoice> list = findBySql(sql + orderBy);
 		String tousseSql = "where invoice_id in (select id from " + Invoice.class.getSimpleName()
-					+ sql + ")";
+					+ sql + ") or invoice2_id in ( select id from "
+		+ Invoice.class.getSimpleName() + sql + ")";
 		return getDisinfectGoodsPrintData(list,loadInvoiceTousseInstance(tousseSql),null);
 //		Map<String, List<InvoicePrintVo>> map = new HashMap<String, List<InvoicePrintVo>>();
 //		if (list != null) {
@@ -9277,7 +9278,8 @@
 		String orderBy = " order by sendTime asc";
 		List<Invoice> list = findBySql(sql + orderBy);
 		String toussesql = " where invoice_id in ( select id from " 
-		+ Invoice.class.getSimpleName() +  sql + " ) ";
+		+ Invoice.class.getSimpleName() +  sql + " ) or invoice2_id in ( select id from "
+		+ Invoice.class.getSimpleName() + sql + ")";
 		return getDisinfectGoodsPrintData(list,loadInvoiceTousseInstance(toussesql),null);
 	}
 	/**
@@ -9827,7 +9829,7 @@
 		Map<Long,List<TousseInstance>> invoiceTousseMap = new HashMap<Long,List<TousseInstance>>();
 		if(CollectionUtils.isNotEmpty(tousseInstances)){
 			for(TousseInstance ti : tousseInstances){
-				List<TousseInstance> list = invoiceTousseMap.get(ti.getInvoice_id());
+				List<TousseInstance> list = invoiceTousseMap.get(DatabaseUtil.isPoIdValid(ti.getInvoice2_id())?ti.getInvoice2_id():ti.getInvoice_id());
 				if(list == null){
 					list = new ArrayList<TousseInstance>();
 					invoiceTousseMap.put(ti.getInvoice_id(), list);