BAH-3449 | Refactored. Medication to send drug name and encounter dat…

…e time (#127)

* BAH-3449 | Add. code text as drug name

* BAH-3449 | Pass encounter date time instead of visit time

omod/src/main/java/org/bahmni/module/hip/web/model/FhirPrescription.java

@@ -46,7 +46,7 @@ private FhirPrescription(Date visitTimeStamp, Integer encounterID, Encounter enc
     }
 
     public static FhirPrescription from(OpenMrsPrescription openMrsPrescription, FHIRResourceMapper fhirResourceMapper, OmrsObsDocumentTransformer documentTransformer) {
-        Date encounterDatetime = openMrsPrescription.getEncounter().getVisit().getStartDatetime();
+        Date encounterDatetime = openMrsPrescription.getEncounter().getEncounterDatetime();
         Integer encounterId = openMrsPrescription.getEncounter().getId();
         Patient patient = fhirResourceMapper.mapToPatient(openMrsPrescription.getPatient());
         Reference patientReference = FHIRUtils.getReferenceToResource(patient);

omod/src/main/java/org/bahmni/module/hip/web/service/FHIRResourceMapper.java

@@ -359,7 +359,9 @@ public Medication mapToMedication(DrugOrder order) {
         if (order.getDrug() == null) {
             return null;
         }
-        return medicationTranslator.toFhirResource(order.getDrug());
+        Medication medication = medicationTranslator.toFhirResource(order.getDrug());
+        medication.getCode().setText(order.getDrug().getName());
+        return medication;
     }
 
     public static <T> T initializeEntityAndUnproxy(T entity) {