=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetPatientProgramListAction.java' --- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetPatientProgramListAction.java 2013-03-15 08:55:20 +0000 +++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetPatientProgramListAction.java 2013-03-18 09:30:19 +0000 @@ -306,7 +306,14 @@ for ( Program program : programService.getPrograms( patient.getOrganisationUnit() ) ) { - if ( (program.isSingleEvent() && program.isRegistration()) || !program.isSingleEvent() ) + if ( program.isSingleEvent() && program.isRegistration() ) + { + if ( programInstanceService.getProgramInstances( patient, program ).size() == 0 ) + { + programs.add( program ); + } + } + else if ( !program.isSingleEvent() ) { if ( programInstanceService.getProgramInstances( patient, program, false ).size() == 0 ) {