Index: ssts-web/src/main/webapp/jasperRtp/QualityMonitoringReport.jrxml =================================================================== diff -u -r29546 -r29547 --- ssts-web/src/main/webapp/jasperRtp/QualityMonitoringReport.jrxml (.../QualityMonitoringReport.jrxml) (revision 29546) +++ ssts-web/src/main/webapp/jasperRtp/QualityMonitoringReport.jrxml (.../QualityMonitoringReport.jrxml) (revision 29547) @@ -104,35 +104,35 @@ - + - + - + - + - + Index: ssts-web/src/main/webapp/jasperRtp/QualityMonitoringReport.jasper =================================================================== diff -u -r29546 -r29547 Binary files differ Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r29546 -r29547 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 29546) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 29547) @@ -14498,16 +14498,6 @@ } } } - ResultSet amountRs = null; - MonitoringItemBean bean = new MonitoringItemBean(); - bean.setGoodsName(""); - bean.setDateTime("汇总"); - bean.setOrderNumber(orderNumber); - bean.setOption(option); - bean.setQuestionName(questionName); - bean.setAmount(totalAmount); - bean.setPositionMsg(""); - list.add(bean); Integer tousseAmoutSum = amoutSumJson.optInt("tousseAmoutSum"); Integer forgonAmoutSum = amoutSumJson.optInt("forgonAmoutSum"); if(tousseAmoutSum != null && tousseAmoutSum > 0){