Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r33735 -r33736 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 33735) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 33736) @@ -8617,7 +8617,7 @@ + "and rr.recyclingTime " + betweenSql + getInstrumentSetTypeSql("临床各类包","in") - + getInstrumentSetTypeSql("治疗包(长效)", "not in"); + + getInstrumentSetTypeSql("治疗包", "not in"); //统计处理科室为【大院供应室】装配任务组为【泡镊桶班】器械包种类为【治疗包】的复用物品【回收】的【包数】X 1 sql += " union all "; sql += "select 3 orderNumber, '临床各类包' firstColumnName ,'②泡镊桶班治疗包数' secondColumnName,sum(ri.amount) amount from RecyclingRecord rr " @@ -8678,7 +8678,7 @@ + ") tl "); //统计处理科室为【大院供应室】装配任务组为【器械二班】器械包种类为【临床各类包】的复用物品【回收】的【包数】 sql += " union all "; - sql += "select 3 orderNumber, '临床各类包' firstColumnName ,'⑦器械二班' secondColumnName,sum(ri.amount)*2 amount from RecyclingRecord rr " + sql += "select 3 orderNumber, '临床各类包' firstColumnName ,'⑦器械二班' secondColumnName,sum(ri.amount) amount from RecyclingRecord rr " + "join RecyclingItem ri on ri.recyclingRecord_id=rr.id " + "join TousseDefinition td on td.id=ri.tousseDefinitionId join TousseDefinition tdc on tdc.id=td.ancestorID " + "where tdc.taskGroup='器械二班' and rr.recyclingTime "