Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r15710 -r15711 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 15710) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 15711) @@ -9654,13 +9654,17 @@ } //灭菌的数量(按器械包算) - String sql5 = "select i.tousseName,count(*) from SterilizationRecord r, tousseInstance i" - + " where r.id = i.sterilizationRecord_id and i.orgUnitCoding = '"+departCoding - + "' and r.endDate between "+dateQueryAdapter.dateConverAdapter2(startTime,"yyyy-mm-dd HH24:MI:SS") - + " and "+dateQueryAdapter.dateConverAdapter2(endTime,"yyyy-mm-dd HH24:MI:SS") - + " group by i.tousseName" - + (optionSqlArray.length == 0 ? " having i.tousseName in('')" : createInFilterSql("i.tousseName", optionSqlArray)) - ; + String sql5 = + "select i.tousseName," + + "count(*) " + + "from SterilizationRecord r," + + "tousseInstance i " + + "where r.id=i.sterilizationRecord_id " + + "and i.orgUnitCoding='"+departCoding+"' " + + "and r.endDate between "+dateQueryAdapter.dateConverAdapter2(startTime,"yyyy-mm-dd HH24:MI:SS")+" and "+dateQueryAdapter.dateConverAdapter2(endTime,"yyyy-mm-dd HH24:MI:SS")+" " + + "group by i.tousseName " + + (optionSqlArray.length == 0 ? " having i.tousseName in('')" : createInFilterSql("i.tousseName", optionSqlArray)) + ; ResultSet result5 = objectDao.executeSql(sql5); try { @@ -9669,6 +9673,11 @@ int tousseAmount = result5.getInt(2); TousseDeliverDetailVO vo = voMap.get(tousseName); + if(vo == null){ + vo = new TousseDeliverDetailVO(); + vo.setTousseName(tousseName); + voMap.put(tousseName, vo); + } vo.setSterilizationAmount(tousseAmount); } } catch (SQLException e) {