(feat) O3-3502 - ward app - add REST calls and datatypes for inpatient endpoints in EMR API #1219
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
|
Size Change: -9.09 kB (-0.26%) Total Size: 3.49 MB ℹ️ View Unchanged
|
mseaton
approved these changes
Jun 28, 2024
| export function useInpatientRequest(locationUuid: string) { | ||
| const apiUrl = `${restBaseUrl}/emrapi/inpatient/admissionRequests?admissionLocation=${locationUuid}`; | ||
| const apiUrl = `/ws/rest/emrapi/inpatient/admissionRequests?admissionLocation=${locationUuid}`; |
There was a problem hiding this comment.
Does this imply that we have a bug in emrapi endpoint that it is not using the appropriate base url prefix? If so, we should fix it there and put this back.
There was a problem hiding this comment.
Yes. Just filed https://openmrs.atlassian.net/browse/EA-194. Most (all?) emrapi endpoints have the same problem so this could be relatively disruptive to fix.
| import OccupiedBed from '../beds/occupied-bed.component'; | ||
| export interface WardBedProps { | ||
| patientInfos: Array<{ patient: Patient; visit: Visit }>; | ||
| patientInfos: Array<WardPatient>; |
There was a problem hiding this comment.
I wonder if we can rename this from patientInfos -> wardPatients
| const patientInfos = patients.map((patient) => ({ patient, visit: null })); | ||
| if (admittedPatient) { | ||
| // ideally, we can just use the patient object within admittedPatient | ||
| // and not need the one from bedLayouts, however, the emr api |
There was a problem hiding this comment.
This has been fixed and committed in bedmanagement 6.0.0-SNAPSHOT, so you should be able to use admittedPatient now with an appropriate REST call.
brandones
reviewed
Jun 28, 2024
| const bedLayouts = filterBeds(admissionLocation); | ||
|
|
||
| return ( | ||
| <> | ||
| {bedLayouts.map((bedLayout, i) => { | ||
| const { patients } = bedLayout; | ||
| const bed = bedLayoutToBed(bedLayout); | ||
| const patientInfos: WardPatient[] = patients.map((patient) => { |
There was a problem hiding this comment.
This is not a blocker but it would be much more idiomatic to put all this (from bedLayouts.map( to return <WardBed) into a useMemo block and just render the result of that in this return block. This keeps computation logic and rendering logic separate, which makes for more idiomatic and readable React code.
There was a problem hiding this comment.
I can't easily do useMemo as this is in an if statement, but I can store this in a variable instead of inlining it in the JSX.
brandones
reviewed
Jun 28, 2024
brandones
reviewed
Jun 28, 2024
| kind="error" | ||
| lowContrast={true} | ||
| title={t('errorLoadingWardLocation', 'Error loading admitted patients')} | ||
| subtitle={errorLoadingPatients?.message} |
There was a problem hiding this comment.
Suggested change
| subtitle={errorLoadingPatients?.message} | |
| subtitle={errorLoadingPatients.message} |
If errorLoadingPatients is falsy at this point then we are in trouble.
brandones
approved these changes
Jun 28, 2024
Co-authored-by: Brandon Istenes <bistenes@gmail.com>
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
Requirements
Summary
No real functional changes. This PR adds calls to endpoints that are now available in EMR API to retrieve admitted patients and admission requests in a ward location.
Screenshots
Related Issue
Other