Remove Index From AIF-HH & IU-HH

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

@@ -1,10 +1,10 @@
-import { DataDrivenTypes } from "shared/types";
+import { ComplexRate } from "components";
 import { getCatQualLabels } from "../rateLabelText";
+import { MeasureTemplateData } from "shared/types/MeasureTemplate";
+import { xNumbersYDecimals } from "utils";
 
 export const { categories, qualifiers } = getCatQualLabels("AIF-HH");
 
-const measureName = "AIFHH";
-
 const inputFieldNames = [
   {
     id: "Number of Enrollee Months",
@@ -43,7 +43,6 @@ const inputFieldNames = [
   },
 ];
 
-// Rate structure by index in row
 const ndrFormulas = [
   // Short-Term Admissions per 1,000 Enrollee Months
   {
@@ -68,22 +67,39 @@ const ndrFormulas = [
   },
 ];
 
-export const data: DataDrivenTypes.PerformanceMeasure = {
-  questionText: [
-    "The number of admissions to an institutional facility among Health Home enrollees age 18 and older residing in the community for at least one month. The number of short-, medium-, or long-term admissions is reported per 1,000 enrollee months. Enrollee months reflect the total number of months each enrollee is enrolled in the program and residing in the community for at least one day of the month.",
-  ],
-  questionListItems: [
-    " The rate of admissions resulting in a short-term stay (1 to 20 days) per 1,000 enrollee months.",
-    " The rate of admissions resulting in a medium-term stay (21 to 100 days) per 1,000 enrollee months.",
-    " The rate of admissions resulting in a long-term stay (greater than or equal to 101 days) per 1,000 enrollee months.",
-  ],
-  questionListTitles: ["Short-Term Stay", "Medium-Term Stay", "Long-Term Stay"],
-  questionSubtext: [
-    "The following three rates are reported across four age groups (ages 18 to 64, ages 65 to 74, ages 75 to 84, and age 85 and older):",
-  ],
-  measureName,
-  inputFieldNames,
-  ndrFormulas,
-  categories,
-  qualifiers,
+export const data: MeasureTemplateData = {
+  type: "CMS",
+  coreset: "health",
+  performanceMeasure: {
+    questionText: [
+      "The number of admissions to an institutional facility among Health Home enrollees age 18 and older residing in the community for at least one month. The number of short-, medium-, or long-term admissions is reported per 1,000 enrollee months. Enrollee months reflect the total number of months each enrollee is enrolled in the program and residing in the community for at least one day of the month.",
+    ],
+    questionListItems: [
+      " The rate of admissions resulting in a short-term stay (1 to 20 days) per 1,000 enrollee months.",
+      " The rate of admissions resulting in a medium-term stay (21 to 100 days) per 1,000 enrollee months.",
+      " The rate of admissions resulting in a long-term stay (greater than or equal to 101 days) per 1,000 enrollee months.",
+    ],
+    questionListTitles: [
+      "Short-Term Stay",
+      "Medium-Term Stay",
+      "Long-Term Stay",
+    ],
+    questionSubtext: [
+      "The following three rates are reported across four age groups (ages 18 to 64, ages 65 to 74, ages 75 to 84, and age 85 and older):",
+    ],
+    categories,
+    qualifiers,
+    measureName: "AIFHH",
+    inputFieldNames,
+    ndrFormulas,
+  },
+  custom: {
+    calcTotal: true,
+    customMask: xNumbersYDecimals(12, 1),
+    allowNumeratorGreaterThanDenominator: true,
+    RateComponent: ComplexRate,
+  },
+  opm: {
+    componentFlag: "AIF",
+  },
 };

services/ui-src/src/measures/2021/AIFHH/validation.ts

@@ -42,7 +42,10 @@ const AIFHHValidation = (data: FormData) => {
     false
   );
   const didCalculationsDeviate = data[DC.DID_CALCS_DEVIATE] === DC.YES;
-  const performanceMeasureArray = GV.getPerfMeasureRateArray(data, PMD.data);
+  const performanceMeasureArray = GV.getPerfMeasureRateArray(
+    data,
+    PMD.data.performanceMeasure
+  );
   OPM = data[DC.OPM_RATES];
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
 

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

@@ -1,10 +1,10 @@
-import { DataDrivenTypes } from "shared/types";
+import { xNumbersYDecimals } from "utils";
 import { getCatQualLabels } from "../rateLabelText";
+import { MeasureTemplateData } from "shared/types/MeasureTemplate";
+import { ComplexRate } from "components";
 
 export const { categories, qualifiers } = getCatQualLabels("IU-HH");
 
-const measureName = "IUHH";
-
 const inputFieldNames = [
   {
     id: "Number of Enrollee Months",
@@ -30,7 +30,6 @@ const inputFieldNames = [
   },
 ];
 
-// Rate structure by index in row
 const ndrFormulas = [
   // Discharges per 1,000 Enrollee Months
   {
@@ -55,16 +54,29 @@ const ndrFormulas = [
   },
 ];
 
-export const data: DataDrivenTypes.PerformanceMeasure = {
-  customPrompt:
-    "Enter the appropriate data below. Completion of at least one set of Numerator/Denominator/Rate (numeric entry, other than zero) is required.",
-  questionText: [
-    "Rate of acute inpatient care and services (total, maternity, mental and behavioral disorders, surgery, and medicine) per 1,000 enrollee months among Health Home enrollees.",
-  ],
-  questionListItems: [],
-  measureName,
-  inputFieldNames,
-  ndrFormulas,
-  categories,
-  qualifiers,
+export const data: MeasureTemplateData = {
+  type: "CMS",
+  coreset: "health",
+  performanceMeasure: {
+    customPrompt:
+      "Enter the appropriate data below. Completion of at least one set of Numerator/Denominator/Rate (numeric entry, other than zero) is required.",
+    questionText: [
+      "Rate of acute inpatient care and services (total, maternity, mental and behavioral disorders, surgery, and medicine) per 1,000 enrollee months among Health Home enrollees.",
+    ],
+    questionListItems: [],
+    categories,
+    qualifiers,
+    inputFieldNames,
+    ndrFormulas,
+    measureName: "IUHH",
+  },
+  custom: {
+    calcTotal: true,
+    customMask: xNumbersYDecimals(12, 1),
+    allowNumeratorGreaterThanDenominator: true,
+    RateComponent: ComplexRate,
+  },
+  opm: {
+    componentFlag: "IU",
+  },
 };

services/ui-src/src/measures/2021/IUHH/validation.ts

@@ -39,7 +39,10 @@ const IUHHValidation = (data: FormData) => {
     false
   );
   const didCalculationsDeviate = data[DC.DID_CALCS_DEVIATE] === DC.YES;
-  const performanceMeasureArray = GV.getPerfMeasureRateArray(data, PMD.data);
+  const performanceMeasureArray = GV.getPerfMeasureRateArray(
+    data,
+    PMD.data.performanceMeasure
+  );
   OPM = data[DC.OPM_RATES];
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
 

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

@@ -10,18 +10,12 @@ the key should be the measure id as a string (with '-XX' included)
 const AMRAD = lazy(() =>
   import("./AMRAD").then((module) => ({ default: module.AMRAD }))
 );
-const AIFHH = lazy(() =>
-  import("./AIFHH").then((module) => ({ default: module.AIFHH }))
-);
 const CPAAD = lazy(() =>
   import("./CPAAD").then((module) => ({ default: module.CPAAD }))
 );
 const CPCCH = lazy(() =>
   import("./CPCCH").then((module) => ({ default: module.CPCCH }))
 );
-const IUHH = lazy(() =>
-  import("./IUHH").then((module) => ({ default: module.IUHH }))
-);
 const LBWCH = lazy(() =>
   import("./LBWCH").then((module) => ({ default: module.LBWCH }))
 );
@@ -48,7 +42,7 @@ const SSHH = lazy(() =>
 );
 const twentyTwentyOneMeasures = {
   "ADD-CH": measureTemplate,
-  "AIF-HH": AIFHH,
+  "AIF-HH": measureTemplate,
   "AMB-CH": measureTemplate,
   "AMB-HH": measureTemplate,
   "AMM-AD": measureTemplate,
@@ -88,7 +82,7 @@ const twentyTwentyOneMeasures = {
   "IET-AD": measureTemplate,
   "IET-HH": measureTemplate,
   "IMA-CH": measureTemplate,
-  "IU-HH": IUHH,
+  "IU-HH": measureTemplate,
   "LBW-CH": LBWCH,
   "LRCD-CH": LRCDCH,
   "MSC-AD": MSCAD,