device-dashboard tags

app/components/clinic/PatientForm/SelectSites.js

@@ -4,7 +4,7 @@ import { useSelector } from 'react-redux';
 import partition from 'lodash/partition';
 import Select, { createFilter } from 'react-select';
 import { useLocation } from 'react-router-dom';
-import useClinicPatientsFilters from '../../../pages/clinicworkspace/useClinicPatientsFilters';
+import useClinicPatientsFilters from '../../../pages/clinicworkspace/hooks/useClinicPatientsFilters';
 import { useTranslation } from 'react-i18next';
 import { noop } from 'lodash';
 import utils from '../../../core/utils';

app/components/clinic/PatientForm/SelectTags.js

@@ -5,7 +5,7 @@ import keyBy from 'lodash/keyBy';
 import partition from 'lodash/partition';
 import Select, { createFilter } from 'react-select';
 import { useLocation } from 'react-router-dom';
-import useClinicPatientsFilters from '../../../pages/clinicworkspace/useClinicPatientsFilters';
+import useClinicPatientsFilters from '../../../pages/clinicworkspace/hooks/useClinicPatientsFilters';
 import { useTranslation } from 'react-i18next';
 import { noop } from 'lodash';
 import utils from '../../../core/utils';

app/components/clinic/RpmReportConfigForm.js

@@ -28,6 +28,13 @@ const log = bows('RpmReportConfigForm');
 
 export const exportRpmReport = ({ config, results }) => {
   let { startDate = '', endDate = '' } = config?.rawConfig || {};
+
+  // Check if CPT-99445 column should be included (periods starting on or after 1/1/2026)
+  const reportStartDate = new Date(startDate);
+  const cpt99445EffectiveDate = new Date('2026-01-01');
+  const showCpt99445 = reportStartDate >= cpt99445EffectiveDate;
+
+  // Convert dates to MM/DD/YYYY for display
   startDate = startDate.replace(dateRegex, '$2/$3/$1');
   endDate = endDate.replace(dateRegex, '$2/$3/$1');
 
@@ -38,6 +45,7 @@ export const exportRpmReport = ({ config, results }) => {
       t('MRN'),
       t('# Days With Qualifying Data between {{startDate}} and {{endDate}}', { startDate, endDate }),
       t('Sufficient Data for {{code}}', { code: config?.code }),
+      ...(showCpt99445 ? [t('Sufficient Data for CPT-99445')] : []),
     ],
   ];
 
