=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/DefaultEventStore.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/DefaultEventStore.java 2013-09-25 11:22:43 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/DefaultEventStore.java 2013-11-14 10:45:28 +0000 @@ -118,6 +118,7 @@ event = new Event(); event.setEvent( rowSet.getString( "psi_uid" ) ); + event.setPerson( rowSet.getString( "ps_person" ) ); event.setStatus( EventStatus.fromInt( rowSet.getInt( "psi_status" ) ) ); event.setProgram( rowSet.getString( "p_uid" ) ); event.setProgramStage( rowSet.getString( "ps_uid" ) ); @@ -142,7 +143,7 @@ private String buildSql( List programIds, List programStageIds, List orgUnitIds, Date startDate, Date endDate ) { - String sql = "select p.uid as p_uid, ps.uid as ps_uid, psi.uid as psi_uid, psi.status as psi_status, ou.uid as ou_uid, psi.executiondate as psi_executiondate," + + String sql = "select p.uid as p_uid, ps.uid as ps_uid, ps.patientid as ps_person, psi.uid as psi_uid, psi.status as psi_status, ou.uid as ou_uid, psi.executiondate as psi_executiondate," + " psi.completeduser as psi_completeduser," + " pdv.value as pdv_value, pdv.storedby as pdv_storedby, pdv.providedelsewhere as pdv_providedelsewhere, de.uid as de_uid" + " from program p" +