Neha | SHR-1365 | sending performer with procedure.

Author: nehashri

fhirmapper/src/main/java/org/openmrs/module/fhir/mapper/bundler/ProcedureMapper.java

@@ -8,6 +8,7 @@
 import ca.uhn.fhir.model.dstu2.composite.PeriodDt;
 import ca.uhn.fhir.model.dstu2.composite.ResourceReferenceDt;
 import ca.uhn.fhir.model.dstu2.resource.DiagnosticReport;
+import ca.uhn.fhir.model.dstu2.resource.Encounter;
 import ca.uhn.fhir.model.dstu2.resource.Observation;
 import ca.uhn.fhir.model.dstu2.resource.Procedure;
 import ca.uhn.fhir.model.dstu2.valueset.ObservationStatusEnum;
@@ -71,13 +72,23 @@ private List<FHIRResource> mapProcedure(Obs obs, FHIREncounter fhirEncounter, Sy
             procedure.setStatus(getProcedureStatus(compoundObservationProcedure));
             procedure.setNotes(getProcedureNotes(compoundObservationProcedure));
             procedure.setPerformed(getProcedurePeriod(compoundObservationProcedure));
+            setPerformers(fhirEncounter, procedure);
             addReportToProcedure(compoundObservationProcedure, fhirEncounter, systemProperties, procedure, resources);
             FHIRResource procedureResource = new FHIRResource("Procedure", procedure.getIdentifier(), procedure);
             resources.add(procedureResource);
         }
         return resources;
     }
 
+    private void setPerformers(FHIREncounter fhirEncounter, Procedure procedure) {
+        List<Encounter.Participant> participants = fhirEncounter.getEncounter().getParticipant();
+        for (Encounter.Participant participant : participants) {
+            Procedure.Performer performer = new Procedure.Performer();
+            performer.setActor(participant.getIndividual());
+            procedure.addPerformer(performer);
+        }
+    }
+
     private BoundCodeDt<ProcedureStatusEnum> getProcedureStatus(CompoundObservation procedure) {
         Obs procdureStatusObs = procedure.getMemberObsForConcept(omrsConceptLookup.findTRConceptOfType(TrValueSetType.PROCEDURE_STATUS));
         if (procdureStatusObs != null) {

fhirmapper/src/test/java/org/openmrs/module/fhir/mapper/bundler/ProcedureMapperIT.java

@@ -31,7 +31,9 @@
 import java.util.Date;
 import java.util.List;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 import static org.openmrs.module.fhir.MapperTestHelper.containsCoding;
 import static org.openmrs.module.fhir.MapperTestHelper.getSystemProperties;
 import static org.openmrs.module.fhir.TestFhirFeedHelper.getResourceByReference;
@@ -85,6 +87,10 @@ public void shouldMapPatientAndEncounter() {
         ResourceReferenceDt patient = new ResourceReferenceDt();
         patient.setReference("Hid");
         fhirEncounter.setPatient(patient);
+        Encounter.Participant participant = new Encounter.Participant();
+        ResourceReferenceDt resourceReferenceDt = new ResourceReferenceDt("10");
+        participant.setIndividual(resourceReferenceDt);
+        fhirEncounter.addParticipant(participant);
 
         List<FHIRResource> fhirResources = mapProcedure(1100, fhirEncounter);
         assertEquals(3, fhirResources.size());
@@ -93,6 +99,9 @@ public void shouldMapPatientAndEncounter() {
         assertEquals(patient, procedure.getSubject());
 
         assertEquals(fhirEncounter.getId().getValue(), procedure.getEncounter().getReference().getValue());
+
+        assertEquals(1, procedure.getPerformer().size());
+        assertEquals(resourceReferenceDt, procedure.getPerformer().get(0).getActor());
     }
 
     @Test