Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r26607 -r26610 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 26607) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 26610) @@ -9852,12 +9852,14 @@ Integer washUnqualifiedAmount = nameAndAmount.get(materialName); JSONObject mdJson = mdsJson.get(materialName); String type = UNDEFINED_TYPE; - if(mdJson != null){ - type = mdJson.getString("type"); + if(mdsJson != null){ + String typeOfJson = mdJson.optString("type"); + if(StringUtils.isNotBlank(typeOfJson)){//材料类型未定义的话,设为未设置 + type = typeOfJson; + } }else{ logger.debug("材料定义未找到,materialName = " + materialName + ", amount = " + washUnqualifiedAmount); } - Integer oldAmount = monitoringMap.get(type); if(oldAmount == null){ oldAmount = 0;