Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r34213 -r34262 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 34213) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 34262) @@ -17157,7 +17157,7 @@ Set readIds = new HashSet(); for (MonitoringItemBean bean : list) { Long id = bean.getQualityMonitoringGoodsId(); - if(!readIds.contains(id)){ + if(!readIds.contains(id) && bean.getAmount() != null){ readIds.add(id); qmCount += bean.getAmount(); } @@ -18716,7 +18716,7 @@ amount = 0; } newMonitoringItem(list, registerMaterialAmount,amount,tousseName,materialName,qmiId,positionMsg, - dataStr, orderNum, "-",questionName, answer, frequency, sterilizerName, addMonitoringItemBeanOptionSingleResult,createUserName, qmdid, materialAmount); + dataStr, orderNum,questionName, "-", answer, frequency, sterilizerName, addMonitoringItemBeanOptionSingleResult,createUserName, qmdid, materialAmount); } if(lastMonitoringItemBean != null){ newMonitoringItem(list, lastMonitoringItemBean.getRegisterMaterialAmount(),lastMonitoringItemBean.getAmount(),