Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/SterilizingStoveUseCountReportHelper.java =================================================================== diff -u -r37824 -r37825 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/SterilizingStoveUseCountReportHelper.java (.../SterilizingStoveUseCountReportHelper.java) (revision 37824) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/SterilizingStoveUseCountReportHelper.java (.../SterilizingStoveUseCountReportHelper.java) (revision 37825) @@ -82,12 +82,12 @@ Map departMap = new HashMap(); for (String name : names) { SterilizingStove_child ssc = successMap.get(name); - if(ssc == null && failureMap.get(name) != null){ + if(ssc == null && failureMap.containsKey(name)){ ssc = failureMap.get(name); ssc.setSuccessCount(0); ssc.setSuccessEmptyFurnaceCount(0); } - if(ssc == null && interruptMap.get(name) != null){ + if(ssc == null && interruptMap.containsKey(name)){ ssc = interruptMap.get(name); ssc.setSuccessCount(0); ssc.setSuccessEmptyFurnaceCount(0); @@ -101,13 +101,13 @@ sterilizingStove.setDepartName(ssc.getDepartName()); departMap.put(department, sterilizingStove); } - if(failureMap.get(name) != null){ + if(failureMap != null && failureMap.containsKey(name)){ ssc.setFailureCount(failureMap.get(name).getFailureCount()); ssc.setFailureEmptyFurnaceCount(failureMap.get(name).getFailureEmptyFurnaceCount()); }else{ ssc.setFailureCount(0); } - if(interruptMap != null && interruptMap.get(name) != null){ + if(interruptMap != null && interruptMap.containsKey(name)){ ssc.setInterruptCount(interruptMap.get(name).getInterruptCount()); }else{ ssc.setInterruptCount(0);