Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r33745 -r33747 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 33745) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 33747) @@ -8808,10 +8808,10 @@ sql += String.format(" union all select 9 orderNumber,'外来器械' firstColumnName ,'外来器械装配包数' secondColumnName,sum(tl.amount) amount from (" +dataIndex.getWorkAmountByPackageSQL("配包数量", params) + ") tl "); - //统计处理科室为【大院供应室】装配任务组为【手术器械(麻一)】的复用物品【装配】的【包数】X 1 + //统计处理科室为【大院供应室】装配任务组为【手术器械(麻一)】的复用物品【装配】的【包数】X 1 params.tousseTypeAndPackageSizeSql = ""; params.tousseTypes = ""; - params.taskGroupSqlWithAliasOfTousseDefinitionIsTd = " and tdc.taskGroup='手术器械(麻一)' "; + params.taskGroupSqlWithAliasOfTousseDefinitionIsTd = " and tdc.taskGroup='手术器械(麻一)' "; sql += String.format(" union all select 10 orderNumber,'手术器械' firstColumnName ,'①大院手术室一区' secondColumnName,sum(tl.amount) amount from (" +dataIndex.getWorkAmountByPackageSQL("配包数量", params) + ") tl ");