Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReportsOfZsyy.java =================================================================== diff -u -r27331 -r27610 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReportsOfZsyy.java (.../CustomReportsOfZsyy.java) (revision 27331) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReportsOfZsyy.java (.../CustomReportsOfZsyy.java) (revision 27610) @@ -509,7 +509,7 @@ if (dataSoureOfMaterialsCountOfToussesInReports == 3) { columnOneOrThree = "ritem.amount*ritem.materialAmount"; joinOne = " join TousseDefinition td on td.id=ritem.tousseDefinitionId and td.forDisplay=1 and( td.tousseGroupName is null or td.tousseGroupName != '专科')"; - columnTwo = "(cit.amount-case when numOfUnwashedStops is null then 0 else numOfUnwashedStops end)*ritem.materialAmount"; + columnTwo = "(cit.amount-case when numOfUnwashedStops is null then 0 else numOfUnwashedStops end)*cit.materialAmount"; joinTwo = " join TousseDefinition td on td.id=cit.tousseDefinitionID and td.forDisplay=1 and td.tousseGroupName = '专科' "; joinThree = ""; } else {