Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/MaterialErrorDamageReportHelper.java =================================================================== diff -u -r41504 -r41527 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/MaterialErrorDamageReportHelper.java (.../MaterialErrorDamageReportHelper.java) (revision 41504) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/MaterialErrorDamageReportHelper.java (.../MaterialErrorDamageReportHelper.java) (revision 41527) @@ -141,6 +141,7 @@ + (enableInstrumentLossReportErrorTypeMode?",medd.errorType ":"") + "from MaterialErrorDamageDetail medd " + "where medd.materialName<>'器械包标识牌' and medd.type='%s' %s %s %s " + + (StringUtils.isNotBlank(errorType) && !errorType.contains("全部")?" and medd.errorType='"+ errorType +"' ":StringUtils.EMPTY) + "group by medd.departCode,medd.depart,medd.materialName,medd.materialCost" + (enableInstrumentLossReportErrorTypeMode?",medd.errorType ":"") + " order by medd.materialName",