Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r34376 -r34381 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 34376) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 34381) @@ -8810,7 +8810,7 @@ params.extraQuery = ""; params.tousseTypeAndPackageSizeSql = " and tdc.tousseType in('"+ TousseDefinition.PACKAGE_TYPE_FOREIGN +"','"+ TousseDefinition.PACKAGE_TYPE_SPLIT +"') "; params.tousseTypes = TousseDefinition.PACKAGE_TYPE_FOREIGN; - params.taskGroupSqlWithAliasOfTousseDefinitionIsTd = " and tdc.taskGroup='外来器械班' "; + params.taskGroupSqlWithAliasOfTousseDefinitionIsTd = " and td.taskGroup='外来器械班' "; sql += String.format(" union all select 9 orderNumber,'外来器械' firstColumnName ,'外来器械装配包数' secondColumnName,sum(tl.amount) amount from (" +dataIndex.getWorkAmountByPackageSQL("配包数量", params) + ") tl "); @@ -27534,7 +27534,7 @@ params.extraQuery = ""; params.tousseTypeAndPackageSizeSql = " and tdc.tousseType in('"+ TousseDefinition.PACKAGE_TYPE_FOREIGN +"','"+ TousseDefinition.PACKAGE_TYPE_SPLIT +"') "; params.tousseTypes = TousseDefinition.PACKAGE_TYPE_FOREIGN; - params.taskGroupSqlWithAliasOfTousseDefinitionIsTd = " and tdc.taskGroup='外来器械班' "; + params.taskGroupSqlWithAliasOfTousseDefinitionIsTd = " and td.taskGroup='外来器械班' "; sql += String.format(" union all select tl.depart,sum(tl.amount) amount from (" +dataIndex.getWorkAmountByPackageSQL("配包数量", params) + ") tl group by tl.depart ");