IPD Treatment Display Control Get API Changes & Edit Drug Chart API Changes

api/src/main/java/org/openmrs/module/ipd/api/dao/SlotDAO.java

@@ -1,6 +1,7 @@
 package org.openmrs.module.ipd.api.dao;
 
 import org.openmrs.Concept;
+import org.openmrs.Visit;
 import org.openmrs.module.ipd.api.model.Reference;
 import org.openmrs.module.ipd.api.model.Slot;
 import org.openmrs.api.db.DAOException;
@@ -11,16 +12,18 @@
 
 @Repository
 public interface SlotDAO {
-	
+
 	Slot getSlot(Integer slotId) throws DAOException;
 
 	Slot getSlotByUUID(String uuid) throws DAOException;
 
 	Slot saveSlot(Slot slot) throws DAOException;
 
-    List<Slot> getSlotsBySubjectReferenceIdAndForDateAndServiceType(Reference subject, LocalDate forDate, Concept serviceType);
+	List<Slot> getSlotsBySubjectReferenceIdAndForDateAndServiceType(Reference subject, LocalDate forDate, Concept serviceType);
 
 	List<Slot> getSlotsBySubjectReferenceIdAndServiceType(Reference subject, Concept serviceType);
 
 	List<Slot> getSlotsBySubjectReferenceIdAndServiceTypeAndOrderUuids(Reference subject, Concept serviceType, List<String> orderUuids);
+
+	List<Slot> getSlotsByPatientAndVisitAndServiceType(Reference subject, Visit visit, Concept serviceType);
 }

api/src/main/java/org/openmrs/module/ipd/api/dao/impl/HibernateSlotDAO.java

@@ -2,6 +2,7 @@
 
 import org.hibernate.query.Query;
 import org.openmrs.Concept;
+import org.openmrs.Visit;
 import org.openmrs.module.ipd.api.dao.SlotDAO;
 import org.openmrs.module.ipd.api.model.Reference;
 import org.openmrs.module.ipd.api.model.Slot;
