Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r32349 -r32391 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 32349) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 32391) @@ -15392,7 +15392,7 @@ Integer qmTousseAndMaterialAmount = 0; if(materialAndTousse){ sql = " select sum(t.aAmount) count,sum(t.bAmount) total from QualityMonitoringInstance qmi join FormInstance fi on qmi.id=fi.id join FormDefinition fd on fi.formDefinition_id=fd.id " - + " join QualityMonitoringDefinition qmdf on qmdf.id=fd.id join ( select qmi.id qid,sum(qmd.amount) aAmount,sum(case when qmd.material is null or qmd.material='' then 0 else qmd.amount end) bAmount from QualityMonitoringInstance qmi,QualityMonitoringGoods qmd where qmi.id=qmd.qualityMonitoringInstance_id " + + " join QualityMonitoringDefinition qmdf on qmdf.id=fd.id join ( select qmi.id qid,sum(case when qmd.tousseDefinitionId is not null and qmd.material is not null and qmd.material<>'' then qmd.amount-1 else qmd.amount end ) aAmount,sum(case when qmd.material is null or qmd.material='' then 0 else qmd.amount end) bAmount from QualityMonitoringInstance qmi,QualityMonitoringGoods qmd where qmi.id=qmd.qualityMonitoringInstance_id " + tousseNameSql + " group by qmi.id ) t on t.qid=qmi.id " + " where " + whereSql;