Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r34012 -r34016
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 34012)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 34016)
@@ -21014,7 +21014,7 @@
 						"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 " +
+						"join TousseInstance tit2 on tit2.recyclingRecordId=rr.id and tit2.tousseDefinition_id=ri.tousseDefinitionId and (tit2.sourceRecyclingItemId is null or 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 " +
@@ -21035,6 +21035,7 @@
 						"and (ti.isTerminated is null or ti.isTerminated<>1) " +
 						"and (ti.id is null or 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) " +
+						"and ri.tousseDefinitionId not in (select tousseDefinition_id from TousseInstance where recyclingRecordId=rr.id and sourceRecyclingItemId is null) " +
 						"union all " +
 						//--10.2.手工添加回收(或添加申请单后的回收)后的回收，查询有装配但未装完的未装配部分的数据（）
 						"select ri.id,ri.urgentAmount,rr.orgUnitCoding,null '预回收时间',rr.recyclingTime '回收时间',null '清洗交接时间',null '装配时间',null '灭菌开始时间',null '灭菌结束时间',null '发货时间'," +