Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r24580 -r24581 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 24580) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 24581) @@ -12461,7 +12461,7 @@ //清洗数量(按材料统计) sql += " union all "; sql += String.format("select 'wash-material' as type,ti.tousseName,sum(ti.tousseAmount),ti.tousseType from (" - + "select td.name as tousseName,ci.amount * ms.count as tousseAmount,td.tousseType as tousseType," + + "select td.name as tousseName,ci.amount as tousseAmount,td.tousseType as tousseType," + "case when (cb.personInCharge is null or cb.personInCharge = '') then wdr.operator else cb.personInCharge end userName " + "from WashAndDisinfectRecord wdr,ClassifyBasket_WashRecord cw,ClassifyBasket cb,ClassifiedItem ci,tousseDefinition td,materialInstance ms " + "where wdr.id = cw.WashAndDisinfectRecord_ID and cw.ClassifyBasket_ID = cb.id and cb.id = ci.classifybasket_id and ci.toussedefinition_id=ms.tousse_id "