From c2941b8eb2d5aacb62e2ca8cdb1e5278cbd4480d Mon Sep 17 00:00:00 2001 From: Kavitha S Date: Fri, 29 Dec 2023 01:23:30 +0530 Subject: [PATCH] Kavitha | removed unused methods --- ...IPDMedicationAdministrationController.java | 15 ---------- .../MedicationAdministrationFactory.java | 14 +++------ .../IPDMedicationAdministrationService.java | 12 -------- ...PDMedicationAdministrationServiceImpl.java | 30 ------------------- 4 files changed, 4 insertions(+), 67 deletions(-) diff --git a/omod/src/main/java/org/openmrs/module/ipd/controller/IPDMedicationAdministrationController.java b/omod/src/main/java/org/openmrs/module/ipd/controller/IPDMedicationAdministrationController.java index 7acdc4d..19843e6 100644 --- a/omod/src/main/java/org/openmrs/module/ipd/controller/IPDMedicationAdministrationController.java +++ b/omod/src/main/java/org/openmrs/module/ipd/controller/IPDMedicationAdministrationController.java @@ -68,19 +68,4 @@ public ResponseEntity createAdhocMedicationAdministration(@RequestBody M } } -// @RequestMapping(value = "/medicationAdministrations", method = RequestMethod.GET) -// @ResponseBody -// public ResponseEntity getMedicationSlotsByDate(@RequestParam(value = "patientUuid", required = false) String patientUuid, -// @RequestParam(value = "forDate", required = false) Long forDate, -// @RequestParam(value = "providerUuid", required = false) String providerUuid, -// @RequestParam (value = "slotUuid" , required = false)String slotUuid) { -// try { -// LocalDate localDate = forDate !=null ? convertEpocUTCToLocalTimeZone(forDate).toLocalDate() : null; -// List medicationAdministrationResponseList = ipdMedicationAdministrationService.getMedicationAdministrationList(patientUuid,localDate,providerUuid,slotUuid); -// return new ResponseEntity<>(medicationAdministrationResponseList, OK); -// } catch (Exception e) { -// log.error("Runtime error while fetching medicationAdministrations ", e); -// return new ResponseEntity<>(RestUtil.wrapErrorResponse(e, e.getMessage()), BAD_REQUEST); -// } -// } } 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 index 1a22173..149581c 100644 --- a/omod/src/main/java/org/openmrs/module/ipd/factory/MedicationAdministrationFactory.java +++ b/omod/src/main/java/org/openmrs/module/ipd/factory/MedicationAdministrationFactory.java @@ -1,22 +1,16 @@ package org.openmrs.module.ipd.factory; -import org.apache.commons.lang.StringUtils; -//import org.hl7.fhir.r4.model.MedicationAdministration; -import org.hl7.fhir.r4.model.Reference; -import org.hl7.fhir.r4.model.DateTimeType; -import org.hl7.fhir.r4.model.MarkdownType; import org.openmrs.DrugOrder; -import org.openmrs.Provider; import org.openmrs.api.context.Context; -import org.openmrs.module.fhir2.api.translators.ConceptTranslator; import org.openmrs.module.fhir2.apiext.translators.MedicationAdministrationStatusTranslator; import org.openmrs.module.fhir2.apiext.translators.MedicationAdministrationTranslator; import org.openmrs.module.ipd.api.model.MedicationAdministration; import org.openmrs.module.ipd.api.model.MedicationAdministrationNote; import org.openmrs.module.ipd.api.model.MedicationAdministrationPerformer; -import org.openmrs.module.ipd.contract.*; -import org.openmrs.module.webservices.rest.web.ConversionUtil; -import org.openmrs.module.webservices.rest.web.representation.Representation; +import org.openmrs.module.ipd.contract.MedicationAdministrationNoteRequest; +import org.openmrs.module.ipd.contract.MedicationAdministrationPerformerRequest; +import org.openmrs.module.ipd.contract.MedicationAdministrationRequest; +import org.openmrs.module.ipd.contract.MedicationAdministrationResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/omod/src/main/java/org/openmrs/module/ipd/service/IPDMedicationAdministrationService.java b/omod/src/main/java/org/openmrs/module/ipd/service/IPDMedicationAdministrationService.java index 8c98b6a..5693b2a 100644 --- a/omod/src/main/java/org/openmrs/module/ipd/service/IPDMedicationAdministrationService.java +++ b/omod/src/main/java/org/openmrs/module/ipd/service/IPDMedicationAdministrationService.java @@ -1,24 +1,12 @@ package org.openmrs.module.ipd.service; import org.hl7.fhir.r4.model.MedicationAdministration; -import org.openmrs.module.ipd.api.model.Schedule; -import org.openmrs.module.ipd.api.model.ServiceType; -import org.openmrs.module.ipd.api.model.Slot; import org.openmrs.module.ipd.contract.MedicationAdministrationRequest; -import org.openmrs.module.ipd.contract.MedicationAdministrationResponse; -import org.openmrs.module.ipd.contract.ScheduleMedicationRequest; - -import java.time.LocalDate; -import java.util.List; public interface IPDMedicationAdministrationService { -// List saveMedicationAdministration(List medicationAdministrationRequestList); - MedicationAdministration saveScheduledMedicationAdministration(MedicationAdministrationRequest medicationAdministrationRequest); MedicationAdministration saveAdhocMedicationAdministration(MedicationAdministrationRequest medicationAdministrationRequest); -// List getMedicationAdministrationList(String patientUuid,LocalDate forDate,String providerUuid,String slotUuid); - } diff --git a/omod/src/main/java/org/openmrs/module/ipd/service/impl/IPDMedicationAdministrationServiceImpl.java b/omod/src/main/java/org/openmrs/module/ipd/service/impl/IPDMedicationAdministrationServiceImpl.java index 7ffef72..5ead815 100644 --- a/omod/src/main/java/org/openmrs/module/ipd/service/impl/IPDMedicationAdministrationServiceImpl.java +++ b/omod/src/main/java/org/openmrs/module/ipd/service/impl/IPDMedicationAdministrationServiceImpl.java @@ -1,17 +1,11 @@ package org.openmrs.module.ipd.service.impl; -import ca.uhn.fhir.rest.api.server.IBundleProvider; -import ca.uhn.fhir.rest.param.ReferenceAndListParam; -import ca.uhn.fhir.rest.param.ReferenceOrListParam; -import ca.uhn.fhir.rest.param.ReferenceParam; import org.apache.commons.lang.StringUtils; -import org.hl7.fhir.instance.model.api.IBaseResource; import org.openmrs.Patient; import org.openmrs.Visit; import org.openmrs.api.context.Context; import org.openmrs.module.fhir2.apiext.FhirMedicationAdministrationService; import org.openmrs.module.fhir2.apiext.dao.FhirMedicationAdministrationDao; -import org.openmrs.module.fhir2.apiext.search.param.MedicationAdministrationSearchParams; import org.openmrs.module.fhir2.apiext.translators.MedicationAdministrationTranslator; import org.openmrs.module.ipd.api.model.MedicationAdministration; import org.openmrs.module.ipd.api.model.Schedule; @@ -21,7 +15,6 @@ import org.openmrs.module.ipd.api.service.SlotService; import org.openmrs.module.ipd.api.util.DateTimeUtil; import org.openmrs.module.ipd.contract.MedicationAdministrationRequest; -import org.openmrs.module.ipd.contract.MedicationAdministrationResponse; import org.openmrs.module.ipd.factory.MedicationAdministrationFactory; import org.openmrs.module.ipd.factory.SlotFactory; import org.openmrs.module.ipd.service.IPDMedicationAdministrationService; @@ -29,7 +22,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; - import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; @@ -110,26 +102,4 @@ public org.hl7.fhir.r4.model.MedicationAdministration saveAdhocMedicationAdminis } } -// @Override -// public List getMedicationAdministrationList(String patientUuid, LocalDate forDate, String providerUuid, String slotUuid) { -// ReferenceParam patient = new ReferenceParam(); -// patient.setValue("Patient/"+patientUuid); -// ReferenceAndListParam subjectReference = new ReferenceAndListParam(); -// subjectReference.addValue(new ReferenceOrListParam().add(patient)); -// -// ReferenceParam slot = new ReferenceParam(); -// patient.setValue("Slot/"+slotUuid); -// ReferenceAndListParam supportInfoReference = new ReferenceAndListParam(); -// supportInfoReference.addValue(new ReferenceOrListParam().add(patient)); -// -// -// MedicationAdministrationSearchParams medicationAdministrationSearchParams = MedicationAdministrationSearchParams.builder().patientReference(subjectReference).supportingInfoReference(supportInfoReference).build(); -// IBundleProvider response = fhirMedicationAdministrationService.searchForMedicationAdministration(medicationAdministrationSearchParams); -// List responseData = response.getAllResources(); -// List medicationAdministrationsResponse= responseData.stream(). -// map(iBaseResource -> (MedicationAdministration)iBaseResource). -// map(medicationAdministrationFactory::createFrom).collect(Collectors.toList()); -// return medicationAdministrationsResponse; -// } - }