SL-1065 - ensure preferred patient has at most one bed assignment aft… #615
Conversation
This file contains hidden or 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
mseaton
reviewed
Dec 6, 2025
| for (BedPatientAssignment bpa : bpaList) { | ||
| bpa.setPatient(preferred); | ||
| // ensure there is at most one active bed assignment per patient | ||
| if(preferredPatientHasBedAssigned && bpa.getEndDatetime() == null) { |
Member
There was a problem hiding this comment.
This doesn't seem sufficient. Don't we need to ensure that it also doesn't overlap with the preferred patient's bed assignment, even if it has already ended? i.e. it can't have a endDateTime > the startDateTime of the preferred assignment, right?
| bpa.setVoidReason("Merging into patient " + preferred.getId()); | ||
| bpa.setVoidedBy(Context.getAuthenticatedUser()); | ||
|
|
||
| Encounter e = bpa.getEncounter(); |
Member
There was a problem hiding this comment.
I don't think this class should do anything with encounters, should it? Isn't there already a merge function that handles either merging or voiding encounters, and ensuring the appropriate / preferred patient is set on it, etc?
Contributor
Author
|
Closing this. Superceded by openmrs/openmrs-module-bedmanagement#99. |
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.
…er patient merge
Previously, on patient merge, we change all bed assignments from the non-preferred patient to the preferred patient. This causes problems with multiple active bed assignment on the same patient.
This PR changes it so that if both the preferred and non-preferred patients has active bed assignments, we void the assignment to the non-preferred patient. (If only one of them has a bed assignment, it will still be reassigned to the preferred patient).
Note:
I tested this manually via the Ward App and it seemed to do the right thing in the DB. However, there is a bug (fix pending PR) where the backend returns voided bed assignments. Marking this PR as draft for now, and I'll do another manual test after that PR is merged in.