Downloads Documentation Community
Contribute
Contribute Demo






Show Sidebar
Login | Register


Show
Ignore:
Timestamp:
08/06/08 17:17:55 (5 months ago)
Author:
mseaton
Message:

synchronization_bidirectional_branch: merge from [4734] to [5181].

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/api/EncounterService.java

    r4969 r5183  
    5454        @Authorized( { OpenmrsConstants.PRIV_ADD_ENCOUNTERS, 
    5555                OpenmrsConstants.PRIV_EDIT_ENCOUNTERS }) 
    56         public void saveEncounter(Encounter encounter) throws APIException; 
     56        public Encounter saveEncounter(Encounter encounter) throws APIException; 
    5757 
    5858        /** 
    …… 
    129129         */ 
    130130        @Authorized( { OpenmrsConstants.PRIV_EDIT_ENCOUNTERS }) 
    131         public void voidEncounter(Encounter encounter, String reason); 
     131        public Encounter voidEncounter(Encounter encounter, String reason); 
    132132 
    133133        /** 
    …… 
    137137         */ 
    138138        @Authorized( { OpenmrsConstants.PRIV_EDIT_ENCOUNTERS }) 
    139         public void unvoidEncounter(Encounter encounter) throws APIException; 
     139        public Encounter unvoidEncounter(Encounter encounter) throws APIException; 
    140140 
    141141        /** 
    …… 
    169169         */ 
    170170        @Authorized( { OpenmrsConstants.PRIV_MANAGE_ENCOUNTER_TYPES }) 
    171         public void saveEncounterType(EncounterType encounterType); 
     171        public EncounterType saveEncounterType(EncounterType encounterType); 
    172172 
    173173        /** 
    …… 
    246246         */ 
    247247        @Authorized( { OpenmrsConstants.PRIV_MANAGE_ENCOUNTER_TYPES }) 
    248         public void retireEncounterType(EncounterType encounterType, String reason) 
     248        public EncounterType retireEncounterType(EncounterType encounterType, String reason) 
    249249                throws APIException; 
    250250 
    …… 
    257257         */ 
    258258        @Authorized( { OpenmrsConstants.PRIV_MANAGE_ENCOUNTER_TYPES }) 
    259         public void unretireEncounterType(EncounterType encounterType) 
     259        public EncounterType unretireEncounterType(EncounterType encounterType) 
    260260                throws APIException; 
    261261