Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r28669 -r28748
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 28669)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 28748)
@@ -17520,6 +17520,7 @@
 						"left join Sterilizer sz on sr.sterilizer_id=sz.id  " +
 						"where ri.urgentAmount > 0  " +
 						"and tit2.isUrgentTousse='是' " +
+						"and (ti.isTerminated is null or ti.isTerminated<>1) " +
 						"union all  " +
 						//--2.使用记录转申请单后的预回收、回收、清洗交接        (排除装配的包实例数据)
 						//--2.1 使用记录转申请单后的预回收、回收、清洗交接但还未装配的数据
@@ -17535,6 +17536,7 @@
 						"join WashTransitionItem wti on wti.tousseDefinitionId=ri.tousseDefinitionId and b.barcode=wti.tousseBarcode  " +
 						"join WashTransitionRecord wtr on wtr.id=wti.washTransitionRecordId  " +
 						"where ri.urgentAmount > 0  " +
+						"and (ti.isTerminated is null or ti.isTerminated<>1) " +
 						"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  " +
@@ -17552,6 +17554,7 @@
 						"join WashTransitionRecord wtr on wtr.id=wti.washTransitionRecordId  " +
 						"join PackingTask pt on pt.sourceId=rr.id and pt.tousseDefinition_id=ri.tousseDefinitionId " +
 						"where ri.urgentAmount > 0  " +
+						"and (ti.isTerminated is null or ti.isTerminated<>1) " +
 						"and tit.id not in (select lastTousseInstanceId from TousseInstance where lastTousseInstanceId is not null)  " +
 						"and ri.id in (select sourceRecyclingItemId from TousseInstance where sourceRecyclingItemId is not null) " +
 						"union all  " +
@@ -17571,6 +17574,7 @@
 						"left join Sterilizer sz on sr.sterilizer_id=sz.id  " +
 						"where ri.urgentAmount > 0  " +
 						"and tit2.isUrgentTousse='是' " +
+						"and (ti.isTerminated is null or ti.isTerminated<>1) " +
 						"and b.barcode not in (select wti.tousseBarcode from WashTransitionItem wti where wti.tousseDefinitionId=ri.tousseDefinitionId and wti.tousseBarcode is not null)  " +
 						"union all  " +
 						//--4.使用记录转申请单后的预回收、回收        (排除清洗交接与装配的包实例数据)
@@ -17585,6 +17589,7 @@
 						"join TousseTransitionItem tti on tti.tousseItemId=ti.id and tti.tousseBarcode=b.barcode  " +
 						"join TousseTransitionRecord ttr on ttr.id=tti.tousseTransitionRecordId  " +
 						"where ri.urgentAmount > 0  " +
+						"and (ti.isTerminated is null or ti.isTerminated<>1) " +
 						"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) " +
@@ -17601,6 +17606,7 @@
 						"join TousseTransitionRecord ttr on ttr.id=tti.tousseTransitionRecordId  " +
 						"join PackingTask pt on pt.sourceId=rr.id and pt.tousseDefinition_id=ri.tousseDefinitionId  " +
 						"where ri.urgentAmount > 0  " +
+						"and (ti.isTerminated is null or ti.isTerminated<>1) " +
 						"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 in (select sourceRecyclingItemId from TousseInstance where sourceRecyclingItemId is not null) " +
@@ -17620,6 +17626,7 @@
 						"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.isTerminated is null or ti.isTerminated<>1) " +
 						"and b.barcode not in (select tti.tousseBarcode from TousseTransitionItem tti where tti.tousseBarcode is not null) " +
 						"and tit2.isUrgentTousse='是' " +
 						"union all " +
@@ -17635,6 +17642,7 @@
 						"join WashTransitionItem wti on wti.tousseDefinitionId=ri.tousseDefinitionId and b.barcode=wti.tousseBarcode " +
 						"join WashTransitionRecord wtr on wtr.id=wti.washTransitionRecordId " +
 						"where ri.urgentAmount > 0 " +
+						"and (ti.isTerminated is null or ti.isTerminated<>1) " +
 						"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) " +
@@ -17651,6 +17659,7 @@
 						"join WashTransitionRecord wtr on wtr.id=wti.washTransitionRecordId " +
 						"join PackingTask pt on pt.sourceId=rr.id and pt.tousseDefinition_id=ri.tousseDefinitionId  " +
 						"where ri.urgentAmount > 0 " +
+						"and (ti.isTerminated is null or ti.isTerminated<>1) " +
 						"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 in (select sourceRecyclingItemId from TousseInstance where sourceRecyclingItemId is not null) " +
@@ -17668,6 +17677,7 @@
 						"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.isTerminated is null or ti.isTerminated<>1) " +
 						"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 tit2.isUrgentTousse='是' " +
@@ -17682,6 +17692,7 @@
 						"join TousseInstance tit on tit.tousseItemId=ti.id " +
 						"join barcodeDevice b on tit.id=b.id " +
 						"where ri.urgentAmount > 0 " +
+						"and (ti.isTerminated is null or ti.isTerminated<>1) " +
 						"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) " +
@@ -17697,6 +17708,7 @@
 						"join barcodeDevice b on tit.id=b.id " +
 						"join PackingTask pt on pt.sourceId=rr.id and pt.tousseDefinition_id=ri.tousseDefinitionId " +
 						"where ri.urgentAmount > 0 " +
+						"and (ti.isTerminated is null or ti.isTerminated<>1) " +
 						"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) " +
@@ -17713,6 +17725,7 @@
 						"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.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 tit2.isUrgentTousse='是' " +
 						"union all " +
@@ -17724,6 +17737,7 @@
 						"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 " +
 						"where ri.urgentAmount > 0 " +
+						"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) " +
 						"union all " +
@@ -17735,6 +17749,7 @@
 						"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.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 in (select sourceRecyclingItemId from TousseInstance where sourceRecyclingItemId is not null) " +
 					") temp where 1=1 " + betweenSql + tousseNameSql + whereSqlForOrgUnitCoding + " order by temp.回收时间"