Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r18371 -r18374 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 18371) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 18374) @@ -15760,6 +15760,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 tit2.isUrgentTousse='是' " + "union all " + //--2.使用记录转申请单后的预回收、回收、清洗交接 (排除装配的包实例数据) //--2.1 使用记录转申请单后的预回收、回收、清洗交接但还未装配的数据 @@ -15810,6 +15811,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 tit2.isUrgentTousse='是' " + "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.使用记录转申请单后的预回收、回收 (排除清洗交接与装配的包实例数据) @@ -15860,6 +15862,7 @@ "left join Sterilizer sz on sr.sterilizer_id=sz.id " + "where ri.urgentAmount > 0 " + "and b.barcode not in (select tti.tousseBarcode from TousseTransitionItem tti where tti.tousseBarcode is not null) " + + "and tit2.isUrgentTousse='是' " + "union all " + //--6.使用记录转申请单后的回收、清洗交接 (排除预回收与装配的包实例数据) //--6.1 使用记录转申请单后的回收、清洗交接、且未装配 @@ -15908,6 +15911,7 @@ "where ri.urgentAmount > 0 " + "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='是' " + "union all " + //--8.使用记录转申请单后的回收 (排除预回收、清洗交接与装配的包实例数据) //--8.1使用记录转申请单后的回收、查询未装配的数据 @@ -15951,6 +15955,7 @@ "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 tit2.isUrgentTousse='是' " + "union all " + //--10.手工添加回收(或添加申请单后的回收)后的回收 (排除预回收、装配的包实例数据、手工添加的不会做预回收,清洗交接没有意义)(全部装配+部分装配) //--10.1.手工添加回收(或添加申请单后的回收)后的回收,未装配的数据