=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramStageInstanceService.java' --- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramStageInstanceService.java 2013-09-18 06:54:48 +0000 +++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramStageInstanceService.java 2013-09-23 11:10:10 +0000 @@ -651,6 +651,7 @@ PeriodType.clearTimeOfDay( today ); Date date = today.getTime(); + programStageInstance.setStatus( ProgramStageInstance.COMPLETED_STATUS ); programStageInstance.setCompletedDate( date ); programStageInstance.setCompletedUser( currentUserService.getCurrentUsername() ); @@ -659,6 +660,7 @@ // --------------------------------------------------------------------- List outboundSms = programStageInstance.getOutboundSms(); + if ( outboundSms == null ) { outboundSms = new ArrayList(); @@ -671,6 +673,7 @@ // --------------------------------------------------------------------- List messageConversations = programStageInstance.getMessageConversations(); + if ( messageConversations == null ) { messageConversations = new ArrayList(); @@ -678,7 +681,7 @@ messageConversations.addAll( sendMessageConversations( programStageInstance, PatientReminder.SEND_WHEN_TO_C0MPLETED_EVENT, format ) ); - + // --------------------------------------------------------------------- // Update the event // ---------------------------------------------------------------------