merge conflict + PR feedback

Enterprise-CMCS · Dec 4, 2024 · 50d2fed · 50d2fed
2 parents 7494ac0 + b98aad3
commit 50d2fed
Show file tree

Hide file tree

Showing 5 changed files with 79 additions and 12 deletions.
diff --git a/services/app-api/forms/qm.ts b/services/app-api/forms/qm.ts
@@ -154,17 +154,42 @@ export const qmReportTemplate: ReportTemplate = {
     },
   ],
   measureLookup: {
+    // TODO: wtf is default and are there any other kinds of measures?
     defaultMeasures: [
       {
-        cmit: 123,
+        cmit: 960,
         required: true,
         stratified: false,
-        measureTemplate: MeasureTemplateName.StandardMeasure,
+        measureTemplate: MeasureTemplateName["LTSS-1"],
+      },
+      {
+        cmit: 961,
+        required: true,
+        stratified: false,
+        measureTemplate: MeasureTemplateName["LTSS-2"],
+      },
+      {
+        cmit: 20,
+        required: true,
+        stratified: false,
+        measureTemplate: MeasureTemplateName["LTSS-6"],
+      },
+      {
+        cmit: 968,
+        required: true,
+        stratified: false,
+        measureTemplate: MeasureTemplateName["LTSS-7"],
+      },
+      {
+        cmit: 414,
+        required: true,
+        stratified: false,
+        measureTemplate: MeasureTemplateName["LTSS-8"],
       },
       {
         cmit: 234,
         required: false,
-        stratified: true,
+        stratified: false,
         measureTemplate: MeasureTemplateName.StandardMeasure,
       },
     ],
@@ -211,5 +236,42 @@ export const qmReportTemplate: ReportTemplate = {
         },
       ],
     },
+    [MeasureTemplateName["LTSS-1"]]: {
+      id: "LTSS-1",
+      title: "LTSS-1: Comprehensive Assessment and Update",
+      type: PageType.Measure,
+      substitutable: true,
+      sidebar: false,
+      elements: [],
+    },
+    [MeasureTemplateName["LTSS-2"]]: {
+      id: "LTSS-2",
+      title: "LTSS-2: Comprehensive Person-Centered Plan and Update",
+      type: PageType.Measure,
+      sidebar: false,
+      substitutable: true,
+      elements: [],
+    },
+    [MeasureTemplateName["LTSS-6"]]: {
+      id: "LTSS-6",
+      title: "LTSS-6: Admission to a Facility from the Community",
+      type: PageType.Measure,
+      sidebar: false,
+      elements: [],
+    },
+    [MeasureTemplateName["LTSS-7"]]: {
+      id: "LTSS-7",
+      title: "LTSS-7: Minimizing Facility Length of Stay",
+      type: PageType.Measure,
+      sidebar: false,
+      elements: [],
+    },
+    [MeasureTemplateName["LTSS-8"]]: {
+      id: "LTSS-8",
+      title: "LTSS-8: Successful Transition after Long-Term Facility Stay",
+      type: PageType.Measure,
+      sidebar: false,
+      elements: [],
+    },
   },
 };
diff --git a/services/app-api/types/reports.ts b/services/app-api/types/reports.ts
@@ -32,6 +32,11 @@ export interface MeasureOptions {
 
 export enum MeasureTemplateName {
   StandardMeasure,
+  "LTSS-1",
+  "LTSS-2",
+  "LTSS-6",
+  "LTSS-7",
+  "LTSS-8",
 }
 
 export enum ReportStatus {
@@ -56,6 +61,7 @@ export interface MeasurePageTemplate extends FormPageTemplate {
   required?: boolean;
   stratified?: boolean;
   optional?: boolean;
+  substitutable?: boolean;
 }
 
 export interface SectionTemplate {

diff --git a/services/ui-src/src/components/pages/Dashboard/DashboardPage.tsx b/services/ui-src/src/components/pages/Dashboard/DashboardPage.tsx
@@ -40,12 +40,7 @@ export const DashboardPage = () => {
       return;
     }
 
-    (async () => {
-      setIsLoading(true);
-      const result = await getReportsForState(reportType, state);
-      setReports(result);
-      setIsLoading(false);
-    })();
+    reloadReports(reportType, state);
   }, [reportType, state]);
 
   const reloadReports = (reportType: string, state: string) => {

diff --git a/services/ui-src/src/components/report/MeasureTable.tsx b/services/ui-src/src/components/report/MeasureTable.tsx
@@ -55,10 +55,13 @@ export const MeasureTableElement = (props: PageElementProps) => {
           <Text>CMIT# {measure.cmit}</Text>
         </Td>
         <Td>
-          <Link onClick={() => buildModal(measure.cmit)}>
-            Substitute measure
-          </Link>
+          {measure.substitutable ? (
+            <Link onClick={() => buildModal(measure.cmit)}>
+              Substitute measure
+            </Link>
+          ) : null}
         </Td>
+
         <Td>
           <Button
             variant="outline"

diff --git a/services/ui-src/src/types/report.ts b/services/ui-src/src/types/report.ts
@@ -80,6 +80,7 @@ export interface MeasurePageTemplate extends FormPageTemplate {
   required?: boolean;
   stratified?: boolean;
   optional?: boolean;
+  substitutable?: boolean;
 }
 
 export interface StatusPageTemplate extends FormPageTemplate {