=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java 2014-01-14 10:15:25 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java 2014-01-14 10:18:00 +0000 @@ -529,6 +529,12 @@ Event event = new Event(); event.setEvent( programStageInstance.getUid() ); + + if ( programStageInstance.getProgramInstance().getPatient() != null ) + { + event.setPerson( programStageInstance.getProgramInstance().getPatient().getUid() ); + } + event.setStatus( EventStatus.fromInt( programStageInstance.getStatus() ) ); event.setEventDate( programStageInstance.getExecutionDate().toString() ); event.setStoredBy( programStageInstance.getCompletedUser() );