Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r28594 -r28603
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 28594)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 28603)
@@ -17696,13 +17696,13 @@
 						"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 " +
+						"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 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 " +
 						"where ri.urgentAmount > 0 " +
-						"and ti.id not in (select tousseItemId from TousseInstance where tousseItemId is not null) " +
+						"and (ti.id is null or ti.id not in (select tousseItemId from TousseInstance where tousseItemId is not null)) " +
 						"and tit2.isUrgentTousse='是' " +
 						"union all " +
 						//--10.手工添加回收(或添加申请单后的回收)后的回收        (排除预回收、装配的包实例数据、手工添加的不会做预回收,清洗交接没有意义)（全部装配+部分装配）
@@ -17711,20 +17711,20 @@
 						"ri.tousseName '物品名称',ri.urgentLevel '加急类型',null '灭菌方式',null '器械包条码',null '标识牌条码' " +
 						"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 " +
+						"left 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 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) " +
 						"union all " +
 						//--10.2.手工添加回收(或添加申请单后的回收)后的回收，查询有装配但未装完的未装配部分的数据（）
 						"select ri.urgentAmount,rr.orgUnitCoding,null '预回收时间',rr.recyclingTime '回收时间',null '清洗交接时间',null '装配时间',null '灭菌开始时间',null '灭菌结束时间',null '发货时间'," +
 						"ri.tousseName '物品名称',ri.urgentLevel '加急类型',null '灭菌方式',null '器械包条码',null '标识牌条码' " +
 						"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 " +
+						"left join TousseItem ti on ti.recyclingApplication_ID=rr.recyclingApplication_id and ti.tousseDefinitionId=ri.tousseDefinitionId " +
 						"join PackingTask pt on pt.sourceId=rr.id and pt.tousseDefinition_id=ri.tousseDefinitionId " +
 						"where ri.urgentAmount > 0 " +
-						"and ti.id not in (select tousseItemId from TousseInstance where tousseItemId is not null) " + 
+						"and (ti.id is null or ti.id not in (select tousseItemId from TousseInstance where tousseItemId is not null)) " + 
 						"and ri.id in (select sourceRecyclingItemId from TousseInstance where sourceRecyclingItemId is not null) " +
 					") temp where 1=1 " + betweenSql + tousseNameSql + whereSqlForOrgUnitCoding + " order by temp.回收时间"
 					;