Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r34994 -r35009 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 34994) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 35009) @@ -21377,8 +21377,8 @@ "ri.tousseName '物品名称',ri.urgentLevel '加急类型',null '灭菌方式',null '器械包条码',null '标识牌条码' " + "from RecyclingRecord rr " + "join RecyclingItem ri on ri.recyclingRecord_id=rr.id " + + "left join TousseDefinition td on td.id=ri.tousseDefinitionId " + "left join TousseItem ti on ti.recyclingApplication_ID=rr.recyclingApplication_id and ti.tousseDefinitionId=ri.tousseDefinitionId " + - "left join TousseDefinition td on td.id=ti.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)) " + @@ -21390,8 +21390,8 @@ "ri.tousseName '物品名称',ri.urgentLevel '加急类型',null '灭菌方式',null '器械包条码',null '标识牌条码' " + "from RecyclingRecord rr " + "join RecyclingItem ri on ri.recyclingRecord_id=rr.id " + + "left join TousseDefinition td on td.id=ri.tousseDefinitionId " + "left join TousseItem ti on ti.recyclingApplication_ID=rr.recyclingApplication_id and ti.tousseDefinitionId=ri.tousseDefinitionId " + - "left join TousseDefinition td on td.id=ti.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) " +