Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/SupplyRoomQualityQuotaHelper.java =================================================================== diff -u -r41162 -r41163 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/SupplyRoomQualityQuotaHelper.java (.../SupplyRoomQualityQuotaHelper.java) (revision 41162) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/SupplyRoomQualityQuotaHelper.java (.../SupplyRoomQualityQuotaHelper.java) (revision 41163) @@ -2597,7 +2597,7 @@ if(tousse){ sql.append(" dateTime,count(*) amount from "); }else{ - sql.append(" dateTime,sum(fotg.amount) amount from "); + sql.append(" dateTime,sum(fomg.amount) amount from "); } }else{ sql.append(" dateTime,sum(qmg.amount) amount from "); @@ -2614,9 +2614,9 @@ sql.append(" join " + FormInstanceItem.class.getSimpleName() +" fii on fii.formInstance_id=fi.id " + " join " + FormInstanceOptionValue.class.getSimpleName() +" fiov on fiov.formInstanceItem_id=fii.id "); if(tousse){ - sql.append(" join "+ FormOptionMaterialGoods.class.getSimpleName() +" fomg on fomg.formOptionValue_id=fiov.id "); - }else{ sql.append(" join "+ FormOptionTousseGoods.class.getSimpleName() +" fotg on fotg.formOptionValue_id=fiov.id "); + }else{ + sql.append(" join "+ FormOptionMaterialGoods.class.getSimpleName() +" fomg on fomg.formOptionValue_id=fiov.id "); } } sql.append(" where fd.formType = '");