Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r17791 -r17794 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 17791) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 17794) @@ -9405,16 +9405,16 @@ titleColumnNumMap.put("普通器械", clounmNum++); titleColumnNumMap.put("手术器械", clounmNum++); titleColumnNumMap.put("外来器械", clounmNum++); - titleColumnNumMap.put("清洗总数", clounmNum++); - titleColumnNumMap.put("不合格数", clounmNum++); - titleColumnNumMap.put("不合格率", clounmNum++); titleColumnNumMap.put("消毒物品", clounmNum++); titleColumnNumMap.put("外来器械二次清洗", clounmNum++); if(map != null && !map.isEmpty()){ for(String key : map.keySet()){ titleColumnNumMap.put(key, clounmNum++); } } + titleColumnNumMap.put("清洗总数", clounmNum++); + titleColumnNumMap.put("不合格数", clounmNum++); + titleColumnNumMap.put("不合格率", clounmNum++); List ctBeanList = new ArrayList(); for(WashWorkload_main main : list){ getWashWorkloadChildList(main.getS_DATE(),main.getE_DATE(),querySupplyRoom,ctBeanList,titleColumnNumMap);