------------------------------------------------------------
revno: 13714
committer: Morten Olav Hansen <morte...@gmail.com>
branch nick: dhis2
timestamp: Tue 2014-01-14 17:18:00 +0700
message:
event: if patient is not null, include patient uid in event.person
modified:
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== 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() );
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