@@ -47,7 +48,7 @@ public Slot saveSlot(Slot slot) throws DAOException {
 	@Override
 	public List<Slot> getSlotsBySubjectReferenceIdAndForDateAndServiceType(Reference subject, LocalDate forDate, Concept serviceType) {
 		Query query = sessionFactory.getCurrentSession()
-				.createQuery("FROM Slot slot WHERE slot.schedule.subject=:subject and YEAR(slot.startDateTime)=:forYear and MONTH(slot.startDateTime)=:forMonth and DAY(slot.startDateTime)=:forDay and slot.serviceType=:serviceType");
+				.createQuery("FROM Slot slot WHERE slot.schedule.subject=:subject and YEAR(slot.startDateTime)=:forYear and MONTH(slot.startDateTime)=:forMonth and DAY(slot.startDateTime)=:forDay and slot.serviceType=:serviceType and slot.voided=0");
 
 		query.setParameter("subject", subject);
 		query.setParameter("forYear", forDate.getYear());
@@ -61,7 +62,7 @@ public List<Slot> getSlotsBySubjectReferenceIdAndForDateAndServiceType(Reference
 	@Override
 	public List<Slot> getSlotsBySubjectReferenceIdAndServiceType(Reference subject, Concept serviceType) {
 		Query query = sessionFactory.getCurrentSession()
-				.createQuery("FROM Slot slot WHERE slot.schedule.subject=:subject and slot.serviceType=:serviceType");
+				.createQuery("FROM Slot slot WHERE slot.schedule.subject=:subject and slot.serviceType=:serviceType and slot.voided=0");
 
 		query.setParameter("subject", subject);
 		query.setParameter("serviceType", serviceType);
@@ -75,12 +76,25 @@ public List<Slot> getSlotsBySubjectReferenceIdAndServiceTypeAndOrderUuids(Refere
 				.createQuery("FROM Slot slot " +
 						"WHERE slot.schedule.subject=:subject and " +
 						"slot.serviceType=:serviceType and"
-						+ " slot.order.uuid IN :orderUuids");
+						+ " slot.order.uuid IN :orderUuids and "
+				         + "slot.voided = 0");
 
 		query.setParameter("subject", subject);
 		query.setParameter("serviceType", serviceType);
 		query.setParameter("orderUuids", orderUuids);
 
 		return query.getResultList();
 	}
+
+	@Override
+	public List<Slot> getSlotsByPatientAndVisitAndServiceType(Reference subject, Visit visit, Concept serviceType) {
+		Query query = sessionFactory.getCurrentSession()
+				.createQuery("FROM Slot slot WHERE slot.schedule.subject=:subject and slot.schedule.visit=:visit and slot.serviceType=:serviceType");
+
+		query.setParameter("subject", subject);
+		query.setParameter("visit", visit);
+		query.setParameter("serviceType", serviceType);
+
+		return query.getResultList();
+	}
 }

api/src/main/java/org/openmrs/module/ipd/api/service/SlotService.java

@@ -1,8 +1,8 @@
 package org.openmrs.module.ipd.api.service;
 
 import org.openmrs.Concept;
+import org.openmrs.Visit;
 import org.openmrs.module.ipd.api.model.Reference;
-import org.openmrs.module.ipd.api.model.Schedule;
 import org.openmrs.module.ipd.api.model.Slot;
 import org.openmrs.api.APIException;
 import org.openmrs.api.OpenmrsService;
@@ -28,4 +28,8 @@ public interface SlotService extends OpenmrsService {
 	List<Slot> getSlotsBySubjectReferenceIdAndServiceType(Reference subject, Concept serviceType);
 
 	List<Slot> getSlotsBySubjectReferenceIdAndServiceTypeAndOrderUuids(Reference subject, Concept serviceType, List<String> orderUuids);
+
+	void voidSlot(Slot slot,String voidReason);
+
+	List<Slot> getSlotsByPatientAndVisitAndServiceType(Reference subject, Visit visit, Concept serviceType);
 }

api/src/main/java/org/openmrs/module/ipd/api/service/impl/SlotServiceImpl.java

@@ -1,6 +1,8 @@
 package org.openmrs.module.ipd.api.service.impl;
 
 import org.openmrs.Concept;
+import org.openmrs.api.context.Context;
+import org.openmrs.Visit;
 import org.openmrs.module.ipd.api.dao.SlotDAO;
 import org.openmrs.module.ipd.api.model.Reference;
 import org.openmrs.module.ipd.api.model.Slot;
@@ -14,6 +16,7 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDate;
+import java.util.Date;
 import java.util.List;
 
 @Service
@@ -60,4 +63,19 @@ public List<Slot> getSlotsBySubjectReferenceIdAndServiceType(Reference subject,
 	public List<Slot> getSlotsBySubjectReferenceIdAndServiceTypeAndOrderUuids(Reference subject, Concept serviceType, List<String> orderUuids) {
 		return slotDAO.getSlotsBySubjectReferenceIdAndServiceTypeAndOrderUuids(subject, serviceType, orderUuids);
 	}
+
+	@Override
+	public void voidSlot(Slot slot, String voidReason) throws APIException  {
+		slot.setVoided(true);
+		slot.setVoidedBy(Context.getAuthenticatedUser());
+		slot.setDateVoided(new Date());
+		slot.setVoidReason(voidReason);
+		slotDAO.saveSlot(slot);
+	}
+
+
+	@Override
+	public List<Slot> getSlotsByPatientAndVisitAndServiceType(Reference subject, Visit visit, Concept serviceType) {
+		return slotDAO.getSlotsByPatientAndVisitAndServiceType(subject, visit, serviceType);
+	}
 }

omod/pom.xml

@@ -123,6 +123,18 @@
 			<scope>provided</scope>
 		</dependency>
 
+		<dependency>
+			<groupId>org.openmrs.module</groupId>
+			<artifactId>emrapi-api</artifactId>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.bahmni.module</groupId>
+			<artifactId>bahmnicore-api</artifactId>
+			<scope>provided</scope>
+		</dependency>
+
 		<dependency>
 			<groupId>org.bahmni.module</groupId>
 			<artifactId>medication-administration-api</artifactId>

omod/src/main/java/org/openmrs/module/ipd/contract/DrugOrderScheduleResponse.java

@@ -0,0 +1,29 @@
+package org.openmrs.module.ipd.contract;
+
+import lombok.*;
+import org.openmrs.module.ipd.model.DrugOrderSchedule;
+
+import java.util.List;
+
+@Getter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class DrugOrderScheduleResponse {
+
+    private List<Long> firstDaySlotsStartTime;
+    private List<Long> dayWiseSlotsStartTime;
+    private List<Long> remainingDaySlotsStartTime;
+    private Long slotStartTime;
+    private Boolean medicationAdministrationStarted;
+
+    public static DrugOrderScheduleResponse createFrom(DrugOrderSchedule drugOrderSchedule){
+        return DrugOrderScheduleResponse.builder().
+                firstDaySlotsStartTime(drugOrderSchedule.getFirstDaySlotsStartTime()).
+                dayWiseSlotsStartTime(drugOrderSchedule.getDayWiseSlotsStartTime()).
+                remainingDaySlotsStartTime(drugOrderSchedule.getRemainingDaySlotsStartTime()).
+                slotStartTime(drugOrderSchedule.getSlotStartTime()).
+                medicationAdministrationStarted(drugOrderSchedule.getSlots().stream().anyMatch(slot -> slot.getMedicationAdministration() != null)).
+                build();
+    }
+}

omod/src/main/java/org/openmrs/module/ipd/contract/IPDDrugOrderResponse.java

@@ -0,0 +1,37 @@
+package org.openmrs.module.ipd.contract;
+
+import lombok.*;
+import org.openmrs.module.emrapi.encounter.domain.EncounterTransaction;
+import org.openmrs.module.ipd.model.IPDDrugOrder;
+
+@Getter
+@Setter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class IPDDrugOrderResponse {
+
+    private EncounterTransaction.DrugOrder drugOrder;
+    private DrugOrderScheduleResponse drugOrderSchedule;
+
+    public static IPDDrugOrderResponse createFrom(IPDDrugOrder ipdDrugOrder) {
+        IPDDrugOrderResponse ipdDrugOrderResponse= IPDDrugOrderResponse.builder().
+                drugOrder(ipdDrugOrder.getDrugOrder()).build();
+        if (ipdDrugOrder.getDrugOrderSchedule() != null){
+                ipdDrugOrderResponse.setDrugOrderSchedule(DrugOrderScheduleResponse.createFrom(ipdDrugOrder.getDrugOrderSchedule()));
+        }
+        return ipdDrugOrderResponse;
+    }
+
+    public boolean equals(Object otherOrder) {
+        if (otherOrder == null) {
+            return false;
+        } else if (!(otherOrder instanceof IPDDrugOrderResponse)) {
+            return false;
+        } else {
+            return super.equals(otherOrder);
+        }
+    }
+
+
+}

omod/src/main/java/org/openmrs/module/ipd/contract/IPDTreatmentsResponse.java

@@ -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();
+    }
+}

