Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r18241 -r18244
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 18241)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 18244)
@@ -15591,6 +15591,7 @@
 						"join WashTransitionRecord wtr on wtr.id=wti.washTransitionRecordId  " +
 						"where ri.urgentAmount > 0  " +
 						"and tit.id not in (select lastTousseInstanceId from TousseInstance where lastTousseInstanceId is not null)  " +
+						"and ri.id not in (select sourceRecyclingItemId from TousseInstance where sourceRecyclingItemId is not null) " +
 						"union all  " +
 						//--3.使用记录转申请单后的预回收、回收、装配        (排除清洗交接的数据)
 						"select ttr.transitionTime '预回收时间',rr.recyclingTime '回收时间',null '清洗交接时间',tit2.operationTime '装配时间',sr.startDate '灭菌开始时间',sr.endDate '灭菌结束时间',tit2.invoiceSendTime '发货时间'," +
@@ -15622,6 +15623,7 @@
 						"where ri.urgentAmount > 0  " +
 						"and tit.id not in (select lastTousseInstanceId from TousseInstance where lastTousseInstanceId is not null)  " +
 						"and b.barcode not in (select wti.tousseBarcode from WashTransitionItem wti where wti.tousseDefinitionId=ri.tousseDefinitionId and wti.tousseBarcode is not null)  " +
+						"and ri.id not in (select sourceRecyclingItemId from TousseInstance where sourceRecyclingItemId is not null) " +
 						"union all  " +
 						//--5.使用记录转申请单后的回收、清洗交接、装配        (排除预回收数据)
 						"select null '预回收时间',rr.recyclingTime '回收时间',wtr.transitionTime '清洗交接时间',tit2.operationTime '装配时间',sr.startDate '灭菌开始时间',sr.endDate '灭菌结束时间',tit2.invoiceSendTime '发货时间'," +
@@ -15653,6 +15655,7 @@
 						"where ri.urgentAmount > 0 " +
 						"and b.barcode not in (select tti.tousseBarcode from TousseTransitionItem tti where tti.tousseBarcode is not null) " +
 						"and tit.id not in (select lastTousseInstanceId from TousseInstance where lastTousseInstanceId is not null) " +
+						"and ri.id not in (select sourceRecyclingItemId from TousseInstance where sourceRecyclingItemId is not null) " +
 						"union all " +
 						//--7.使用记录转申请单后的回收、装配        (排除预回收与清洗交接数据)
 						"select null '预回收时间',rr.recyclingTime '回收时间',null '清洗交接时间',tit2.operationTime '装配时间',sr.startDate '灭菌开始时间',sr.endDate '灭菌结束时间',tit2.invoiceSendTime '发货时间'," +
@@ -15682,6 +15685,7 @@
 						"and b.barcode not in (select tti.tousseBarcode from TousseTransitionItem tti where tti.tousseBarcode is not null) " +
 						"and b.barcode not in (select wti.tousseBarcode from WashTransitionItem wti where wti.tousseDefinitionId=ri.tousseDefinitionId and wti.tousseBarcode is not null) " +
 						"and tit.id not in (select lastTousseInstanceId from TousseInstance where lastTousseInstanceId is not null) " +
+						"and ri.id not in (select sourceRecyclingItemId from TousseInstance where sourceRecyclingItemId is not null) " +
 						"union all " +
 						//--9.手工添加回收(或添加申请单后的回收)后的回收、装配        (排除预回收数据、手工添加的不会做预回收,清洗交接没有意义)
 						"select null '预回收时间',rr.recyclingTime '回收时间',null '清洗交接时间',tit2.operationTime '装配时间',sr.startDate '灭菌开始时间',sr.endDate '灭菌结束时间',tit2.invoiceSendTime '发货时间'," +
@@ -15703,7 +15707,8 @@
 						"join RecyclingItem ri on ri.recyclingRecord_id=rr.id " +
 						"join TousseItem ti on ti.recyclingApplication_ID=rr.recyclingApplication_id and ti.tousseDefinitionId=ri.tousseDefinitionId " +
 						"where ri.urgentAmount > 0 " +
-						"and ti.id not in (select tousseItemId from TousseInstance where tousseItemId is not null)" +
+						"and ti.id not in (select tousseItemId from TousseInstance where tousseItemId is not null) " + 
+						"and ri.id not in (select sourceRecyclingItemId from TousseInstance where sourceRecyclingItemId is not null)" +
 					") temp where 1=1 " + betweenSql + tousseNameSql + " order by temp.回收时间"
 					;
 			ResultSet result = objectDao.executeSql(sql);