Merge pull request #86 from mcode/dev

Dev
mcode · Apr 8, 2024 · 266f9c0 · 266f9c0
2 parents dd0e0b3 + 41a712e
commit 266f9c0
Show file tree

Hide file tree

Showing 23 changed files with 288 additions and 550 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/public/index.html b/public/index.html
@@ -49,7 +49,7 @@
       This HTML file is a template.
       If you open it directly in the browser, you will see an empty page.
 
-      You can add webfonts, meta tags, or analytics to this file.
+      You can add web fonts, meta tags, or analytics to this file.
       The build step will place the bundled scripts into the <body> tag.
 
       To begin the development, run `npm start` or `yarn start`.

diff --git a/src/cds-hooks b/src/cds-hooks
diff --git a/src/index.tsx b/src/index.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import ReactDOM from 'react-dom/client';
 
 import './index.css';

diff --git a/src/views/Patient/MedReqDropDown/MedReqDropDown.tsx b/src/views/Patient/MedReqDropDown/MedReqDropDown.tsx
@@ -16,7 +16,15 @@ import RefreshIcon from '@mui/icons-material/Refresh';
 import Box from '@mui/material/Box';
 import ListIcon from '@mui/icons-material/List';
 import LocalPharmacyIcon from '@mui/icons-material/LocalPharmacy';
-import { BundleEntry, Patient, MedicationRequest, Resource, MedicationDispense } from 'fhir/r4';
+import {
+  BundleEntry,
+  Patient,
+  MedicationRequest,
+  Resource,
+  MedicationDispense,
+  Parameters,
+  GuidanceResponse
+} from 'fhir/r4';
 import Client from 'fhirclient/lib/Client';
 import { ReactElement, useEffect, useState } from 'react';
 import example from '../../../cds-hooks/prefetch/exampleHookService.json'; // TODO: Replace with request to CDS service
@@ -51,6 +59,22 @@ interface MedReqDropDownProps {
   user: string | null;
 }
 
