Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Kavitha | Kalai - Changes to accomodate PRN Work flow add DrugOrderScheduleObject #31

Merged
merged 5 commits into from
Feb 14, 2024
Merged

Kavitha | Kalai - Changes to accomodate PRN Work flow add DrugOrderScheduleObject #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4c48c41
Change to consider MedicationRequest as a default serviceType if is n…
kalai-tw Feb 8, 2024
923828b
MAde Visit UUid as non-mandatory Param, if visit is not send consider…
kalai-tw Feb 8, 2024
4a61a4e
Backend changed to accomodate prn slots
kalai-tw Feb 9, 2024
f272b84
added First Slot Start time to response in DrugOrderSchedule
kalai-tw Feb 9, 2024
de43977
Merge remote-tracking branch 'origin/Bahmni-IPD-master' into prn-drug…
kalai-tw Feb 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions omod/src/main/java/org/openmrs/module/ipd/service/impl/IPDVisitServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,14 @@ private Map<String, DrugOrderSchedule> getDrugOrderScheduleForOrders(String pati
.map(BahmniDrugOrder::getUuid)
.collect(Collectors.toList());
List<Slot> slots = ipdScheduleService.getMedicationSlots(patientUuid, ServiceType.MEDICATION_REQUEST,orderUuids);
List<Slot> prnSlots = ipdScheduleService.getMedicationSlots(patientUuid, ServiceType.AS_NEEDED_MEDICATION_REQUEST,orderUuids);
slots.addAll(prnSlots);
Map<DrugOrder, List<Slot>> groupedByOrders = slots.stream()
.collect(Collectors.groupingBy(slot -> (DrugOrder) slot.getOrder()));

Map<String, DrugOrderSchedule> drugOrderScheduleByOrders = slotTimeCreationService.getDrugOrderScheduledTime(groupedByOrders);


return drugOrderScheduleByOrders;
}

Expand Down
56 changes: 30 additions & 26 deletions omod/src/main/java/org/openmrs/module/ipd/service/impl/SlotTimeCreationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,33 +104,37 @@ private List<LocalDateTime> getSlotsStartTimeWithStartTimeDurationFrequency(Sche
public HashMap<String , DrugOrderSchedule> getDrugOrderScheduledTime(Map<DrugOrder,List<Slot>> slotsByOrder){
HashMap<String, DrugOrderSchedule> drugOrderScheduleHash= new HashMap<>();
for (DrugOrder drugOrder : slotsByOrder.keySet()) {
Double frequencyPerDay = drugOrder.getFrequency().getFrequencyPerDay();
String frequency=drugOrder.getFrequency().getName();
Map<LocalDate, List<LocalDateTime>> groupedByDateAndEpoch = slotsByOrder.get(drugOrder).stream()
.collect(Collectors.groupingBy(
obj -> obj.getStartDateTime().toLocalDate(),
Collectors.mapping(
obj -> obj.getStartDateTime(),
Collectors.toList()
)
));

List<List<LocalDateTime>> sortedList = groupedByDateAndEpoch.entrySet().stream()
.sorted(Map.Entry.comparingByKey()) // Sort by LocalDate in ascending order
.map(Map.Entry::getValue) // Get the list of Longs for each entry
.collect(Collectors.toList()); // Collect the list of lists into a single ArrayList

DrugOrderSchedule drugOrderSchedule=new DrugOrderSchedule();
if (START_TIME_FREQUENCIES.contains(frequency)){
drugOrderSchedule.setSlotStartTime(DateTimeUtil.convertLocalDateTimeToUTCEpoc(sortedList.get(0).get(0)));
DrugOrderSchedule drugOrderSchedule = new DrugOrderSchedule();
if (drugOrder.getAsNeeded()){
drugOrderSchedule.setSlotStartTime(DateTimeUtil.convertLocalDateTimeToUTCEpoc(slotsByOrder.get(drugOrder).get(0).getStartDateTime()));
}
else if (sortedList.get(0).size() == frequencyPerDay || (sortedList.size() == 1)) {
drugOrderSchedule.setDayWiseSlotsStartTime(sortedList.get(0).stream().map(DateTimeUtil::convertLocalDateTimeToUTCEpoc).collect(Collectors.toList()));
} else {
drugOrderSchedule.setFirstDaySlotsStartTime(sortedList.get(0).stream().map(DateTimeUtil::convertLocalDateTimeToUTCEpoc).collect(Collectors.toList()));
drugOrderSchedule.setRemainingDaySlotsStartTime(sortedList.get(sortedList.size() - 1).stream().map(DateTimeUtil::convertLocalDateTimeToUTCEpoc).collect(Collectors.toList()));
if (sortedList.size() > 2) {
drugOrderSchedule.setDayWiseSlotsStartTime(sortedList.get(1).stream().map(DateTimeUtil::convertLocalDateTimeToUTCEpoc).collect(Collectors.toList()));
else {
Double frequencyPerDay = drugOrder.getFrequency().getFrequencyPerDay();
String frequency = drugOrder.getFrequency().getName();
Map<LocalDate, List<LocalDateTime>> groupedByDateAndEpoch = slotsByOrder.get(drugOrder).stream()
.collect(Collectors.groupingBy(
obj -> obj.getStartDateTime().toLocalDate(),
Collectors.mapping(
obj -> obj.getStartDateTime(),
Collectors.toList()
)
));

List<List<LocalDateTime>> sortedList = groupedByDateAndEpoch.entrySet().stream()
.sorted(Map.Entry.comparingByKey()) // Sort by LocalDate in ascending order
.map(Map.Entry::getValue) // Get the list of Longs for each entry
.collect(Collectors.toList()); // Collect the list of lists into a single ArrayList

if (START_TIME_FREQUENCIES.contains(frequency)) {
drugOrderSchedule.setSlotStartTime(DateTimeUtil.convertLocalDateTimeToUTCEpoc(sortedList.get(0).get(0)));
} else if (sortedList.get(0).size() == frequencyPerDay || (sortedList.size() == 1)) {
drugOrderSchedule.setDayWiseSlotsStartTime(sortedList.get(0).stream().map(DateTimeUtil::convertLocalDateTimeToUTCEpoc).collect(Collectors.toList()));
} else {
drugOrderSchedule.setFirstDaySlotsStartTime(sortedList.get(0).stream().map(DateTimeUtil::convertLocalDateTimeToUTCEpoc).collect(Collectors.toList()));
drugOrderSchedule.setRemainingDaySlotsStartTime(sortedList.get(sortedList.size() - 1).stream().map(DateTimeUtil::convertLocalDateTimeToUTCEpoc).collect(Collectors.toList()));
if (sortedList.size() > 2) {
drugOrderSchedule.setDayWiseSlotsStartTime(sortedList.get(1).stream().map(DateTimeUtil::convertLocalDateTimeToUTCEpoc).collect(Collectors.toList()));
}
}
}
drugOrderSchedule.setSlots(slotsByOrder.get(drugOrder));
Expand Down
Loading