=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java' --- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java 2012-05-30 15:51:44 +0000 +++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java 2012-06-06 13:44:00 +0000 @@ -320,19 +320,19 @@ for ( Integer key : identifierKeys.keySet() ) { - sql += operator + "identifier_" + key + identifierKeys.get( key ) + ","; + sql += operator + "identifier_" + key + identifierKeys.get( key ) + " "; operator = "and "; } for ( Integer key : attributeKeys.keySet() ) { - sql += operator + "attribute_" + key + attributeKeys.get( key ) + ","; + sql += operator + "attribute_" + key + attributeKeys.get( key ) + " "; operator = "and "; } for ( Integer key : dataElementKeys.keySet() ) { - sql += operator + "element_" + key + dataElementKeys.get( key ) + ","; + sql += operator + "element_" + key + dataElementKeys.get( key ) + " "; operator = "and "; } === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GenerateTabularReportAction.java' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GenerateTabularReportAction.java 2012-05-29 07:37:37 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GenerateTabularReportAction.java 2012-06-06 13:44:00 +0000 @@ -347,6 +347,8 @@ searchingDEKeys, organisationUnits, level, startValue, endValue, !orderByOrgunitAsc, null, null ); } +System.out.println(); +System.out.println(grid); return type == null ? SUCCESS : type; }