-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Kavitha | refactored treatments API to include emergency medications
- Loading branch information
1 parent
1b6c4b5
commit 9df66f1
Showing
12 changed files
with
164 additions
and
86 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
28 changes: 28 additions & 0 deletions
28
omod/src/main/java/org/openmrs/module/ipd/contract/IPDTreatmentsResponse.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| package org.openmrs.module.ipd.contract; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonInclude; | ||
| import lombok.AllArgsConstructor; | ||
| import lombok.Builder; | ||
| import lombok.Getter; | ||
| import lombok.NoArgsConstructor; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| @Getter | ||
| @Builder | ||
| @NoArgsConstructor | ||
| @AllArgsConstructor | ||
| public class IPDTreatmentsResponse { | ||
|
|
||
| private List<IPDDrugOrderResponse> ipdDrugOrders; | ||
|
|
||
| @JsonInclude(JsonInclude.Include.NON_NULL) | ||
| private List<MedicationAdministrationResponse> emergencyMedications; | ||
|
|
||
| public static IPDTreatmentsResponse createFrom(List<IPDDrugOrderResponse> ipdDrugOrders, List<MedicationAdministrationResponse> emergencyMedications) { | ||
| return IPDTreatmentsResponse.builder() | ||
| .ipdDrugOrders(ipdDrugOrders) | ||
| .emergencyMedications(emergencyMedications) | ||
| .build(); | ||
| } | ||
| } |
49 changes: 0 additions & 49 deletions
49
omod/src/main/java/org/openmrs/module/ipd/controller/IPDDrugOrderController.java
This file was deleted.
Oops, something went wrong.
48 changes: 48 additions & 0 deletions
48
omod/src/main/java/org/openmrs/module/ipd/controller/IPDVisitController.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| package org.openmrs.module.ipd.controller; | ||
|
|
||
| import lombok.extern.slf4j.Slf4j; | ||
| import org.openmrs.module.ipd.api.model.ServiceType; | ||
| import org.openmrs.module.ipd.api.model.Slot; | ||
| import org.openmrs.module.ipd.contract.IPDDrugOrderResponse; | ||
| import org.openmrs.module.ipd.contract.IPDTreatmentsResponse; | ||
| import org.openmrs.module.ipd.contract.MedicationAdministrationResponse; | ||
| import org.openmrs.module.ipd.model.IPDDrugOrder; | ||
| import org.openmrs.module.ipd.service.IPDVisitService; | ||
| import org.openmrs.module.webservices.rest.web.RestConstants; | ||
| import org.openmrs.module.webservices.rest.web.v1_0.controller.BaseRestController; | ||
| import org.springframework.beans.factory.annotation.Autowired; | ||
| import org.springframework.stereotype.Controller; | ||
| import org.springframework.web.bind.annotation.*; | ||
|
|
||
| import java.text.ParseException; | ||
| import java.util.*; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| @Controller | ||
| @RequestMapping(value = "/rest/" + RestConstants.VERSION_1 + "/ipdVisit/{visitUuid}") | ||
| @Slf4j | ||
| public class IPDVisitController extends BaseRestController { | ||
|
|
||
| private IPDVisitService ipdVisitService; | ||
|
|
||
| @Autowired | ||
| public IPDVisitController(IPDVisitService ipdVisitService) { | ||
| this.ipdVisitService = ipdVisitService; | ||
| } | ||
|
|
||
| @RequestMapping(value = "/medication", method = RequestMethod.GET) | ||
| @ResponseBody | ||
| public IPDTreatmentsResponse getVisitWiseMedications ( | ||
| @PathVariable("visitUuid") String visitUuid, | ||
| @RequestParam(value = "includes", required = false) List<String> includes) throws ParseException { | ||
|
|
||
| List<IPDDrugOrder> prescribedOrders = ipdVisitService.getPrescribedOrders(visitUuid, true, null, null, null, false); | ||
| List<IPDDrugOrderResponse> prescribedOrderResponse = prescribedOrders.stream().map(IPDDrugOrderResponse::createFrom).collect(Collectors.toList()); | ||
| List<MedicationAdministrationResponse> emergencyMedications = null; | ||
| if (includes != null && includes.contains("emergencyMedications")) { | ||
| List<Slot> emergencyMedicationSlots = ipdVisitService.getMedicationSlots(visitUuid, ServiceType.EMERGENCY_MEDICATION_REQUEST); | ||
| emergencyMedications = emergencyMedicationSlots.stream().map(slot -> MedicationAdministrationResponse.createFrom(slot.getMedicationAdministration())).collect(Collectors.toList()); | ||
| } | ||
| return IPDTreatmentsResponse.createFrom(prescribedOrderResponse, emergencyMedications); | ||
| } | ||
| } |
11 changes: 0 additions & 11 deletions
11
omod/src/main/java/org/openmrs/module/ipd/service/IPDDrugOrderService.java
This file was deleted.
Oops, something went wrong.
14 changes: 14 additions & 0 deletions
14
omod/src/main/java/org/openmrs/module/ipd/service/IPDVisitService.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| package org.openmrs.module.ipd.service; | ||
|
|
||
| import org.openmrs.module.ipd.model.IPDDrugOrder; | ||
| import org.openmrs.module.ipd.api.model.ServiceType; | ||
| import org.openmrs.module.ipd.api.model.Slot; | ||
|
|
||
| import java.util.Date; | ||
| import java.util.List; | ||
|
|
||
| public interface IPDVisitService { | ||
|
|
||
| List<IPDDrugOrder> getPrescribedOrders(String visitUuid, Boolean includeActiveVisit, Integer numberOfVisits, Date startDate, Date endDate, Boolean getEffectiveOrdersOnly); | ||
| List<Slot> getMedicationSlots(String visitUuid, ServiceType serviceType); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters