Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r33630 -r33634 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 33630) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 33634) @@ -7737,9 +7737,7 @@ + ",{ \"dataIndexNameForDisplay\": \"灭菌器使用炉次\", \"dataIndexSource\": \"灭菌器使用炉次\" }" + ",{ \"dataIndexNameForDisplay\": \"生物监测次数\", \"dataIndexSource\": \"生物监测次数\" }" + ",{ \"dataIndexNameForDisplay\": \"器械包发放数量\", \"dataIndexSource\": \"复用性物品发货数量\" }" - + ",{ \"dataIndexNameForDisplay\": \"一次性物品发放数量\", \"dataIndexSource\": \"一次性物品发放数量\" }" - + ",{ \"dataIndexNameForDisplay\": \"处理腔镜器械总件数\", \"dataIndexSource\": \"处理腔镜器械总件数(材料类型为腔镜)\" }" - + ",{ \"dataIndexNameForDisplay\": \"下收下送次数\", \"dataIndexSource\": \"下收下送次数(中六模式)\" }]"; + + ",{ \"dataIndexNameForDisplay\": \"一次性物品发放数量\", \"dataIndexSource\": \"一次性物品发放数量\" }]"; } Map numAndOrgUnitCode = new HashMap();//序号和核算月报科室编码map 可配多个科室 Set orgUnitCodes = new HashSet();//核算月报的科室编码 @@ -8462,13 +8460,14 @@ Integer amount8 = null; if(nextSendAmountMap.containsKey(month)){ amount8 = nextSendAmountMap.get(month); - amountTotalMap.put(dataIndexNameForDisplay, MathTools.add(amount8 - , amountTotalMap.get(dataIndexNameForDisplay)).intValue()); }else{ amount8 = 0; } //数量=查询出来的数量+月的天数*4(每天去4个科室,如果一月有30天就去了120次) - YearWorkloadBean bean8 = new YearWorkloadBean(i, yearMonth, num, dataIndexNameForDisplay, amount8 + clinicAmount*4); + amount8 = amount8 + clinicAmount*4; + YearWorkloadBean bean8 = new YearWorkloadBean(i, yearMonth, num, dataIndexNameForDisplay, amount8); + amountTotalMap.put(dataIndexNameForDisplay, MathTools.add(amount8 + , amountTotalMap.get(dataIndexNameForDisplay)).intValue()); list.add(bean8); } }