Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r15147 -r15258 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 15147) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 15258) @@ -11229,11 +11229,15 @@ data.setAmount(amount); data.setColumnNum(1); data.setDayOfMonth(statDate); - data.setMaterialType(materialType); Integer washUnqualifiedAmount = monitoringMap.get(materialType); if(washUnqualifiedAmount == null){ washUnqualifiedAmount = 0; } + if(StringUtils.isBlank(materialType)){ + materialType = "未配置"; + data.setColumnNum(2); + } + data.setMaterialType(materialType); totalUnqualifiedAmount += washUnqualifiedAmount; data.setWashUnqualifiedAmount(washUnqualifiedAmount); data.setWashUnqualifiedPercentage(MathTools.divide(washUnqualifiedAmount, amount, 4));