(feat) O3-4087: Enable input for set-based lab tests on lab results form and handle partial set results #2062
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
donaldkibet
requested review from
denniskigen,
CynthiaKamau,
pirupius,
ibacher,
makombe and
ojwanganto
and removed request for
denniskigen and
CynthiaKamau
|
Size Change: +391 B (0%) Total Size: 14.8 MB ℹ️ View Unchanged
|
ibacher
requested changes
Oct 15, 2024
| @@ -157,3 +158,69 @@ export async function updateOrderResult( | |||
| } | |||
| throw new Error('Failed to update order'); | |||
| } | |||
|
|
|||
| export function createObservationPayload(concept: LabOrderConcept, order: Order, values: any) { | |||
There was a problem hiding this comment.
I'm always suspicious of explicitly using any, especially when the code here implies a rather specific shape, namely that values is that values is something like Record<string, unknown>, which would be much better to use.
We should likewise type the sub functions here as this helps ensure the correctness of the code.
Comment on lines
173
to
175
| } | ||
|
|
||
| if (!concept.set && concept.setMembers.length === 0) { |
There was a problem hiding this comment.
Why not just use else or else if?
| if (concept.set && concept.setMembers.length > 0) { | ||
| const groupMembers = concept.setMembers | ||
| .map((member) => createGroupMember(member, order, values)) | ||
| .filter((member) => member?.value !== null && member?.value !== undefined); |
There was a problem hiding this comment.
Suggested change
| .filter((member) => member?.value !== null && member?.value !== undefined); | |
| .filter((member) => member !== null && member.value !== null && member.value !== undefined); |
| function createObservation(order, groupMembers = null, value = null) { | ||
| return { | ||
| concept: { uuid: order.concept.uuid }, | ||
| status: 'FINAL', |
There was a problem hiding this comment.
Ideally, eventually, this would be something the user can define.
| return null; | ||
| } | ||
|
|
||
| if (['Numeric', 'Text'].includes(datatype.display)) { |
There was a problem hiding this comment.
This is actually a case where using display is incorrect. display is a user-facing property because its localizable, but because its localizable, we cannot rely on it's value being English. In this case, the "correct" value is (for historical reasons) hl7Abbreviation, but name is less likely to be wrong.
There was a problem hiding this comment.
hl7Abbreviation is something like:
| Datatype | Code |
|---|---|
| Coded | CWE |
| Text | ST |
| Numeric | NM |
donaldkibet
force-pushed
the
O3-4087
branch
3 times, most recently
from
bd0ecae to
83a7d24
Compare
denniskigen
approved these changes
Oct 16, 2024
packages/esm-patient-orders-app/src/lab-results/lab-results.resource.ts
Outdated
Show resolved
Hide resolved
denniskigen
changed the title
…form and handle partial set results
senthil-athiban
pushed a commit
to senthil-athiban/openmrs-esm-patient-chart
that referenced
this pull request
Nov 19, 2024
…orm and handle partial set results (openmrs#2062) * (feat) O3-4087 : enable input for set-based lab tests on lab results form and handle partial set results * code reviews changes * additional code review changes
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.
Requirements
Summary
See https://openmrs.atlassian.net/browse/O3-4087
In this PR, I have updated the logic for generating lab observation (obs) values:
Non-set lab order concepts: If the lab order concept is not a set, we generate the payload. If no values are present for the concept, we return an empty array.
Set member lab order concepts: For concepts that are part of a set, we only return observation payloads for set members that have values. This ensures that incomplete results (missing values for some set members) do not affect the generation process.
Screenshots
Related Issue
Other