Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r33738 -r33739 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 33738) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 33739) @@ -8802,7 +8802,7 @@ + ") tl "); //统计处理科室为【大院供应室】装配任务组为【外来器械班】处理的【外来器械包】和【外来器械拆分小包】【装配】的【包数】X 1 params.tousseTypeAndPackageSizeSql = " and tdc.tousseType in('"+ TousseDefinition.PACKAGE_TYPE_FOREIGN +"','"+ TousseDefinition.PACKAGE_TYPE_SPLIT +"') "; - params.tousseTypes = TousseDefinition.PACKAGE_TYPE_DISINFECTION; + params.tousseTypes = TousseDefinition.PACKAGE_TYPE_FOREIGN; params.taskGroupSqlWithAliasOfTousseDefinitionIsTd = " and tdc.taskGroup='外来器械班' "; sql += String.format(" union all select 9 orderNumber,'外来器械' firstColumnName ,'外来器械装配包数' secondColumnName,sum(tl.amount) amount from (" +dataIndex.getWorkAmountByPackageSQL("配包数量", params)