=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java' --- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java 2013-06-21 12:46:21 +0000 +++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java 2013-07-23 03:14:03 +0000 @@ -396,12 +396,18 @@ { for ( PatientIdentifier identifier : identifiers ) { - if ( identifier.getIdentifierType().equals( identifierType ) ) + if ( identifier.getIdentifierType() != null && identifier.getIdentifierType().equals( identifierType ) ) { grid.addRow(); grid.addValue( identifierType.getDisplayName() ); grid.addValue( identifier.getIdentifier() ); } + else if ( identifier.getIdentifierType() == null ) + { + grid.addRow(); + grid.addValue( i18n.getString( "system_identifier" )); + grid.addValue( identifier.getIdentifier() ); + } } } }