Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
===================================================================
diff -u -r33664 -r33838
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 33664)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 33838)
@@ -4758,7 +4758,7 @@
 				+ "(select ip.id invoicePlanID, ip.recyclingStatus, ti.tousseName, tis.status, bd.barcode tousseBarcode, 1 amount "
 				+ "from InvoicePlan ip "
 				+ "join TousseItem ti on ip.id = ti.recyclingApplication_ID "
-				+ "join TousseInstance tis on ip.id = tis.invoicePlanID "
+				+ "join TousseInstance tis on ip.id = (case when ip.type = '代理灭菌单' then tis.proxyDisinfection_id else tis.invoicePlanID end) "
 				+ "join TousseDefinition td on td.id = tis.tousseDefinition_id "
 				+ "join TousseDefinition tdancestor on tdancestor.id = td.ancestorID "
 				+ "join barcodeDevice bd on bd.id = tis.id "
@@ -4774,7 +4774,7 @@
 				+ "count(ti.id) amount "
 				+ "from InvoicePlan ip "
 				+ "join TousseItem ti on ip.id = ti.recyclingApplication_ID "
-				+ "join TousseInstance tis on ip.id = tis.invoicePlanID "
+				+ "join TousseInstance tis on ip.id = (case when ip.type = '代理灭菌单' then tis.proxyDisinfection_id else tis.invoicePlanID end) "
 				+ "join TousseDefinition td on td.id = tis.tousseDefinition_id "
 				+ "join TousseDefinition tdancestor on tdancestor.id = td.ancestorID "
 				+ "join barcodeDevice bd on bd.id = tis.id "