omod/src/main/java/org/openmrs/module/ipd/contract/MedicationSlotResponse.java

@@ -38,4 +38,20 @@ public static MedicationSlotResponse createFrom(Slot slot) {
                 .medicationAdministration(MedicationAdministrationResponse.createFrom((slot.getMedicationAdministration())))
                 .build();
     }
+
+    public static MedicationSlotResponse createFrom(Slot slot, Representation rep) {
+        if (rep.equals(Representation.REF))
+        {
+            return MedicationSlotResponse.builder()
+                    .id(slot.getId())
+                    .uuid(slot.getUuid())
+                    .serviceType(slot.getServiceType().getName().getName())
+                    .status(slot.getStatus().name())
+                    .startTime(convertLocalDateTimeToUTCEpoc(slot.getStartDateTime()))
+                    .medicationAdministration(MedicationAdministrationResponse.createFrom((slot.getMedicationAdministration())))
+                    .build();
+        }
+        return MedicationSlotResponse.createFrom(slot);
+
+    }
 }

omod/src/main/java/org/openmrs/module/ipd/controller/IPDScheduleController.java

@@ -51,6 +51,18 @@ public ResponseEntity<Object> createMedicationSchedule(@RequestBody ScheduleMedi
         }
     }
 
+    @RequestMapping(value = "type/medication/edit", method = RequestMethod.POST)
+    @ResponseBody
+    public ResponseEntity<Object> updateMedicationSchedule(@RequestBody ScheduleMedicationRequest scheduleMedicationRequest) {
+        try {
+            Schedule schedule = ipdScheduleService.updateMedicationSchedule(scheduleMedicationRequest);
+            return new ResponseEntity<>(ScheduleMedicationResponse.constructFrom(schedule), OK);
+        } catch (Exception e) {
+            log.error("Runtime error while trying to create new schedule", e);
+            return new ResponseEntity<>(RestUtil.wrapErrorResponse(e, e.getMessage()), BAD_REQUEST);
+        }
+    }
+
     @RequestMapping(value = "type/medication", method = RequestMethod.GET, params = {"patientUuid", "forDate"})
     @ResponseBody
     public ResponseEntity<Object> getMedicationSlotsByDate(@RequestParam(value = "patientUuid") String patientUuid,

omod/src/main/java/org/openmrs/module/ipd/controller/IPDVisitController.java

@@ -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);
+    }
+}

