Nursing task enhancement (#15)

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

@@ -28,7 +28,7 @@ public interface SlotDAO {
 
 	List<Slot> getSlotsByPatientAndVisitAndServiceType(Reference subject, Visit visit, Concept serviceType);
 
-	List<Slot> getSlotsBySubjectReferenceIdAndForTheGivenTimeFrame(Reference subject, LocalDateTime localStartDate, LocalDateTime localEndDate);
+	List<Slot> getSlotsBySubjectReferenceIdAndForTheGivenTimeFrame(Reference subject, LocalDateTime localStartDate, LocalDateTime localEndDate, Visit visit);
 
 	List<Slot> getSlotsBySubjectIncludingAdministeredTimeFrame(Reference subject, LocalDateTime localStartDate, LocalDateTime localEndDate);
 

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

@@ -101,13 +101,15 @@ public List<Slot> getSlotsByPatientAndVisitAndServiceType(Reference subject, Vis
 		return query.getResultList();
 	}
     @Override
-    public List<Slot> getSlotsBySubjectReferenceIdAndForTheGivenTimeFrame(Reference subject, LocalDateTime localStartDate, LocalDateTime localEndDate) {
+    public List<Slot> getSlotsBySubjectReferenceIdAndForTheGivenTimeFrame(Reference subject, LocalDateTime localStartDate, LocalDateTime localEndDate, Visit visit){
         Query query = sessionFactory.getCurrentSession()
-                .createQuery("FROM Slot slot WHERE slot.schedule.subject=:subject and (slot.startDateTime BETWEEN :startDate and :endDate) and slot.voided=0");
+                .createQuery("FROM Slot slot WHERE slot.schedule.subject=:subject and (slot.startDateTime BETWEEN :startDate and :endDate) and slot.voided=0 and slot.schedule.visit=:visit");
 
         query.setParameter("subject", subject);
         query.setParameter("startDate", localStartDate);
         query.setParameter("endDate", localEndDate);
+		query.setParameter("visit", visit);
+
 
         return query.getResultList();
     }

api/src/main/java/org/openmrs/module/ipd/api/model/Slot.java

@@ -87,6 +87,9 @@ public enum SlotStatus {
 	@JoinColumn(name = "medication_administration_id", referencedColumnName = "medication_administration_id")
 	private MedicationAdministration medicationAdministration;
 
+	@Column(name = "comments")
+	private String notes;
+
 	public Boolean isStopped() {
 		return this.status !=null && this.status == SlotStatus.STOPPED;
 	}

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

@@ -34,7 +34,7 @@ public interface SlotService extends OpenmrsService {
 
 	List<Slot> getSlotsByPatientAndVisitAndServiceType(Reference subject, Visit visit, Concept serviceType);
 
-	List<Slot> getSlotsBySubjectReferenceIdAndForTheGivenTimeFrame(Reference reference, LocalDateTime localStartDate, LocalDateTime localEndDate);
+	List<Slot> getSlotsBySubjectReferenceIdAndForTheGivenTimeFrame(Reference reference, LocalDateTime localStartDate, LocalDateTime localEndDate, Visit visit);
 
 	List<Slot> getSlotsBySubjectReferenceIncludingAdministeredTimeFrame(Reference subject, LocalDateTime localStartDate, LocalDateTime localEndDate);
 }

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

@@ -80,8 +80,8 @@ public List<Slot> getSlotsByPatientAndVisitAndServiceType(Reference subject, Vis
 		return slotDAO.getSlotsByPatientAndVisitAndServiceType(subject, visit, serviceType);
 	}
     @Override
-    public List<Slot> getSlotsBySubjectReferenceIdAndForTheGivenTimeFrame(Reference subject, LocalDateTime localStartDate, LocalDateTime localEndDate) {
-		return slotDAO.getSlotsBySubjectReferenceIdAndForTheGivenTimeFrame(subject, localStartDate, localEndDate);
+    public List<Slot> getSlotsBySubjectReferenceIdAndForTheGivenTimeFrame(Reference subject, LocalDateTime localStartDate, LocalDateTime localEndDate, Visit visit){
+		return slotDAO.getSlotsBySubjectReferenceIdAndForTheGivenTimeFrame(subject, localStartDate, localEndDate, visit);
 	}
 
 	@Override

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

@@ -16,6 +16,7 @@ public class DrugOrderScheduleResponse {
     private List<Long> remainingDaySlotsStartTime;
     private Long slotStartTime;
     private Boolean medicationAdministrationStarted;
+    private String notes;
 
     public static DrugOrderScheduleResponse createFrom(DrugOrderSchedule drugOrderSchedule){
         return DrugOrderScheduleResponse.builder().
@@ -24,6 +25,7 @@ public static DrugOrderScheduleResponse createFrom(DrugOrderSchedule drugOrderSc
                 remainingDaySlotsStartTime(drugOrderSchedule.getRemainingDaySlotsStartTime()).
                 slotStartTime(drugOrderSchedule.getSlotStartTime()).
                 medicationAdministrationStarted(drugOrderSchedule.getSlots().stream().anyMatch(slot -> slot.getMedicationAdministration() != null)).
+                notes(drugOrderSchedule.getNotes()).
                 build();
     }
 }

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

@@ -26,6 +26,7 @@ public class MedicationSlotResponse {
     private long startTime;
     private Object order;
     private Object medicationAdministration;
+    private String notes;
 
     public static MedicationSlotResponse createFrom(Slot slot) {
         return MedicationSlotResponse.builder()
@@ -36,6 +37,7 @@ public static MedicationSlotResponse createFrom(Slot slot) {
                 .startTime(convertLocalDateTimeToUTCEpoc(slot.getStartDateTime()))
                 .order(ConversionUtil.convertToRepresentation(slot.getOrder(), Representation.FULL))
                 .medicationAdministration(MedicationAdministrationResponse.createFrom((slot.getMedicationAdministration())))
+                .notes(slot.getNotes())
                 .build();
     }
 
@@ -49,6 +51,7 @@ public static MedicationSlotResponse createFrom(Slot slot, Representation rep) {
                     .status(slot.getStatus().name())
                     .startTime(convertLocalDateTimeToUTCEpoc(slot.getStartDateTime()))
                     .medicationAdministration(MedicationAdministrationResponse.createFrom((slot.getMedicationAdministration())))
+                    .notes(slot.getNotes())
                     .build();
         }
         return MedicationSlotResponse.createFrom(slot);

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

@@ -1,10 +1,15 @@
 package org.openmrs.module.ipd.controller;
 
+import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
+import org.openmrs.Patient;
+import org.openmrs.Visit;
+import org.openmrs.api.PatientService;
+import org.openmrs.api.VisitService;
 import org.openmrs.module.ipd.api.model.Schedule;
 import org.openmrs.module.ipd.api.model.Slot;
-import org.openmrs.module.ipd.api.util.DateTimeUtil;
 import org.openmrs.module.ipd.api.util.IPDConstants;
+import org.openmrs.module.ipd.api.service.ScheduleService;
 import org.openmrs.module.ipd.contract.MedicationScheduleResponse;
 import org.openmrs.module.ipd.contract.MedicationSlotResponse;
 import org.openmrs.module.ipd.contract.ScheduleMedicationRequest;
@@ -19,7 +24,6 @@
 import org.springframework.web.bind.annotation.*;
 
 import java.time.LocalDateTime;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -36,10 +40,16 @@
 public class IPDScheduleController extends BaseRestController {
 
     private final IPDScheduleService ipdScheduleService;
+    private  final VisitService visitService;
+    private final PatientService patientService;
+    private final ScheduleService scheduleService;
 
     @Autowired
-    public IPDScheduleController(IPDScheduleService ipdScheduleService) {
+    public IPDScheduleController(IPDScheduleService ipdScheduleService, VisitService visitService, PatientService patientService, ScheduleService scheduleService) {
         this.ipdScheduleService = ipdScheduleService;
+        this.visitService = visitService;
+        this.patientService = patientService;
+        this.scheduleService = scheduleService;
     }
 
     @RequestMapping(value = "type/medication", method = RequestMethod.POST)
@@ -76,8 +86,10 @@ public ResponseEntity<Object> getMedicationSlotsByDate(@RequestParam(value = "pa
                 LocalDateTime localStartDate = convertEpocUTCToLocalTimeZone(startTime);
                 LocalDateTime localEndDate = convertEpocUTCToLocalTimeZone(endTime);
                 Boolean considerAdministeredTime = view!=null & IPDConstants.IPD_VIEW_DRUG_CHART.equals(view);
-                List<Slot> slots = ipdScheduleService.getMedicationSlotsForTheGivenTimeFrame(patientUuid, localStartDate, localEndDate,considerAdministeredTime);
-                return new ResponseEntity<>(constructResponse(slots), OK);
+                Patient patient = patientService.getPatientByUuid(patientUuid);
+                Visit visit = visitService.getActiveVisitsByPatient(patient).get(0);
+                List<Slot> slots = ipdScheduleService.getMedicationSlotsForTheGivenTimeFrame(patientUuid, localStartDate, localEndDate,considerAdministeredTime, visit);
+                return new ResponseEntity<>(constructResponse(slots, visit), OK);
             }
             throw new Exception();
         } catch (Exception e) {
@@ -107,7 +119,12 @@ public ResponseEntity<Object> getMedicationSlotsByOrderUuids(@RequestParam(value
         }
     }
 
-    private List<MedicationScheduleResponse> constructResponse(List<Slot> slots) {
+
+    private List<MedicationScheduleResponse> constructResponse(List<Slot> slots, Visit visit) {
+        Schedule schedule = scheduleService.getScheduleByVisit(visit);
+        if(slots.isEmpty() && schedule != null){
+            return Lists.newArrayList(createFrom(schedule, slots));
+        }
         Map<Schedule, List<Slot>> slotsBySchedule = slots.stream().collect(Collectors.groupingBy(Slot::getSchedule));
         return slotsBySchedule.entrySet().stream().map(entry -> createFrom(entry.getKey(), entry.getValue())).collect(Collectors.toList());
     }

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

@@ -37,7 +37,7 @@ public SlotFactory(BedManagementService bedManagementService, ConceptService con
 
     public List<Slot> createSlotsForMedicationFrom(Schedule savedSchedule, List<LocalDateTime> slotsStartTime,
                                                    Order drugOrder, MedicationAdministration medicationAdministration,
-                                                   Slot.SlotStatus status, ServiceType serviceType) {
+                                                   Slot.SlotStatus status, ServiceType serviceType, String comments) {
 
         return slotsStartTime.stream().map(slotStartTime -> {
             Slot slot = new Slot();
@@ -57,6 +57,7 @@ public List<Slot> createSlotsForMedicationFrom(Schedule savedSchedule, List<Loca
             slot.setStartDateTime(slotStartTime);
             slot.setStatus(status);
             slot.setMedicationAdministration(medicationAdministration);
+            slot.setNotes(comments);
             return slot;
         }).collect(Collectors.toList());
     }

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

@@ -17,5 +17,5 @@ public class DrugOrderSchedule {
     private List<Long> remainingDaySlotsStartTime;
     private Long slotStartTime;
     private List<Slot> slots;
-
+    private String notes;
 }

omod/src/main/java/org/openmrs/module/ipd/service/IPDScheduleService.java

@@ -1,5 +1,6 @@
 package org.openmrs.module.ipd.service;
 
+import org.openmrs.Visit;
 import org.openmrs.Encounter;
 import org.openmrs.module.emrapi.encounter.domain.EncounterTransaction;
 import org.openmrs.module.ipd.api.model.Schedule;
@@ -17,6 +18,6 @@ public interface IPDScheduleService {
     List<Slot> getMedicationSlots(String patientUuid, ServiceType serviceType);
     List<Slot> getMedicationSlots(String patientUuid, ServiceType serviceType, List<String> orderUuids);
     Schedule updateMedicationSchedule(ScheduleMedicationRequest scheduleMedicationRequest);
-    List<Slot> getMedicationSlotsForTheGivenTimeFrame(String patientUuid, LocalDateTime localStartDate, LocalDateTime localEndDate,Boolean considerAdministeredTime);
+    List<Slot> getMedicationSlotsForTheGivenTimeFrame(String patientUuid, LocalDateTime localStartDate, LocalDateTime localEndDate,Boolean considerAdministeredTime, Visit visit);
     void handlePostProcessEncounterTransaction(Encounter encounter, EncounterTransaction encounterTransaction);
 }

omod/src/main/java/org/openmrs/module/ipd/service/impl/IPDMedicationAdministrationServiceImpl.java

@@ -106,7 +106,7 @@ public org.hl7.fhir.r4.model.MedicationAdministration saveAdhocMedicationAdminis
         slotsStartTime.add(DateTimeUtil.convertEpocUTCToLocalTimeZone(medicationAdministrationRequest.getAdministeredDateTime()));
         ServiceType serviceType = openmrsMedicationAdministration.getDrugOrder() == null ? ServiceType.EMERGENCY_MEDICATION_REQUEST : ServiceType.AS_NEEDED_MEDICATION_REQUEST;
         slotFactory.createSlotsForMedicationFrom(schedule, slotsStartTime, openmrsMedicationAdministration.getDrugOrder(),
-                        openmrsMedicationAdministration, Slot.SlotStatus.COMPLETED, serviceType)
+                        openmrsMedicationAdministration, Slot.SlotStatus.COMPLETED, serviceType,"")
                 .forEach(slotService::saveSlot);
         return medicationAdministration;
     }

omod/src/main/java/org/openmrs/module/ipd/service/impl/IPDScheduleServiceImpl.java

@@ -69,7 +69,7 @@ public Schedule saveMedicationSchedule(ScheduleMedicationRequest scheduleMedicat
         }
         DrugOrder order = (DrugOrder) orderService.getOrderByUuid(scheduleMedicationRequest.getOrderUuid());
         List<LocalDateTime> slotsStartTime = slotTimeCreationService.createSlotsStartTimeFrom(scheduleMedicationRequest, order);
-        slotFactory.createSlotsForMedicationFrom(savedSchedule, slotsStartTime, order, null, SCHEDULED, ServiceType.MEDICATION_REQUEST)
+        slotFactory.createSlotsForMedicationFrom(savedSchedule, slotsStartTime, order, null, SCHEDULED, ServiceType.MEDICATION_REQUEST, scheduleMedicationRequest.getComments())
                 .forEach(slotService::saveSlot);
 
         return savedSchedule;
@@ -115,14 +115,14 @@ private void voidExistingMedicationSlotsForOrder(String patientUuid,String order
 
 
     @Override
-    public List<Slot> getMedicationSlotsForTheGivenTimeFrame(String patientUuid, LocalDateTime localStartDate, LocalDateTime localEndDate,Boolean considerAdministeredTime) {
+    public List<Slot> getMedicationSlotsForTheGivenTimeFrame(String patientUuid, LocalDateTime localStartDate, LocalDateTime localEndDate, Boolean considerAdministeredTime, Visit visit) {
         Optional<Reference> subjectReference = referenceService.getReferenceByTypeAndTargetUUID(Patient.class.getTypeName(), patientUuid);
         if(!subjectReference.isPresent())
             return Collections.emptyList();
         if (considerAdministeredTime) {
             return slotService.getSlotsBySubjectReferenceIncludingAdministeredTimeFrame(subjectReference.get(), localStartDate, localEndDate);
         }
-        return slotService.getSlotsBySubjectReferenceIdAndForTheGivenTimeFrame(subjectReference.get(), localStartDate,localEndDate);
+        return slotService.getSlotsBySubjectReferenceIdAndForTheGivenTimeFrame(subjectReference.get(), localStartDate,localEndDate, visit);
     }
 
     @Override