Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js =================================================================== diff -u -r14888 -r15047 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js (.../departmentMonthlyDetailDSInvoiceItemView.js) (revision 14888) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js (.../departmentMonthlyDetailDSInvoiceItemView.js) (revision 15047) @@ -76,7 +76,7 @@ var tousseTypeStore = new Ext.data.SimpleStore( { fields : ['value'], - data : [ ['全部'],['全部器械包'],['器械包'],['消毒物品'],['外来器械包'],['自定义器械包'],['外部代理灭菌包'],['一次性物品'],['器械材料'],['高值耗材'] ] + data : [ ['全部'],['全部器械包'],['器械包'],['敷料包'],['消毒物品'],['外来器械包'],['自定义器械包'],['外部代理灭菌包'],['一次性物品'],['器械材料'],['高值耗材'] ] }); var goodsTypeStore = new Ext.data.SimpleStore( { Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r15043 -r15047 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 15043) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 15047) @@ -4566,6 +4566,13 @@ returnGoodsFilterSql += " and rr.type = '器械包'"; supplyRoomDiposableGoodsFilterSql += " and 1=2"; outEntryFilterSql += " and 1=2"; + }else if("敷料包".equals(typeSearch)){ + typeFilterSql = " and ii.tousseType = '" + + TousseDefinition.PACKAGE_TYPE_DRESSING + + "'"; + returnGoodsFilterSql += " and rr.type = '敷料包'"; + supplyRoomDiposableGoodsFilterSql += " and 1=2"; + outEntryFilterSql += " and 1=2"; } else if ("消毒物品".equals(typeSearch)) { typeFilterSql = " and ii.tousseType = '" + TousseDefinition.PACKAGE_TYPE_DISINFECTION