in the OTZ Discontinuation form, does not save the correct data when …

packages/esm-patient-chart-app/src/constants.ts

@@ -6,3 +6,5 @@ export const moduleName = '@openmrs/esm-patient-chart-app';
 export const patientChartWorkspaceSlot = 'patient-chart-workspace-slot';
 export const patientChartWorkspaceHeaderSlot = 'patient-chart-workspace-header-slot';
 export const omrsDateFormat = 'YYYY-MM-DDTHH:mm:ss.SSSZZ';
+export const otzUuid = '159836AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
+export const otzOutPut = 'Opt out of OTZ';

packages/esm-patient-chart-app/src/visit/visits-widget/encounter-observations/encounter-observations.component.tsx

@@ -1,9 +1,10 @@
-import React from 'react';
+import React, { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { SkeletonText } from '@carbon/react';
 import { useConfig } from '@openmrs/esm-framework';
 import { type Observation } from '../visit.resource';
 import styles from './styles.scss';
+import { otzUuid, otzOutPut } from '../../../constants';
 
 interface EncounterObservationsProps {
   observations: Array<Observation>;
@@ -12,15 +13,22 @@ interface EncounterObservationsProps {
 const EncounterObservations: React.FC<EncounterObservationsProps> = ({ observations }) => {
   const { t } = useTranslation();
   const { obsConceptUuidsToHide = [] } = useConfig();
+  const { obsConceptDisplayOverrides = { otzUuid: otzOutPut } } = useConfig();
 
-  function getAnswerFromDisplay(display: string): string {
-    const colonIndex = display.indexOf(':');
-    if (colonIndex === -1) {
-      return '';
-    } else {
-      return display.substring(colonIndex + 1).trim();
-    }
-  }
+  const getAnswerFromDisplay = useMemo(() => {
+    return (display: string, conceptUuid: string): string => {
+      const colonIndex = display.indexOf(':');
+      if (colonIndex === -1) {
+        return '';
+      } else {
+        const displayValue = display.substring(colonIndex + 1).trim();
+        if (obsConceptDisplayOverrides[conceptUuid]) {
+          return obsConceptDisplayOverrides[conceptUuid];
+        }
+        return displayValue;
+      }
+    };
+  }, [obsConceptDisplayOverrides]);
 
   if (!observations) {
     return <SkeletonText />;
@@ -43,7 +51,7 @@ const EncounterObservations: React.FC<EncounterObservationsProps> = ({ observati
                 {obs.groupMembers.map((member) => (
                   <React.Fragment key={index}>
                     <span className={styles.childConcept}>{member.concept.display}</span>
-                    <span>{getAnswerFromDisplay(member.display)}</span>
+                    <span>{getAnswerFromDisplay(member.display, obs.value.uuid)}</span>
                   </React.Fragment>
                 ))}
               </React.Fragment>
@@ -52,20 +60,14 @@ const EncounterObservations: React.FC<EncounterObservationsProps> = ({ observati
             return (
               <React.Fragment key={index}>
                 <span>{obs.concept.display}</span>
-                <span>{getAnswerFromDisplay(obs.display)}</span>
+                <span>{getAnswerFromDisplay(obs.display, obs.value.uuid)}</span>
               </React.Fragment>
             );
           }
         })}
       </div>
     );
   }
-
-  return (
-    <div className={styles.observation}>
-      <p>{t('noObservationsFound', 'No observations found')}</p>
-    </div>
-  );
 };
 
 export default EncounterObservations;