Kavitha | Update ipd branch with latest master changes #82
Conversation
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
…nch (#56) * [Ritesh] | BAH-3148 | Create and fetch medication task (#1) * [Ritesh] | 1. Repo set up. 2. Created Slot and Schedule entity 3.Saving IPD Medication Schedule without creating slots. * [Ritesh] | 1. Update package name 2. Added Dao and Service layer for reference 3. Minor fixes * [Ritesh] | 1.Rename Schedule Strategy to MedicationFrequency * [Ritesh] | 1. Migration for slot. 2. Slot creation from schedule * [Ritesh] | 1. Refactor SlotTimeCreationService * [Ritesh] | 1. Handle time zone issue while creating slots and schedule. * [Ritesh] | 1. Changing the url of saving medication * [Ritesh] | 1. Returning slots * [Ritesh] | Get schedule for Drug chart * [Ritesh] | Fix date time issue in slots response * [Ritesh] | Refactoring and Added test * [Ritesh] | 1. Change for reference id to subject reference id and by reference id to actor reference id. 2. Also added pre-condition before adding medication concept for ipd. * [Ritesh] | 1. Refactoring ServiceType * [Ritesh] | 1. Bug Fix return empty list if now slots are not present for a patient on specific day. * [Ritesh] | 1. Updated README file * [Ritesh] | 1. Fixed time zone issue in test * add. endpoint to get list of IPD medications scheduled for a patient * refactor. endpoint and updated tests in DAO and service classes * refactor. namings for schedule DAO methods * fix. test failures in ScheduleImpl --------- Co-authored-by: Arjun-Go <[email protected]> Co-authored-by: Arjun G <[email protected]> * A-1205974389432443 | Feedbacks on Medication Schedule (#3) * [Ritesh] | 1. Repo set up. 2. Created Slot and Schedule entity 3.Saving IPD Medication Schedule without creating slots. * [Ritesh] | 1. Update package name 2. Added Dao and Service layer for reference 3. Minor fixes * [Ritesh] | 1.Rename Schedule Strategy to MedicationFrequency * [Ritesh] | 1. Migration for slot. 2. Slot creation from schedule * [Ritesh] | 1. Refactor SlotTimeCreationService * [Ritesh] | 1. Handle time zone issue while creating slots and schedule. * [Ritesh] | 1. Changing the url of saving medication * [Ritesh] | 1. Returning slots * [Ritesh] | Get schedule for Drug chart * [Ritesh] | Fix date time issue in slots response * [Ritesh] | Refactoring and Added test * [Ritesh] | 1. Change for reference id to subject reference id and by reference id to actor reference id. 2. Also added pre-condition before adding medication concept for ipd. * [Ritesh] | 1. Refactoring ServiceType * [Ritesh] | 1. Bug Fix return empty list if now slots are not present for a patient on specific day. * [Ritesh] | 1. Updated README file * [Ritesh] | 1. Fixed time zone issue in test * add. endpoint to get list of IPD medications scheduled for a patient * refactor. endpoint and updated tests in DAO and service classes * refactor. namings for schedule DAO methods * fix. test failures in ScheduleImpl * add. changes to create one schedule for a patient * update. columns in Schedule and Slot table * update. set end date as null * fix tests for Slot and Schedule Hiberate and DAOs. Updated responses for GET calls * fix tests Schedule DAO * remove unnecessary fields * API Change to accomodate Editable Remaining day slot start time for medication --------- Co-authored-by: Ritesh Ghiya <[email protected]> Co-authored-by: Kalaiyarasan Raja <[email protected]> * add. changes to automate omod publish for Bahmni-IPD-master branch (#4) * Arjun | Fix deployment workflow (#5) * test. ipd publish workflow * revert. testing changes in deploy workflow * test changes with maven wrapper * revert. deploy for test branch * Medication Administration Feature (#7) * [Ritesh] | 1. Repo set up. 2. Created Slot and Schedule entity 3.Saving IPD Medication Schedule without creating slots. * [Ritesh] | 1. Update package name 2. Added Dao and Service layer for reference 3. Minor fixes * [Ritesh] | 1.Rename Schedule Strategy to MedicationFrequency * [Ritesh] | 1. Migration for slot. 2. Slot creation from schedule * [Ritesh] | 1. Refactor SlotTimeCreationService * [Ritesh] | 1. Handle time zone issue while creating slots and schedule. * [Ritesh] | 1. Changing the url of saving medication * [Ritesh] | 1. Returning slots * [Ritesh] | Get schedule for Drug chart * [Ritesh] | Fix date time issue in slots response * [Ritesh] | Refactoring and Added test * [Ritesh] | 1. Change for reference id to subject reference id and by reference id to actor reference id. 2. Also added pre-condition before adding medication concept for ipd. * [Ritesh] | 1. Refactoring ServiceType * [Ritesh] | 1. Bug Fix return empty list if now slots are not present for a patient on specific day. * [Ritesh] | 1. Updated README file * [Ritesh] | 1. Fixed time zone issue in test * add. endpoint to get list of IPD medications scheduled for a patient * refactor. endpoint and updated tests in DAO and service classes * refactor. namings for schedule DAO methods * fix. test failures in ScheduleImpl * add. changes to create one schedule for a patient * update. columns in Schedule and Slot table * update. set end date as null * fix tests for Slot and Schedule Hiberate and DAOs. Updated responses for GET calls * fix tests Schedule DAO * remove unnecessary fields * API Change to accomodate Editable Remaining day slot start time for medication * Kavitha|Kalai Add Change for Medication Administration Save * Kavitha|Kalai - Medication Administration Create API Changes * Kavitha|Kalai - Medication Administration Create API Changes * Kavitha, Kalai | refactored patient reference param * Kavitha|Kalai - Medication Administration Create API Changes * Kavitha|Kalai - Medication Administration Create API Changes * Kavitha|Kalai - Medication Administration Create API Changes * Kavitha|Kalai - Medication Administration Create API Changes * Kavitha, Kalai | add medication administration reference in slot db and api * Kavitha|Kalai - Medication Administration Create API Changes * Kavitha, Kalai | added provider mapper and time converter * Kavitha | add adhoc and refactored scheduled medication administration * refactored schedule from medication administration request * Kavitha | refactored medication administration request and response * Kavitha | refactored annotation to medicationAdministrationNote * Kavitha | removed unused methods --------- Co-authored-by: Ritesh Ghiya <[email protected]> Co-authored-by: Arjun-Go <[email protected]> Co-authored-by: Kalaiyarasan Raja <[email protected]> * IPD Treatment Display Control Get API Changes & Edit Drug Chart API Changes (#8) * IPD Drug Order Fetch API changes * IPD Drug Order schedule update API changes * IPD Drug Order schedule update API changes * IPD Drug Order schedule update API changes * IPD Drug Order schedule update API changes * Fix to convert time to UTC intead of Local Time * Kavitha | refactored treatments API to include emergency medications * Kavitha,Kalai | add provider as part of drug order response --------- Co-authored-by: Kavitha S <[email protected]> * A-1206156796138532 | Abi | add. functionality to return slot information based on given time frame * Abi | fix. method name based on functionality * Abi | fix. filter non-voided slots for the iven time frame (#10) * Changes to accomodate Drugchart view where we need to intended and actual administered time Changes to accomodate Drugchart view where we need to intended and actual administered time * BAH-3460 | Kavitha | refactor save adhoc medications (#13) * Changes to stop/void slots associated with drugorder when its stopped (#12) Changes to stop/void slots associated with drugorder when its stopped * BAH-3460 | fix provider uuid issue for schedule creation (#14) * Nursing task enhancement (#15) * Abi | fix. schedule notes issue (#17) * Provider acknowledge flow changes - Update API Introduced for Medication Administration Provider acknowledge flow changes - Update API Introduced for Medication Administration * Kavitha | fix slot creation logic for 1 day (#19) * Kavitha | add void condition in fetching slots (#20) * Abi | update. status as Stopped once administered and stopped a medicine (#21) * Changes to bring drug order one visit previous to current visit Changes to bring drug order one visit previous to current visit * update. shift api to return slots based on visitUuid * add. check to avoid multiple save (#23) * update. filter slots for drugChart based on visit uuid * Test Case Fix for new change added * API to save/schedule the placeholder Tasks for PRN (#24) * add. logic for creating placeholder for as needed medications * add. test for getting medications in given time frame * add. logic to fetch medications of particular service type * update. name of variable * update. modify imports to have static imports * pendingSlotsAvailable Key added to know whether any pending slots is available for drug Order * condition added to check if slotstart time is after current time (#27) * [Sri/kalai] - get the pending slots after the current time in drug order schedule response * Change to consider MedicationRequest as a default serviceType if is not sent in payload * MAde Visit UUid as non-mandatory Param, if visit is not send consider Active Visit of the patient * Change to consider MedicationRequest as a default serviceType if is not sent in payload (#29) * Change to consider MedicationRequest as a default serviceType if is not sent in payload * MAde Visit UUid as non-mandatory Param, if visit is not send consider Active Visit of the patient * Backend changed to accomodate prn slots * added First Slot Start time to response in DrugOrderSchedule * Kavitha | add api to fetch slots by patient list with custom includes (#32) * Ward Level DashBoard API Changes (#30) * Ward Level DashBoard API Changes * Kavitha | add null check to get slots for list of patients (#34) * Search functionality API added & Refactor get patients API (#33) * Add boolean key to show if all slots are attended (#35) * Add totalPatient in Patient List & Search API response * Add missing classes * Kavitha | refactored slot creation logic for continuous medication (#38) * add. scheduler to mark non-administered slots as missed (#39) * Bookmarking API - API To Create Care Team & its Participants (#37) Bookmarking API - API To Create Care Team & its Participants (#37) * Adds careTeam information to AdmittedPatient (#40) * Adds visitDetails to AdmittedPatientResponse * Removed starttime,endtime & provider in update flow (#42) * Adds provider details and time check for getAdmittedPatients * Change LocalDateTime to Date * Rename methods * Adds ability to sort by Bed Number * CareTeam info added to search API as well (#44) CareTeam info added to search API as well (#44) * Removed CareTeam Particpants join condition (#45) Removed CareTeam Particpants join condition (#45) * Changes Inner join to left outer join * Makes sortBy optional parameter * Add a check in generateGroupByClauseForSorting to handle null values * Extract ORDER BY from GROUP BY * Add myPatient count for provider in summary API * Include void check for provider patients * Include currentDateTime for provider shift validation * BAH-3723|Kavitha| Event handling model & create task for admit event (#48) * BAH-3723|Kavitha| add event handling model and create task for admit event * Kavitha| add null check for event type * Kavitha | update fhir2 extension module version * Add scheduler, liquibase and handleEvent for shift start task * Move Events to api, refactor and include shift start task scheduler * Update api pom.xml * Add scheduler task for rollover medication tasks * Gets rollover tasks from fhir task service using task names and status * Add migration top add scheduler for rollover tasks * Create start shift scheduler and roll over tasks * Update and Refactor the rollover and shift start task * Remove the emrapi dependency * Refactor the method names * Rename the scheduler name * Add filters on drugorder while showing count (#51) * [Ashish]Add. Two new frequencies are added to medications * Abi | add. privilege checks for endpoints (#54) * Changes to Show the medication of Immediate Previous Visit Only if it is an OPD Visit Changes to Show the medication of Immediate Previous Visit Only if it is an OPD Visit * Upgrade Fhir2 version & Fhir2 Extension Version (#57) * Bindu | Remove feature branch from workflow --------- Co-authored-by: Ritesh Ghiya <[email protected]> Co-authored-by: Arjun-Go <[email protected]> Co-authored-by: Arjun G <[email protected]> Co-authored-by: Ritesh Ghiya <[email protected]> Co-authored-by: Kalaiyarasan Raja <[email protected]> Co-authored-by: kavitha-sundararajan <[email protected]> Co-authored-by: kalai-tw <[email protected]> Co-authored-by: Kavitha S <[email protected]> Co-authored-by: Abinaya U <[email protected]> Co-authored-by: Abinaya U <[email protected]> Co-authored-by: Soorya Kumaran C <[email protected]> Co-authored-by: srinithishg <[email protected]> Co-authored-by: srinithishg <[email protected]> Co-authored-by: Umair Fayaz <[email protected]> Co-authored-by: Umair Fayaz <[email protected]> Co-authored-by: AshishkurianTw <[email protected]> Co-authored-by: AshishkurianTw <[email protected]>
* Kavitha| refactored search to support multiple words (#64) (cherry picked from commit c345974) * A-1207053820490648 | [CURE IPD Bug] - Patients are not arranged in ascending order of bed number (#62) * add. sort logic to handle sorting of bed numbers that are purely integers * update. sort logic for numeric bed numbers (cherry picked from commit abcdb78) * Remove IPD branch publish (#65) (cherry picked from commit f9693ee) * add. check to filter out orders that are inactive and not scheduled (#66) (cherry picked from commit 9ce0056) --------- Co-authored-by: kavitha-sundararajan <[email protected]> Co-authored-by: Arjun G <[email protected]>
* BAH-4062 | Refactor. Extract privilege creation to config.xml * BAH-4062 | Fix. Error messages for privilege check failures
* BAH-4073 | Refactor. Change LICENSE to OMRS MPLv2 * BAH-4073 | Fix. License information in pom.xml
…VarChar (#73) * [Rahul] | BAH-4061 | Refactor. Change Medication Administration Status Type As VarChar * [Rahul] | BAH-4061 | Refactor. Remove Unused Dependencies * [Rahul] | BAH-4061 | Refactor. Change Status Value In Test * [Rahul] | BAH-4061 | Refactor. Remove MedicationAdministration Status Null Check * [Rahul] | BAH-4061 | Fix. MedicationAdministrationStatus Test Data
* BAH-4093 | Add. Default value for config file path property. * BAH-4093 | Refactor. Update property name
* BAH-4096 | Use xml based bean creations and removed annotations * BAH-4096 | Fix. Remove unused component scans * BAH-4096 | Refactor. Remove ununsed properties files in OMOD * BAH-4096 | Refactor. Move OMOD class files inside web package * BAH-4096 | Fix. Import path in OMOD test
kavitha-sundararajan
added a commit
that referenced
this pull request
Sep 15, 2024
This reverts commit dfa4ece.
kavitha-sundararajan
added a commit
that referenced
this pull request
Sep 15, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.