(2022 - 2025) Remove Index.tsx from Measures

services/ui-src/src/components/MeasureWrapper/index.test.tsx

@@ -4,7 +4,7 @@ import { RouterWrappedComp } from "utils/testing";
 import { MeasureWrapper } from "./";
 import { useApiMock } from "utils/testUtils/useApiMock";
 import { useUser } from "hooks/authHooks";
-import { AABAD } from "measures/2024/AABAD/index";
+import { CPUAD } from "measures/2024/CPUAD/index";
 
 jest.mock("hooks/authHooks");
 const mockUseUser = useUser as jest.Mock;
@@ -146,13 +146,13 @@ describe("test measure floating bar menu", () => {
       <RouterWrappedComp>
         <MeasureWrapper
           measure={
-            <AABAD
+            <CPUAD
               name={
                 "Avoidance of Antibiotic Treatment for Acute Bronchitis/Bronchiolitis: Age 18 And Older"
               }
               year={"2024"}
               measureId={"AAB-AD"}
-            ></AABAD>
+            ></CPUAD>
           }
           name="testing-active"
           year="2021"

services/ui-src/src/measures/2021/CCPCH/data.ts

@@ -1,4 +1,3 @@
-// import { DataDrivenTypes } from "shared/types";
 import { getCatQualLabels } from "../rateLabelText";
 import { MeasureTemplateData } from "shared/types/MeasureTemplate";
 

services/ui-src/src/measures/2021/FVAAD/data.ts

@@ -16,5 +16,6 @@ export const data: MeasureTemplateData = {
   },
   custom: {
     dataSrcRadio: true,
+    removeLessThan30: true,
   },
 };

services/ui-src/src/measures/2021/PQI15AD/data.ts

@@ -6,7 +6,7 @@ export const { categories, qualifiers } = getCatQualLabels("PQI15-AD");
 
 export const data: MeasureTemplateData = {
   type: "AHRQ",
-  coreset: "health",
+  coreset: "adult",
   performanceMeasure: {
     questionText: [
       "Number of inpatient hospital admissions for asthma per 100,000 beneficiary months for beneficiaries ages 18 to 39.",

services/ui-src/src/measures/2021/SSDAD/data.ts

@@ -5,7 +5,7 @@ export const { categories, qualifiers } = getCatQualLabels("SSD-AD");
 
 export const data: MeasureTemplateData = {
   type: "HEDIS",
-  coreset: "health",
+  coreset: "adult",
   performanceMeasure: {
     questionText: [
       "Percentage of beneficiaries ages 18 to 64 with schizophrenia, schizoaffective disorder, or bipolar disorder, who were dispensed an antipsychotic medication and had a diabetes screening test during the measurement year.",

services/ui-src/src/measures/2022/CCWAD/index.test.tsx → services/ui-src/src/measures/2021/measureTemplate.test.tsx

@@ -9,7 +9,7 @@ import { Suspense } from "react";
 import { MeasuresLoading } from "views";
 import { measureDescriptions } from "measures/measureDescriptions";
 import { renderWithHookForm } from "utils/testUtils/reactHookFormRenderer";
-import { validationFunctions } from "./validation";
+import { validationFunctions } from "./CCWAD/validation";
 import {
   mockValidateAndSetErrors,
   clearMocks,

services/ui-src/src/measures/2021/measureTemplate.tsx

@@ -47,6 +47,7 @@ export const measureTemplate = ({
         reportingYear={year}
         measureName={name}
         measureAbbreviation={measureId}
+        removeLessThan30={custom?.removeLessThan30}
       />
 
       {!isNotReportingData && (
@@ -76,6 +77,7 @@ export const measureTemplate = ({
                 showtextbox={custom?.showtextbox}
                 hybridMeasure={hybridMeasure}
                 rateReadOnly={custom?.rateReadOnly}
+                rateCalc={custom?.rateCalc}
               />
               <CMQ.DeviationFromMeasureSpecificationCheckboxes
                 categories={performanceMeasure.categories}
@@ -92,7 +94,7 @@ export const measureTemplate = ({
               }
             />
           )}
-          <CMQ.CombinedRates />
+          <CMQ.CombinedRates coreset={coreset} />
           {showOptionalMeasureStrat && (
             <CMQ.OptionalMeasureStrat
               coreset={coreset}

services/ui-src/src/measures/2022/AABAD/data.ts

@@ -1,15 +1,23 @@
-import { DataDrivenTypes } from "shared/types";
+import { AABRateCalculation } from "utils";
 import { getCatQualLabels } from "../rateLabelText";
+import { MeasureTemplateData } from "shared/types/MeasureTemplate";
 
 export const { categories, qualifiers } = getCatQualLabels("AAB-AD");
 
-export const data: DataDrivenTypes.PerformanceMeasure = {
-  customPrompt:
-    "Enter a number for the numerator and the denominator.  The measure is reported as an inverted rate. The formula for the Rate = (1 - (Numerator/Denominator)) x 100",
-  questionText: [
-    "The percentage of episodes for beneficiaries age 18 and older with a diagnosis of acute bronchitis/bronchiolitis that did not result in an antibiotic dispensing event.",
-  ],
-  questionListItems: [],
-  categories,
-  qualifiers,
+export const data: MeasureTemplateData = {
+  type: "HEDIS",
+  coreset: "adult",
+  performanceMeasure: {
+    customPrompt:
+      "Enter a number for the numerator and the denominator.  The measure is reported as an inverted rate. The formula for the Rate = (1 - (Numerator/Denominator)) x 100",
+    questionText: [
+      "The percentage of episodes for beneficiaries age 18 and older with a diagnosis of acute bronchitis/bronchiolitis that did not result in an antibiotic dispensing event.",
+    ],
+    questionListItems: [],
+    categories,
+    qualifiers,
+  },
+  custom: {
+    rateCalc: AABRateCalculation,
+  },
 };