=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/RunValidationAction.java' --- dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/RunValidationAction.java 2013-11-10 10:00:19 +0000 +++ dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/RunValidationAction.java 2013-12-19 16:51:00 +0000 @@ -87,9 +87,9 @@ // Input/output // ------------------------------------------------------------------------- - private Integer organisationUnitId; + private String organisationUnitId; - public void setOrganisationUnitId( Integer organisationUnitId ) + public void setOrganisationUnitId( String organisationUnitId ) { this.organisationUnitId = organisationUnitId; } === modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/dataanalysis/MarkForFollowupAction.java' --- dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/dataanalysis/MarkForFollowupAction.java 2013-08-23 16:05:01 +0000 +++ dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/dataanalysis/MarkForFollowupAction.java 2013-12-19 16:51:00 +0000 @@ -144,7 +144,7 @@ OrganisationUnit source = organisationUnitService.getOrganisationUnit( sourceId ); DataElementCategoryOptionCombo categoryOptionCombo = categoryService.getDataElementCategoryOptionCombo( categoryOptionComboId ); - DataValue dataValue = dataValueService.getDataValue( source, dataElement, period, categoryOptionCombo ); + DataValue dataValue = dataValueService.getDataValue( dataElement, period, source, categoryOptionCombo ); if ( dataValue != null ) {