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

OHRI-1880 Show the screening results on the CaCx Treatment list #1677

Merged
merged 2 commits into from
Nov 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions packages/esm-cervical-cancer-app/src/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,6 @@ export const cacxEncounterDateConcept = '163137AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
export const screeningMethodConcept = '53ff5cd0-0f37-4190-87b1-9eb439a15e94';
export const cacxTreatmentConcept = '3a8bb4b4-7496-415d-a327-57ae3711d4eb';
export const colopsyResultsConcept = '9096a18e-c009-4f4c-b0ba-0605e0f16578';
export const humanPapilomaVirusResultsConcept = '159859AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
export const papanicolaouSmearResultsConcept = '28bab50e-7ff7-4216-81be-3f7ad05c6547';
export const VIAProcedureResultsConcept = 'cc647244-0826-4d8e-8c5a-d7a371267bf4';
Original file line number Diff line number Diff line change
@@ -1,12 +1,20 @@
import React, { useMemo } from 'react';
import { useTranslation } from 'react-i18next';
import { EncounterList, EncounterListColumn, getObsFromEncounter } from '@ohri/openmrs-esm-ohri-commons-lib';
import {
EncounterList,
EncounterListColumn,
getMultipleObsFromEncounter,
getObsFromEncounter,
} from '@ohri/openmrs-esm-ohri-commons-lib';
import {
cacxEncounterDateConcept,
screeningMethodConcept,
cacxTreatmentConcept,
cacxTreatmentEncounterType_UUID,
colopsyResultsConcept,
humanPapilomaVirusResultsConcept,
papanicolaouSmearResultsConcept,
VIAProcedureResultsConcept,
} from '../../../constants';
import { moduleName } from '../../../index';

Expand Down Expand Up @@ -34,10 +42,15 @@ const CacxTreatmentList: React.FC<CacxTreatmentListProps> = ({ patientUuid }) =>
},
},
{
key: 'colopsyResult',
header: t('colopsyResult', 'Screening Results'),
key: 'screeningResult',
header: t('screeningResult', 'Screening Results'),
getValue: (encounter) => {
return getObsFromEncounter(encounter, colopsyResultsConcept);
return getMultipleObsFromEncounter(encounter, [
colopsyResultsConcept,
humanPapilomaVirusResultsConcept,
papanicolaouSmearResultsConcept,
VIAProcedureResultsConcept,
]);
},
},
{
Expand Down
12 changes: 12 additions & 0 deletions packages/esm-commons-lib/src/utils/encounter-list-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,18 @@ export function getObsFromEncounters(encounters, obsConcept) {
return getObsFromEncounter(filteredEnc, obsConcept);
}

export function getMultipleObsFromEncounter(encounter, obsConcepts: Array<string>){
let observations = [];
obsConcepts.map(concept => {
const obs = getObsFromEncounter(encounter, concept);
if(obs !== '--'){
observations.push(obs);
}
})

return observations.length? observations.join(', '): '--'
}

export function getObsFromEncounter(encounter, obsConcept, isDate?: Boolean, isTrueFalseConcept?: Boolean) {
const obs = findObs(encounter, obsConcept);

Expand Down