Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r33037 -r33041 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 33037) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 33041) @@ -5571,6 +5571,8 @@ supplyRoomDiposableGoodsFilterSql += " and rri.materialDefinition_id in (select id from MaterialDefinition) "; }else if(typeSearch.contains("一次性物品")){ supplyRoomDiposableGoodsFilterSql += " and rri.type = '一次性物品' "; + }else if(!typeSearch.contains(TYPE_AUTO_DEDUCTION)){ + supplyRoomDiposableGoodsFilterSql += " and 1=2 "; } if(typeSearch.contains("器械材料") && typeSearch.contains(MaterialDefinition.TYPE_EXPENSIVEMATERIALGOODS) ){