Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r24474 -r24499 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 24474) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 24499) @@ -12479,9 +12479,9 @@ //装配数量(按包统计) sql += " union all "; - sql += String.format("select 'packing' as type,pr.tousseName,sum(pr.amount),pr.tousseType from PackingRecord pr,TousseDefinition ti " + sql += String.format("select 'packing' as type,ti.name tousseName,sum(pr.amount),ti.tousseType from PackingRecord pr,TousseDefinition ti " +" where pr.tousseDefinitionId=ti.id %s %s %s and pr.orgUnitCoding = '%s' and pr.packTime between %s and %s " - + "%s %s group by pr.tousseType,pr.tousseName ", + + "%s %s group by ti.tousseType,ti.name ", isDisableIDCardSql,taskGroupSql,tousseGroupSql, departCoding,startDateSql,endDateSql,getAndSql("pr.packer", operator),tousseTypeSql);