+export interface etasuStatus {
+  color: string;
+  display: string | undefined;
+}
+export function getStatus(etasuResource: GuidanceResponse | null | undefined): etasuStatus {
+  let color = '#0c0c0c'; // gray
+  let display;
+  if (etasuResource?.status === 'success') {
+    color = '#5cb85c'; // green
+    display = 'Approved';
+  } else if (etasuResource?.status === 'data-required') {
+    color = '#f0ad4e'; // orange
+    display = 'Pending';
+  }
+  return { color, display };
+}
 function MedReqDropDown({
   client,
   getFhirResource,
@@ -73,7 +97,7 @@ function MedReqDropDown({
 
   //ETASU
   const [showEtasu, setShowEtasu] = useState<boolean>(false);
-  const [remsAdminResponse, setRemsAdminResponse] = useState<RemsMetEtasuResponse | null>(null);
+  const [remsAdminResponse, setRemsAdminResponse] = useState<GuidanceResponse | null>(null);
   const [checkedEtasuTime, setCheckedEtasuTime] = useState(0);
   // Pharmacy
   const [showPharmacy, setShowPharmacy] = useState<boolean>(false);
@@ -203,53 +227,35 @@ function MedReqDropDown({
   };
 
   const refreshEtasuBundle = () => {
-    // setSpin(true);
-    const patientFirstName = patient?.name?.at(0)?.given?.at(0);
-    const patientLastName = patient?.name?.at(0)?.family;
-    const patientDOB = patient?.birthDate;
-    let drugCode = undefined;
-    setCheckedEtasuTime(Date.now());
-    if (selectedMedicationCard) {
-      drugCode = getDrugCodeFromMedicationRequest(selectedMedicationCard)?.code;
-    }
-    console.log(
-      'refreshEtasuBundle: ' +
-        patientFirstName +
-        ' ' +
-        patientLastName +
-        ' - ' +
-        patientDOB +
-        ' - ' +
-        drugCode
-    );
-    const etasuUrl = `${env
-      .get('REACT_APP_REMS_ADMIN_SERVER_BASE')
-      .asString()}/etasu/met/patient/${patientFirstName}/${patientLastName}/${patientDOB}/drugCode/${drugCode}`;
-
-    axios({
-      method: 'get',
-      url: etasuUrl
-    }).then(
-      response => {
-        // Sorting an array mutates the data in place.
-        const remsMetRes = response.data as RemsMetEtasuResponse;
-        if (remsMetRes.metRequirements) {
-          remsMetRes.metRequirements.sort((first: MetRequirements, second: MetRequirements) => {
-            // Keep the other forms unsorted.
-            if (second.requirementName.includes('Patient Status Update')) {
-              // Sort the Patient Status Update forms in descending order of timestamp.
-              return second.requirementName.localeCompare(first.requirementName);
-            }
-            return 0;
-          });
+    if (patient && selectedMedicationCard) {
+      setCheckedEtasuTime(Date.now());
+      const params: Parameters = {
+        resourceType: 'Parameters',
+        parameter: [
+          {
+            name: 'patient',
+            resource: patient
+          },
+          {
+            name: 'medication',
+            resource: selectedMedicationCard
+          }
+        ]
+      };
+      axios({
+        method: 'post',
+        url: `${env
+          .get('REACT_APP_REMS_ADMIN_SERVER_BASE')
+          .asString()}/4_0_0/GuidanceResponse/$rems-etasu`,
+        data: params
+      }).then(res => {
+        const resParams = res.data as Parameters;
+        const etasu = resParams.parameter?.find(e => e.name === 'rems-etasu');
+        if (etasu && etasu.resource?.resourceType === 'GuidanceResponse') {
+          setRemsAdminResponse(etasu.resource);
         }
-        console.log(response.data);
-        setRemsAdminResponse(response.data);
-      },
-      error => {
-        console.log(error);
-      }
-    );
+      });
+    }
   };
   const renderTimestamp = (checkedTime: number) => {
     return (
@@ -283,12 +289,7 @@ function MedReqDropDown({
     : false;
 
   const label = 'Select Medication Request';
-  let color = '#0c0c0c'; // gray
-  if (remsAdminResponse?.status === 'Approved') {
-    color = '#5cb85c'; // green
-  } else if (remsAdminResponse?.status === 'Pending') {
-    color = '#f0ad4e'; // orange
-  }
+  const eStatus = getStatus(remsAdminResponse);
 
   const pStatus = testEhrResponse?.resource?.status;
   const getMedicationStatus = (status: string | undefined) => {
@@ -306,8 +307,8 @@ function MedReqDropDown({
   }
 
   const etasuSx = {
-    backgroundColor: color,
-    ':hover': { filter: 'brightness(110%)', backgroundColor: color }
+    backgroundColor: eStatus.color,
+    ':hover': { filter: 'brightness(110%)', backgroundColor: eStatus.color }
   };
   const pharmSx = {
     backgroundColor: pColor,
@@ -397,7 +398,7 @@ function MedReqDropDown({
                           <div>
                             <ListIcon fontSize="large" />
                             <p className="etasuButtonText">ETASU: </p>
-                            <p>{remsAdminResponse?.status || 'Not Started'}</p>
+                            <p>{eStatus.display || 'Not Started'}</p>
                           </div>
                         </Button>
                         {renderTimestamp(checkedEtasuTime)}

diff --git a/src/views/Patient/MedReqDropDown/cdsHooksCards/cdsHooksCard.tsx b/src/views/Patient/MedReqDropDown/cdsHooksCards/cdsHooksCard.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect, ReactElement } from 'react';
+import { useState, useEffect, ReactElement } from 'react';
 import { Button, Card, CardActions, CardContent, Grid, Typography } from '@mui/material';
 
 import axios from 'axios';