Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r33736 -r33737 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 33736) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 33737) @@ -8695,7 +8695,7 @@ +dataIndex.getWorkAmountByPackageSQL("灭菌数量", params) + ") tl "); ResultSet rs = null; - //1.统计处理科室为【大院供应室】装配任务组为【器械一班】器械包种类为【小手术包B类】的复用物品【回收】的【包数】 + //1.统计处理科室为【大院供应室】装配任务组为【器械一班】器械包种类为【器械一班小手术包B类】的复用物品【回收】的【包数】 //2.统计处理科室为【大院供应室】装配任务组为【器械二班】器械包种类为【器械二班包皮包B类】的复用物品【回收】的【包数】 //取数为两者总和 X 5 sql += " union all "; @@ -8707,7 +8707,7 @@ + "and rr.orgUnitCoding='" + orgUnitCoding + "' " - + getInstrumentSetTypeSql("小手术包B类","in"); + + getInstrumentSetTypeSql("器械一班小手术包B类","in"); sql += " union all select ri.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 "