Merge pull request #148 from mcode/dev

Dev

Author: smalho01

src/views/Patient/MedReqDropDown/pharmacyStatus/__test__/PharmacyStatus.test.tsx

@@ -29,7 +29,7 @@ const testMedicationDispense: BundleEntry<MedicationDispense> = {
     },
     subject: {
       reference: 'Patient/pat017',
-      display: 'Jon Snow'
+      display: 'John Snow'
     },
     authorizingPrescription: [
       {

src/views/Questionnaire/elm/buildPopulatedResourceBundle.ts

@@ -174,6 +174,10 @@ function doSearch(
     smart
       .request(`${type}?${query}`)
       .then(processSuccess(smart, [], callback), processError(smart, callback));
+  } else {
+    // No valid ID to search with (e.g., missing coverage) - call callback with empty results
+    console.log(`No valid identifier for ${type}, skipping fetch`);
+    callback([]);
   }
 }
 

src/views/Questionnaire/fetchArtifacts.ts

@@ -74,8 +74,8 @@ function fetchArtifactsOperation(
       parameters.parameter = [];
       retVal.order = checkOrderType(orderResource);
       parameters.parameter.push({ name: 'order', resource: orderResource });
-      smart.request(coverage).then(coverage => {
-        parameters.parameter?.push({ name: 'coverage', resource: coverage });
+
+      const fetchQuestionnairePackage = () => {
         const requestOptions = {
           method: 'POST',
           headers: { 'Content-Type': 'application/fhir+json' },
@@ -112,7 +112,26 @@ function fetchArtifactsOperation(
               resolve(retVal);
             }
           });
-      });
+      };
+
+      // Try to fetch coverage
+      if (coverage) {
+        smart
+          .request(coverage)
+          .then(coverageResource => {
+            console.log('Successfully fetched coverage');
+            parameters.parameter?.push({ name: 'coverage', resource: coverageResource });
+            fetchQuestionnairePackage();
+          })
+          .catch(err => {
+            console.log('Could not fetch coverage, continuing without it:', err.message);
+            // Continue without coverage
+            fetchQuestionnairePackage();
+          });
+      } else {
+        console.log('No coverage provided');
+        fetchQuestionnairePackage();
+      }
     }
 
     function searchBundle(questionnaire: Questionnaire, bundle: BundleEntry<FhirResource>[]) {