=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/SearchPatientAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/SearchPatientAction.java 2010-09-24 09:50:39 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/SearchPatientAction.java 2010-09-27 09:48:06 +0000 @@ -312,14 +312,14 @@ //System.out.println(" searchingAttributeId != null && searchText != null "); patients = patientAttributeValueService.searchPatientAttributeValue( patientAttribute, searchText, pagingUtil.getStartPos(), pagingUtil.getPageSize() ); - + if( patients != null && patients.size() > 0 ) { if(sortPatientAttributeId!=null && patientAttribute!=null) { patients = patientService.sortPatientsByAttribute(patients, patientAttribute); - System.out.println("\n\n\n 000 : " + patients); } + for( Patient patient : patients ) { mapRelationShip.put( patient.getId(), relationshipService.getRelationshipsForPatient( patient ) ); @@ -329,7 +329,7 @@ } } } - +System.out.println("\n patientAttributeValueService.searchPatientAttributeValue : " + patients); return SUCCESS; } === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/META-INF/dhis/beans.xml' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/META-INF/dhis/beans.xml 2010-09-25 10:03:31 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/META-INF/dhis/beans.xml 2010-09-27 09:48:06 +0000 @@ -365,6 +365,8 @@ scope="prototype"> + - + === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientIdentifierType.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientIdentifierType.vm 2010-09-27 07:33:12 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientIdentifierType.vm 2010-09-27 09:48:06 +0000 @@ -25,7 +25,7 @@ - +