@@ -53,13 +61,19 @@ export const exportRpmReport = ({ config, results }) => {
   results.forEach(patient => {
     const { fullName, birthDate, mrn, realtimeDays, hasSufficientData } = patient;
 
-    csvRows.push([
+    // Calculate CPT-99445 eligibility: 2-15 days of qualifying data
+    const hasSufficientData99445 = realtimeDays >= 2 && realtimeDays <= 15;
+
+    const patientRow = [
       csvEscape(fullName),
       isNull(birthDate) ? t('N/A') : csvEscape(birthDate.replace(dateRegex, '$2/$3/$1')),
       csvEscape(mrn),
       csvEscape(realtimeDays),
       hasSufficientData ? t('TRUE') : t('FALSE'),
-    ]);
+      ...(showCpt99445 ? [hasSufficientData99445 ? t('TRUE') : t('FALSE')] : []),
+    ];
+
+    csvRows.push(patientRow);
   });
 
   const csv = csvRows.map((row) => row.join(',')).join('\n');

app/pages/clinicworkspace/ClinicPatients.js

@@ -48,7 +48,7 @@ import { scroller } from 'react-scroll';
 import { Formik, Form } from 'formik';
 import { useFlags, useLDClient } from 'launchdarkly-react-client-sdk';
 import { Link as RouterLink } from 'react-router-dom';
-import useClinicPatientsFilters, { defaultFilterState } from './useClinicPatientsFilters';
+import useClinicPatientsFilters, { defaultFilterState } from './hooks/useClinicPatientsFilters';
 
 import {
   bindPopover,

app/pages/clinicworkspace/DeviceIssues/DeviceIssues.js

@@ -1,25 +1,32 @@
-import React, { useEffect, useState } from 'react';
+import React, { useState, useEffect } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
 import { useHistory } from 'react-router-dom';
-import { useSelector } from 'react-redux';
 import { useTranslation } from 'react-i18next';
 import Table from '../../../components/elements/Table';
 import { Box, Text, Flex } from 'theme-ui';
 import { DIABETES_TYPES } from '../../../core/constants';
 
 import { RTKQueryApi } from '../../../redux/api/baseApi';
 import { TagList } from '../../../components/elements/Tag';
+
+import useClinicPatientsFilters, { defaultFilterState } from '../hooks/useClinicPatientsFilters';
+import ActiveFilterCount from '../components/ActiveFilterCount';
+import FilterByTags from './FilterByTags';
 import FilterByCategory, { CATEGORY_TAB } from './FilterByCategory';
 import DashboardPagination from '../components/DashboardPagination';
+import ResetFilters from '../components/ResetFilters';
 
 const LIMIT = 12;
 
 const deviceIssuesApi = RTKQueryApi.injectEndpoints({
   endpoints: (builder) => ({
     getDeviceIssuesPatients: builder.query({
-      query: ({ clinicId, offset, category, limit }) => {
+      query: ({ clinicId, offset, category, tags, limit }) => {
+        const formattedTags = tags.length > 0 ? tags.join(',') : undefined;
+
         return {
           url: `/clinics/${clinicId}/patients`,
-          params: { offset, category, limit },
+          params: { offset, category, tags: formattedTags, limit },
         };
       },
     }),
@@ -34,7 +41,7 @@ const RenderTags = ({ patient }) => {
   const patientTags = clinic?.patientTags || [];
 
   const tagIds = patient?.tags || [];
-  const tags = tagIds.map(tag => patientTags.find(ptTag => ptTag.id === tag)); // TODO: index
+  const tags = tagIds.map(tag => patientTags.find(patientTag => patientTag.id === tag)); // TODO: index
 
   return <TagList tags={tags} />;
 };
@@ -59,21 +66,40 @@ const RenderPatient = ({ patient }) => {
 const DeviceIssues = () => {
   const { t } = useTranslation();
 
+  const [activeFilters, setActiveFilters, activeFiltersCount] = useClinicPatientsFilters();
+  const { patientTags } = activeFilters;
+
   const selectedClinicId = useSelector(state => state.blip.selectedClinicId);
   const [category, setCategory] = useState(CATEGORY_TAB.DEFAULT);
   const [offset, setOffset] = useState(0);
 
   const { data } = useGetDeviceIssuesPatientsQuery(
-    { clinicId: selectedClinicId, offset, category, limit: LIMIT },
+    { clinicId: selectedClinicId, offset, category, tags: patientTags, limit: LIMIT },
     { skip: !selectedClinicId }
   );
 
   if (!data) return null;
 
   const tableData = data?.data || [];
 
+  const handleActiveFilterChange = (payload) => {
+    setActiveFilters({ ...activeFilters, ...payload });
+  };
+
   return (
     <>
+      <Flex mb={3} sx={{ gap: 2, alignItems: 'center' }}>
+        <ActiveFilterCount count={activeFiltersCount} />
+        <FilterByTags
+          patientTags={patientTags}
+          onChange={handleActiveFilterChange}
+        />
+        <ResetFilters
+          hidden={activeFiltersCount <= 0}
+          onClick={() => handleActiveFilterChange(defaultFilterState)}
+        />
+      </Flex>
+
       <Flex mb={3} sx={{ justifyContent: 'center' }}>
         <FilterByCategory value={category} onChange={setCategory} />
       </Flex>