Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r22691 -r22749 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 22691) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 22749) @@ -6539,6 +6539,7 @@ + dateQueryAdapter.dateAdapter(queryYear) + " and t.operationTime <= " + dateQueryAdapter.dateAdapter(nextYear) + +" and t.orgUnitCoding = '" + querySupplyRoom + "'" + " and d.toussetype = '" + TousseDefinition.PACKAGE_TYPE_DRESSING + "'" + " group by " + dateQueryAdapter.dateConverAdapter3("t.operationTime","mm"); @@ -6741,6 +6742,7 @@ + dateQueryAdapter.dateAdapter(queryYear) + " and t.operationTime <= " + dateQueryAdapter.dateAdapter(nextYear) + +" and t.orgUnitCoding = '" + querySupplyRoom + "'" + " group by " + dateQueryAdapter.dateConverAdapter3("t.operationTime","mm"); ResultSet result = objectDao.executeSql(sql); bean.setRowNum(list.size()+1); @@ -6817,6 +6819,7 @@ String sql ="select " + dateQueryAdapter.dateConverAdapter3("t.operationTime","mm") + " monthstr, sum(mi.count) from tousseinstance t,TousseDefinition td,MaterialInstance mi " +" where t.tousseDefinition_id = td.id " + +" and t.orgUnitCoding = '" + querySupplyRoom + "'" +" and td.id = mi.tousse_id and t.operationTime >= " + dateQueryAdapter.dateAdapter(queryYear) + " and t.operationTime <= "