=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/hibernate/HibernatePatientStore.java' --- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/hibernate/HibernatePatientStore.java 2012-08-01 08:49:36 +0000 +++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/hibernate/HibernatePatientStore.java 2012-08-02 10:32:32 +0000 @@ -318,7 +318,16 @@ else if ( keys[0].equals( Patient.PREFIX_IDENTIFIER_TYPE ) ) { patientWhere = patientOperator + "( ( lower( " + statementBuilder.getPatientFullName() + " ) like '%" + id - + "%' ) or lower(pi.identifier)='" + id + "') "; + + "%' ) or lower(pi.identifier)='" + id + "' "; + + String[] keyValues = id.split( " " ); + if( keyValues.length==2) + { + String otherId = keyValues[0] + " " + keyValues[1]; + patientWhere += " or lower( " + statementBuilder.getPatientFullName() + " ) like '%" + otherId + + "%' "; + } + patientWhere += ")"; patientOperator = " and "; hasIdentifier = true; }