Kavitha | refactored medication administration request and response

Bahmni · Dec 27, 2023 · 1dbad33 · 1dbad33
1 parent b8c4daa
commit 1dbad33
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 70 deletions.
diff --git a/omod/src/main/java/org/openmrs/module/ipd/contract/MedicationAdministrationRequestList.java b/omod/src/main/java/org/openmrs/module/ipd/contract/MedicationAdministrationRequestList.java
diff --git a/omod/src/main/java/org/openmrs/module/ipd/contract/MedicationAdministrationResponse.java b/omod/src/main/java/org/openmrs/module/ipd/contract/MedicationAdministrationResponse.java
@@ -26,7 +26,7 @@ public class MedicationAdministrationResponse {
     private List<MedicationAdministrationNoteResponse> notes;
     private String status;
     private String statusReason;
-    private String drugUuid;
+    private Object drug;
     private String dosingInstructions;
     private Double dose;
     private Object doseUnits;
@@ -43,7 +43,6 @@ public static MedicationAdministrationResponse createFrom(org.openmrs.module.ipd
         String patientUuid = openmrsMedicationAdministration.getPatient() != null ? openmrsMedicationAdministration.getPatient().getUuid() : null;
         String encounterUuid = openmrsMedicationAdministration.getEncounter() != null ? openmrsMedicationAdministration.getEncounter().getUuid() : null;
         String orderUuid = openmrsMedicationAdministration.getDrugOrder() != null ? openmrsMedicationAdministration.getDrugOrder().getUuid() : null;
-        String drugUuid = openmrsMedicationAdministration.getDrug() != null ? openmrsMedicationAdministration.getDrug().getUuid() : null;
 
         List<MedicationAdministrationPerformerResponse> providers = new java.util.ArrayList<>();
         if (openmrsMedicationAdministration.getPerformers() != null) {
@@ -67,7 +66,7 @@ public static MedicationAdministrationResponse createFrom(org.openmrs.module.ipd
                 .orderUuid(orderUuid)
                 .providers(providers)
                 .notes(notes)
-                .drugUuid(drugUuid)
+                .drug(ConversionUtil.convertToRepresentation(openmrsMedicationAdministration.getDrug(), Representation.REF))
                 .dosingInstructions(openmrsMedicationAdministration.getDosingInstructions())
                 .dose(openmrsMedicationAdministration.getDose())
                 .doseUnits(ConversionUtil.convertToRepresentation(openmrsMedicationAdministration.getDoseUnits(), Representation.REF))

diff --git a/omod/src/main/java/org/openmrs/module/ipd/contract/MedicationAdministrationResponseList.java b/omod/src/main/java/org/openmrs/module/ipd/contract/MedicationAdministrationResponseList.java
diff --git a/omod/src/main/java/org/openmrs/module/ipd/factory/MedicationAdministrationFactory.java b/omod/src/main/java/org/openmrs/module/ipd/factory/MedicationAdministrationFactory.java
@@ -77,40 +77,6 @@ public MedicationAdministration mapRequestToMedicationAdministration(MedicationA
         medicationAdministration.setRoute(Context.getConceptService().getConceptByUuid(request.getRouteUuid()));
         medicationAdministration.setSite(Context.getConceptService().getConceptByUuid(request.getSiteUuid()));
 
-//        medicationAdministration.setEffective(new DateTimeType(request.getAdministeredDateTimeAsLocaltime()));
-//        medicationAdministration.setStatus(MedicationAdministration.MedicationAdministrationStatus.fromCode(request.getStatus()));
-//        medicationAdministration.setSubject(new Reference("Patient/"+request.getPatientUuid()));
-//        medicationAdministration.setContext(new Reference("Encounter/"+request.getEncounterUuid()));
-//        medicationAdministration.setRequest(new Reference("MedicationRequest/"+request.getOrderUuid()));
-//
-//        List<MedicationAdministration.MedicationAdministrationPerformerComponent> fhirPerformers = new ArrayList<>();
-//        MedicationAdministrationPerformer openmrsPerformer = new MedicationAdministrationPerformer();
-//        for (MedicationAdministrationPerformerRequest performer : request.getProviders()) {
-//            openmrsPerformer.setActor(Context.getProviderService().getProviderByUuid(performer.getProviderUuid()));
-//            openmrsPerformer.setFunction(Context.getConceptService().getConceptByName(performer.getFunction()));
-//            fhirPerformers.add(medicationAdministrationPerformerTranslator.toFhirResource(openmrsPerformer));
-//        }
-//        medicationAdministration.setPerformer(fhirPerformers);
-//
-//        List<org.hl7.fhir.r4.model.Annotation> notes = new ArrayList<>();
-//        Annotation openmrsNote = new Annotation();
-//        for (MedicationAdministrationNoteRequest note : request.getNotes()) {
-//            openmrsNote.setAuthor(Context.getProviderService().getProviderByUuid(note.getAuthorUuid()));
-//            openmrsNote.setText(note.getText());
-//            openmrsNote.setRecordedTime(note.getRecordedTimeAsLocaltime());
-//            notes.add(annotationTranslator.toFhirResource(note));
-//        }
-//        medicationAdministration.setNote(notes);
-//
-//        medicationAdministration.setMedication(new Reference("Medication/"+request.getDrugUuid()));
-//
-//        MedicationAdministration.MedicationAdministrationDosageComponent dosage = new MedicationAdministration.MedicationAdministrationDosageComponent();
-//        dosage.setText(request.getDosingInstructions());
-//        dosage.setDose(new org.hl7.fhir.r4.model.SimpleQuantity().setValue(request.getDose()).setUnit(request.getDoseUnitsUuid()));
-//        dosage.setRoute(conceptTranslator.toFhirResource(Context.getConceptService().getConceptByUuid(request.getRouteUuid())));
-//        dosage.setSite(conceptTranslator.toFhirResource(Context.getConceptService().getConceptByUuid(request.getSiteUuid())));
-//        medicationAdministration.setDosage(dosage);
-
         return medicationAdministration;
     }