Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r35739 -r35740 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 35739) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 35740) @@ -7526,17 +7526,12 @@ totalPriceDiscount += dmi.getSettlementDiscountPrice(); } list.removeAll(removeItems); - Iterator itr2 = tmpMap.keySet().iterator(); - while(itr2.hasNext()){ - String key = itr2.next(); - DepartmentMonthDetailItem dmi = tmpMap.get(key); - list.add(dmi); + if(tmpMap.size() > 0){ + list.addAll(tmpMap.values()); } - Iterator itr3 = disposableGoodsTempMap.keySet().iterator(); - while(itr2.hasNext()){ - String key = itr3.next(); - DepartmentMonthDetailItem dmi = disposableGoodsTempMap.get(key); - list.add(dmi); + + if(disposableGoodsTempMap.size() > 0){ + list.addAll(disposableGoodsTempMap.values()); } DepartmentMonthDetail detail = new DepartmentMonthDetail(); String[] departs = departKey.split(";_;");