Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/DataIndex.java =================================================================== diff -u -r25285 -r25287 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/DataIndex.java (.../DataIndex.java) (revision 25285) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/DataIndex.java (.../DataIndex.java) (revision 25287) @@ -342,14 +342,10 @@ amountSql += String .format("select case when (cb.personInCharge is null or cb.personInCharge = '') then wr.operator else cb.personInCharge end userName,ci.amount amount,ci.tousseNameForMaterial tousseName,'材料' tousseType " + getWashMaterialAmountSqlFromItemTypeIsMaterialWithoutTousseDefinition() - + " and wr.endDate %s %s and wr.washMaterialAmount <> 0 %s %s %s %s ", + + " and wr.endDate %s %s and wr.washMaterialAmount <> 0 ", obj.betweenSql, SqlUtils.get_InSql_Extra("wr.orgUnitCoding", - obj.querySupplyRoom), - obj.isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd, - obj.taskGroupSqlWithAliasOfTousseDefinitionIsTd, - obj.tousseGroupSqlWithAliasOfTousseDefinitionIsTd, - obj.tousseTypeAndPackageSizeSql); + obj.querySupplyRoom)); // 统计清洗项的itemType不为材料的物品,包括整包清洗的器械包 amountSql += " union all ";