Skip to content

Commit

Permalink
Merge pull request #1598 from ODORA0/LabTest
Browse files Browse the repository at this point in the history
OHRI-1655 Update formList with adhoc forms for Lab test
  • Loading branch information
pirupius authored Jul 27, 2023
2 parents 0eb3cdf + 551e016 commit 6283494
Showing 1 changed file with 13 additions and 2 deletions.
15 changes: 13 additions & 2 deletions packages/esm-covid-app/src/views/lab-results.encounter-list.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ const CovidLabResults: React.FC<CovidLabWidgetProps> = ({ patientUuid }) => {
}
if (status.includes('Pending')) {
baseActions.push({
form: { name: 'COVID Sample Collection', package: 'covid' },
form: { name: 'Sample Collection', package: 'covid' },
encounterUuid: encounter.uuid,
intent: '*',
label: t('collectSample', 'Collect Sample'),
Expand Down Expand Up @@ -230,6 +230,10 @@ const CovidLabResults: React.FC<CovidLabWidgetProps> = ({ patientUuid }) => {
formList={[
{ name: 'COVID Lab Order Form', excludedIntents: ['COVID_LAB_ORDER_EMBED'] },
{ name: 'COVID Lab Result Form', excludedIntents: [] },
{ name: 'COVID Lab Test' },
{ name: 'Lab Order Cancellation' },
{ name: 'Sample Collection' },
{ name: 'COVID Lab Order Form' },
]}
columns={columnsLab}
description={displayText}
Expand All @@ -244,7 +248,14 @@ const CovidLabResults: React.FC<CovidLabWidgetProps> = ({ patientUuid }) => {
<EncounterList
patientUuid={patientUuid}
encounterType={covidLabOrderEncounterType_UUID}
formList={[{ name: 'COVID Lab Test' }]}
formList={[
{ name: 'COVID Lab Test' },
{ name: 'COVID Lab Test' },
{ name: 'COVID Lab Result Form' },
{ name: 'Lab Order Cancellation' },
{ name: 'Sample Collection' },
{ name: 'COVID Lab Order Form' },
]}
columns={columnsPending}
description={headerTitlePending}
headerTitle={displayTextPending}
Expand Down

0 comments on commit 6283494

Please sign in to comment.