HIV Viral Load Date should fall back to the encounter date if not present

Author: Daphne210

packages/esm-care-panel-app/src/vl-history/vl-history.resource.ts

@@ -30,21 +30,28 @@ export function usePatientObservations(patientUuid, conceptUuids) {
       const coding = observation?.code?.coding[0];
       if (coding?.code === `${configSchema.hivViralLoadUuid._default}` && observation?.valueQuantity) {
         acc[effectiveDateTime].valuesArray.push(observation.valueQuantity.value);
-      } else if (coding?.code === `${configSchema.hivViralLoadDateUuid._default}` && observation?.effectiveDateTime) {
+      }
+
+      if (coding?.code === `${configSchema.hivViralLoadDateUuid._default}`) {
         acc[effectiveDateTime].dateArray.push(observation.effectiveDateTime);
-      } else if (
+      }
+
+      if (
         coding?.code === `${configSchema.hivViralLoadQualitativeUuid._default}` &&
         observation?.valueCodeableConcept
       ) {
         acc[effectiveDateTime].displayArray.push(observation.valueCodeableConcept?.coding[0]?.display);
       }
 
+      if (acc[effectiveDateTime].dateArray.length === 0) {
+        acc[effectiveDateTime].dateArray.push(observation.effectiveDateTime);
+      }
+
       return acc;
     }, {});
 
     return groupedObservations;
   }, [data]);
-
   return {
     observations: observationsByDate,
     isLoading: isValidating,