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.

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

Bindu, Kavitha | Merge code from Bahmni-IPD-master branch to main branch #56

Merged
merged 94 commits into from
May 31, 2024

Conversation

binduak
Copy link
Contributor

@binduak binduak commented May 17, 2024

No description provided.

riteshghiya90 and others added 30 commits November 28, 2023 13:12
* [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]>
* [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]>
* test. ipd publish workflow

* revert. testing changes in deploy workflow

* test changes with maven wrapper

* revert. deploy for test branch
* [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]>
…hanges (#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]>
…tual administered time

Changes to accomodate Drugchart view where we need to intended and actual administered time
…#12)

Changes to stop/void slots associated with drugorder when its stopped
…ion Administration

Provider acknowledge flow changes - Update API Introduced for Medication Administration
Changes to bring drug order one visit previous to current visit
* 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. filter slots based on visituuid
umair-fayaz and others added 27 commits March 19, 2024 17:36
Sort patient list by BedNumber in Search & Patient APIs
A-1206860834641287 | API Changes to show count of myPatients
…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
Fix rollover scheduler change set
Feedback set 1 | 1207086957634488
… is an OPD Visit

Changes to Show the medication of Immediate Previous Visit Only if it is an OPD Visit
@binduak binduak merged commit 5e30a5a into main May 31, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants