Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java =================================================================== diff -u -r34202 -r34286 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 34202) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 34286) @@ -3254,10 +3254,11 @@ String sendDepart = StrutsParamUtils.getPraramValue("sendDepart", ""); String frequency = StrutsParamUtils.getPraramValue("frequency", ""); String tousseTypes = StrutsParamUtils.getPraramValue("tousseTypes", ""); + String tousseGroups = StrutsParamUtils.getPraramValue("tousseGroups", null); String tousseTypesSql = SqlUtils.getWhereSqlByfilterFieldAndStringValueAndSeparatorFilterAll("td.tousseType", tousseTypes, ","); String joinTousseDefinitionSql = null; - if(StringUtils.isNotBlank(tousseTypesSql)){ - joinTousseDefinitionSql = " join TousseDefinition td on td.id=ti.tousseDefinition_id "; + if(StringUtils.isNotBlank(tousseTypesSql) || StringUtils.isNotBlank(tousseGroups)){ + joinTousseDefinitionSql = " join TousseDefinition td on td.id=ti.tousseDefinition_id join TousseDefinition tdc on tdc.id=td.ancestorID "; }else{ joinTousseDefinitionSql = ""; } @@ -3314,6 +3315,9 @@ if(StringUtils.isNotBlank(frequency)){ sql += " and ti.sterileFrequency = '" + frequency + "'"; } + if (StringUtils.isNotBlank(tousseGroups)) { + sql += SqlUtils.getWhereSqlByfilterFieldAndStringValueAndSeparator("tdc.tousseGroupName", tousseGroups, ","); + } sql += endSql; ResultSet resultSet = objectDao.executeSql(sql); list = getSterilizationRecordBeanList(resultSet);