Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r15743 -r15781 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 15743) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 15781) @@ -874,9 +874,7 @@ String nextYear = getNextYear(year) + " 00:00:00"; String invoiceSql = "select "+dateQueryAdapter.dateConverAdapter3("iv.sendTime","mm")+" as monthstr,sum(ii.amount) from InvoiceItem ii,Invoice iv " + " where ii.invoice_id = iv.id and ii.diposable='否' " - + " and ii.tousseType != '敷料包' " - + " and ii.tousseType != '外来器械包' " - + " and ii.tousseType != '消毒物品' " + + " and ii.tousseType = '器械包' " + " and iv.sendTime between "+dateQueryAdapter.dateAdapter(queryYear) + " and "+dateQueryAdapter.dateAdapter(nextYear) + " and iv.orgUnitCoding = '"+departCoding+"'" @@ -909,7 +907,6 @@ + " and ii.diposable='否' " + " and ii.tousseType != '敷料包' " + " and ii.tousseType != '外来器械包' " - + " and ii.tousseType != '消毒物品' " + " and iv.sendTime between "+dateQueryAdapter.dateAdapter(queryYear) + " and "+dateQueryAdapter.dateAdapter(nextYear) + " and iv.orgUnitCoding = '"+departCoding+"'"