Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r17074 -r17097 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 17074) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 17097) @@ -7529,12 +7529,12 @@ String month = year + "-" + monthFormart; - // 处理手术器械总件数 ,数据统计为发货时科室是手术室,并且包装类型不包含纸塑,外来器械也不包括在内。 + // 处理手术器械总件数 ,数据统计为申请时科室是手术室,并且包装类型不包含纸塑,外来器械也不包括在内。 String sql = " select sum(tdc.amount) from Invoice i,TousseInstance ti,TousseDefinition td,(select td.name tdName, sum(mi.count) amount from MaterialInstance mi, tousseDefinition td " + " where mi.tousse_id=td.id and td.forDisplay=1 group by td.name) tdc " + " where i.id=ti.invoice_id and ti.tousseDefinition_id=td.id " + " and tdc.tdName = td.name " - + " and ti.orgUnitName = '手术室' " + + " and ti.depart = '手术室' " + " and td.packageType != '纸塑' and td.tousseType != '外来器械包' and td.tousseType != '外来器械拆分小包' " + " and td.tousseType != '消毒物品' and td.tousseType != '敷料包' " + " and td.name not like '%电钻%' and td.name not like '%呼吸管道%' "