Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r31973 -r32092
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 31973)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 32092)
@@ -19132,7 +19132,7 @@
 			String sql =
 					"select * from (" +
 						//--1.使用记录转申请单后的预回收、回收、清洗交接、装配（全部装配+部分装配）
-						"select ri.id,ri.urgentAmount,rr.orgUnitCoding,ttr.transitionTime '预回收时间',rr.recyclingTime '回收时间',wtr.transitionTime '清洗交接时间',tit2.operationTime '装配时间',sr.startDate '灭菌开始时间',sr.endDate '灭菌结束时间',tit2.invoiceSendTime '发货时间'," +
+						"select ri.id,ri.urgentAmount,rr.orgUnitCoding,ttr.transitionTime '预回收时间',rr.recyclingTime '回收时间',wtr.transitionTime '清洗交接时间',tit2.operationTime '装配时间',sr.startDate '灭菌开始时间',sr.endDate '灭菌结束时间',i.sendTime '发货时间'," +
 						"ri.tousseName '物品名称',ri.urgentLevel '加急类型',sz.ownGroup '灭菌方式',b2.barcode '器械包条码',tit2.idCardInstanceBarcode '标识牌条码' " +
 						"from RecyclingRecord rr  " +
 						"join RecyclingItem ri on ri.recyclingRecord_id=rr.id  " +
@@ -19144,6 +19144,7 @@
 						"join WashTransitionItem wti on wti.tousseDefinitionId=ri.tousseDefinitionId and b.barcode=wti.tousseBarcode  " +
 						"join WashTransitionRecord wtr on wtr.id=wti.washTransitionRecordId  " +
 						"join TousseInstance tit2 on tit2.recyclingRecordId=rr.id and tit2.tousseDefinition_id=ri.tousseDefinitionId and tit2.lasttousseinstanceid = tit.id  " +
+						"left join Invoice i on i.id=tit2.invoice_id " +
 						"join barcodeDevice b2 on tit2.id=b2.id  " +
 						"left join SterilizationRecord sr on tit2.sterilizationRecord_id=sr.id  " +
 						"left join Sterilizer sz on sr.sterilizer_id=sz.id  " +
@@ -19188,7 +19189,7 @@
 						"and ri.id in (select sourceRecyclingItemId from TousseInstance where sourceRecyclingItemId is not null) " +
 						"union all  " +
 						//--3.使用记录转申请单后的预回收、回收、装配        (排除清洗交接的数据)（全部装配+部分装配）
-						"select ri.id,ri.urgentAmount,rr.orgUnitCoding,ttr.transitionTime '预回收时间',rr.recyclingTime '回收时间',null '清洗交接时间',tit2.operationTime '装配时间',sr.startDate '灭菌开始时间',sr.endDate '灭菌结束时间',tit2.invoiceSendTime '发货时间'," +
+						"select ri.id,ri.urgentAmount,rr.orgUnitCoding,ttr.transitionTime '预回收时间',rr.recyclingTime '回收时间',null '清洗交接时间',tit2.operationTime '装配时间',sr.startDate '灭菌开始时间',sr.endDate '灭菌结束时间',i.sendTime '发货时间'," +
 						"ri.tousseName '物品名称',ri.urgentLevel '加急类型',sz.ownGroup '灭菌方式',b2.barcode '器械包条码',tit2.idCardInstanceBarcode '标识牌条码' " +
 						"from RecyclingRecord rr  " +
 						"join RecyclingItem ri on ri.recyclingRecord_id=rr.id  " +
@@ -19198,6 +19199,7 @@
 						"join TousseTransitionItem tti on tti.tousseItemId=ti.id and tti.tousseBarcode=b.barcode  " +
 						"join TousseTransitionRecord ttr on ttr.id=tti.tousseTransitionRecordId  " +
 						"join TousseInstance tit2 on tit2.recyclingRecordId=rr.id and tit2.tousseDefinition_id=ri.tousseDefinitionId and tit2.lasttousseinstanceid = tit.id  " +
+						"left join Invoice i on i.id=tit2.invoice_id " +
 						"join barcodeDevice b2 on tit2.id=b2.id  " +
 						"left join SterilizationRecord sr on tit2.sterilizationRecord_id=sr.id  " +
 						"left join Sterilizer sz on sr.sterilizer_id=sz.id  " +
@@ -19241,7 +19243,7 @@
 						"and ri.id in (select sourceRecyclingItemId from TousseInstance where sourceRecyclingItemId is not null) " +
 						"union all  " +
 						//--5.使用记录转申请单后的回收、清洗交接、装配        (排除预回收数据)（全部装配+部分装配）
-						"select ri.id,ri.urgentAmount,rr.orgUnitCoding,null '预回收时间',rr.recyclingTime '回收时间',wtr.transitionTime '清洗交接时间',tit2.operationTime '装配时间',sr.startDate '灭菌开始时间',sr.endDate '灭菌结束时间',tit2.invoiceSendTime '发货时间'," +
+						"select ri.id,ri.urgentAmount,rr.orgUnitCoding,null '预回收时间',rr.recyclingTime '回收时间',wtr.transitionTime '清洗交接时间',tit2.operationTime '装配时间',sr.startDate '灭菌开始时间',sr.endDate '灭菌结束时间',i.sendTime '发货时间'," +
 						"ri.tousseName '物品名称',ri.urgentLevel '加急类型',sz.ownGroup '灭菌方式',b2.barcode '器械包条码',tit2.idCardInstanceBarcode '标识牌条码' " +
 						"from RecyclingRecord rr   " +
 						"join RecyclingItem ri on ri.recyclingRecord_id=rr.id  " +
