diff --git a/src/adminApp/WorkFlow/ShowSubjectType.js b/src/adminApp/WorkFlow/ShowSubjectType.js
index f657223a6..38d47a1b1 100644
--- a/src/adminApp/WorkFlow/ShowSubjectType.js
+++ b/src/adminApp/WorkFlow/ShowSubjectType.js
@@ -4,17 +4,12 @@ import RemoveIcon from "@material-ui/icons/Remove";
export const ShowSubjectType = props => {
const existMapping = props.formMapping.filter(l => l[props.entityUUID] === props.rowDetails.uuid);
- const subjectType =
- existMapping.length !== 0
- ? props.subjectType.filter(l => l.uuid === existMapping[0].subjectTypeUUID)
- : [];
+ const subjectType = existMapping.length !== 0 ? props.subjectType.filter(l => l.uuid === existMapping[0].subjectTypeUUID) : [];
return (
<>
{existMapping.length !== 0 && subjectType.length !== 0 && (
-
- {props.subjectType.filter(l => l.uuid === existMapping[0].subjectTypeUUID)[0].name}
-
+ {props.subjectType.filter(l => l.uuid === existMapping[0].subjectTypeUUID)[0].name}
)}
>
);
@@ -22,16 +17,11 @@ export const ShowSubjectType = props => {
export const ShowPrograms = props => {
const existMapping = props.formMapping.filter(l => l.encounterTypeUUID === props.rowDetails.uuid);
- const program =
- existMapping.length !== 0
- ? props.program.filter(l => l.uuid === existMapping[0].programUUID)
- : [];
+ const program = existMapping.length !== 0 ? props.program.filter(l => l.uuid === existMapping[0].programUUID) : [];
return (
<>
- {existMapping.length !== 0 && program.length !== 0 && (
- {props.program.filter(l => l.uuid === existMapping[0].programUUID)[0].name}
- )}
+ {existMapping.length !== 0 && program.length !== 0 && {program[0].operationalProgramName || program[0].name}}
{(existMapping.length === 0 || program.length === 0) && }
>
);