omod/src/main/java/org/openmrs/module/ipd/factory/MedicationAdministrationFactory.java

@@ -7,10 +7,7 @@
 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.MedicationAdministrationNoteRequest;
-import org.openmrs.module.ipd.contract.MedicationAdministrationPerformerRequest;
-import org.openmrs.module.ipd.contract.MedicationAdministrationRequest;
-import org.openmrs.module.ipd.contract.MedicationAdministrationResponse;
+import org.openmrs.module.ipd.contract.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

omod/src/main/java/org/openmrs/module/ipd/model/DrugOrderSchedule.java

@@ -0,0 +1,21 @@
+package org.openmrs.module.ipd.model;
+
+import lombok.*;
+import org.openmrs.module.ipd.api.model.Slot;
+
+import java.util.List;
+
+@Getter
+@Setter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class DrugOrderSchedule {
+
+    private List<Long> firstDaySlotsStartTime;
+    private List<Long> dayWiseSlotsStartTime;
+    private List<Long> remainingDaySlotsStartTime;
+    private Long slotStartTime;
+    private List<Slot> slots;
+
+}

omod/src/main/java/org/openmrs/module/ipd/model/IPDDrugOrder.java

@@ -0,0 +1,21 @@
+package org.openmrs.module.ipd.model;
+
+import lombok.*;
+import org.openmrs.module.emrapi.encounter.domain.EncounterTransaction.DrugOrder;
+
+@Getter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class IPDDrugOrder {
+
+    private DrugOrder drugOrder;
+    private DrugOrderSchedule drugOrderSchedule;
+
+    public static IPDDrugOrder createFrom(DrugOrder drugOrder,DrugOrderSchedule drugOrderSchedule){
+        return IPDDrugOrder.builder().
+                drugOrder(drugOrder).
+                drugOrderSchedule(drugOrderSchedule).
+                build();
+    }
+}