@@ -19251,6 +19253,7 @@
 						"join WashTransitionItem wti on wti.tousseDefinitionId=ri.tousseDefinitionId and b.barcode=wti.tousseBarcode " +
 						"join WashTransitionRecord wtr on wtr.id=wti.washTransitionRecordId " +
 						"join TousseInstance tit2 on tit2.recyclingRecordId=rr.id and tit2.tousseDefinition_id=ri.tousseDefinitionId and tit2.lasttousseinstanceid=tit.id " +
+						"left join Invoice i on i.id=tit2.invoice_id " +
 						"join barcodeDevice b2 on tit2.id=b2.id " +
 						"left join SterilizationRecord sr on tit2.sterilizationRecord_id=sr.id " +
 						"left join Sterilizer sz on sr.sterilizer_id=sz.id " +
@@ -19294,14 +19297,15 @@
 						"and ri.id in (select sourceRecyclingItemId from TousseInstance where sourceRecyclingItemId is not null) " +
 						"union all " +
 						//--7.使用记录转申请单后的回收、装配        (排除预回收与清洗交接数据)（全部装配+部分装配）
-						"select ri.id,ri.urgentAmount,rr.orgUnitCoding,null '预回收时间',rr.recyclingTime '回收时间',null '清洗交接时间',tit2.operationTime '装配时间',sr.startDate '灭菌开始时间',sr.endDate '灭菌结束时间',tit2.invoiceSendTime '发货时间'," +
+						"select ri.id,ri.urgentAmount,rr.orgUnitCoding,null '预回收时间',rr.recyclingTime '回收时间',null '清洗交接时间',tit2.operationTime '装配时间',sr.startDate '灭菌开始时间',sr.endDate '灭菌结束时间',i.sendTime  '发货时间'," +
 						"ri.tousseName '物品名称',ri.urgentLevel '加急类型',sz.ownGroup '灭菌方式',b2.barcode '器械包条码',tit2.idCardInstanceBarcode '标识牌条码' " +
 						"from RecyclingRecord rr  " +
 						"join RecyclingItem ri on ri.recyclingRecord_id=rr.id " +
 						"join TousseItem ti on ti.recyclingApplication_ID=rr.recyclingApplication_id and ti.tousseDefinitionId=ri.tousseDefinitionId " +
 						"join TousseInstance tit on tit.tousseItemId=ti.id " +
 						"join barcodeDevice b on tit.id=b.id " +
 						"join TousseInstance tit2 on tit2.recyclingRecordId=rr.id and tit2.tousseDefinition_id=ri.tousseDefinitionId and tit2.lasttousseinstanceid = tit.id " +
+						"left join Invoice i on i.id=tit2.invoice_id " +
 						"join barcodeDevice b2 on tit2.id=b2.id " +
 						"left join SterilizationRecord sr on tit2.sterilizationRecord_id=sr.id " +
 						"left join Sterilizer sz on sr.sterilizer_id=sz.id " +
@@ -19344,12 +19348,13 @@
 						"and ri.id in (select sourceRecyclingItemId from TousseInstance where sourceRecyclingItemId is not null) " +
 						"union all " +
 						//--9.手工添加回收(或添加申请单后的回收)后的回收、装配        (排除预回收数据、手工添加的不会做预回收,清洗交接没有意义)
-						"select ri.id,ri.urgentAmount,rr.orgUnitCoding,null '预回收时间',rr.recyclingTime '回收时间',null '清洗交接时间',tit2.operationTime '装配时间',sr.startDate '灭菌开始时间',sr.endDate '灭菌结束时间',tit2.invoiceSendTime '发货时间'," +
+						"select ri.id,ri.urgentAmount,rr.orgUnitCoding,null '预回收时间',rr.recyclingTime '回收时间',null '清洗交接时间',tit2.operationTime '装配时间',sr.startDate '灭菌开始时间',sr.endDate '灭菌结束时间',i.sendTime '发货时间'," +
 						"ri.tousseName '物品名称',ri.urgentLevel '加急类型',sz.ownGroup '灭菌方式',b2.barcode '器械包条码',tit2.idCardInstanceBarcode '标识牌条码' " +
 						"from RecyclingRecord rr  " +
 						"join RecyclingItem ri on ri.recyclingRecord_id=rr.id " +
 						"left join TousseItem ti on ti.recyclingApplication_ID=rr.recyclingApplication_id and ti.tousseDefinitionId=ri.tousseDefinitionId " +
 						"join TousseInstance tit2 on tit2.recyclingRecordId=rr.id and tit2.tousseDefinition_id=ri.tousseDefinitionId and tit2.sourceRecyclingItemId = ri.id " +
+						"left join Invoice i on i.id=tit2.invoice_id " +
 						"join barcodeDevice b2 on tit2.id=b2.id " +
 						"left join SterilizationRecord sr on tit2.sterilizationRecord_id=sr.id " +
 						"left join Sterilizer sz on sr.sterilizer_id=sz.id " +