@ampath/esm-reports-app 1.0.0-next.41 → 1.0.0-next.45

package/src/reports/moh-740/moh-740.resource.ts

@@ -15,12 +15,17 @@ export async function fetchMoh740Report(params: Moh740Dto): Promise<Moh740Data |
   const etlBaseUrl = await getEtlBaseUrl();
   const moh740Url = `${etlBaseUrl}/${baseMoh740Url}?endDate=${params.endDate}&locationUuids=${params.locationUuid}`;
   const resp = await openmrsFetch(moh740Url);
-  const data: Moh740Resp = await resp.json();
-  if (data && data.result) {
-    return data.result[0];
-  } else {
-    return null;
+
+  /* Without this a 404 or a 500 falls through to `null`, which the report then
+     renders as "no report generated yet" -- indistinguishable from never
+     having pressed Generate. Throwing lets the failure reach the snackbar. */
+  if (!resp.ok) {
+    throw new Error(`Failed to fetch the MOH-740 report: ${resp.status} ${resp.statusText}`);
   }
+
+  const data: Moh740Resp = await resp.json();
+
+  return data?.result?.[0] ?? null;
 }
 
 export async function fetchMoh740Register(params: Moh740RegisterDto): Promise<Moh270Patient[]> {
@@ -33,10 +38,12 @@ export async function fetchMoh740Register(params: Moh740RegisterDto): Promise<Mo
   const queryString = new URLSearchParams(p).toString();
   const moh740RegisterUrl = `${etlBaseUrl}/${baseMoh740Url}/patient-list`;
   const resp = await openmrsFetch(`${moh740RegisterUrl}?${queryString}`);
-  const data: Moh740RegisterResp = await resp.json();
-  if (data && data.result) {
-    return data.result;
-  } else {
-    return [];
+
+  if (!resp.ok) {
+    throw new Error(`Failed to fetch the MOH-740 register: ${resp.status} ${resp.statusText}`);
   }
+
+  const data: Moh740RegisterResp = await resp.json();
+
+  return data?.result ?? [];
 }

package/src/reports/moh-740/registers/moh-222-daily-register/moh-222-daily-register.tsx

@@ -1,104 +1,85 @@
-import React, { useMemo } from 'react';
-import styles from './moh-222-daily-register.scss';
+import React from 'react';
 import { type Moh222Patient } from '../../types';
-import { formatIndicatorName } from '../../shared/utils/format-indicator';
+import styles from '../../../../common/report-register/register-table.scss';
+import classNames from 'classnames';
 import { Link, Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from '@carbon/react';
 interface Moh222DailyRegisterProps {
   moh222PatientList: Moh222Patient[];
-  indicator: string;
 }
-const Moh222DailyRegister: React.FC<Moh222DailyRegisterProps> = ({ moh222PatientList, indicator }) => {
-  const pageTitle = useMemo(() => formatIndicatorName(indicator ?? ''), [indicator]);
-  const reportTitle = 'Daily Activity Register - MOH 222';
-  if (!moh222PatientList) {
-    return <>No Data to display</>;
-  }
+const Moh222DailyRegister: React.FC<Moh222DailyRegisterProps> = ({ moh222PatientList }) => {
   return (
-    <>
-      <div className={styles.registerLayout}>
-        <div className={styles.registerHeader}>
-          <h4 className={styles.pageTitle}>{reportTitle}</h4>
-          <h6 className={styles.pageTitle}>{pageTitle}</h6>
-        </div>
-        <div className={styles.content}>
-
-          <Table>
-            <TableHead>
-              <TableRow>
-                <TableHeader>No</TableHeader>
-                <TableHeader>Date</TableHeader>
-                <TableHeader>Patient No</TableHeader>
-                <TableHeader>Patient Name</TableHeader>
-                <TableHeader>Age</TableHeader>
-                <TableHeader>D.O.B</TableHeader>
-                <TableHeader>Sex(M/F)</TableHeader>
-                <TableHeader>Visit for the month</TableHeader>
-                <TableHeader>Weight(Kg)</TableHeader>
-                <TableHeader>Height(cm)</TableHeader>
-                <TableHeader>BMI</TableHeader>
-                <TableHeader>Waist Circumference</TableHeader>
-                <TableHeader>BP(mmHg)</TableHeader>
-                <TableHeader>HTN</TableHeader>
-                <TableHeader>Diabetes</TableHeader>
-                <TableHeader>Both Diabetes and Hypetention(HTN)</TableHeader>
-                <TableHeader>RBS(mmol/L)</TableHeader>
-                <TableHeader>FBS(mmol/L)</TableHeader>
-                <TableHeader>HbA1C(%) within 3 months</TableHeader>
-                <TableHeader>Complications/Co-morbidities at enrollment(2)</TableHeader>
-                <TableHeader>Treatment</TableHeader>
-                <TableHeader>Diabetic Foot Screening</TableHeader>
-                <TableHeader>Diabetic Foot(New,Known,Nill)</TableHeader>
-                <TableHeader>Foot Risk Assessment</TableHeader>
-                <TableHeader>Footcare Outcome</TableHeader>
-                <TableHeader>Screened for TB</TableHeader>
-                <TableHeader>TB Status after Screening</TableHeader>
-                <TableHeader>Active NHIF(Y/N)</TableHeader>
-              </TableRow>
-            </TableHead>
-            <TableBody>
-              {moh222PatientList.map((p, index) => (
-                <TableRow key={p.patient_uuid}>
-                  <TableCell>{index + 1}</TableCell>
-                  <TableCell>{p.encounter_date}</TableCell>
-                  <TableCell>{p.amrs_universal_id}</TableCell>
-                  <TableCell>
-                    <Link href={`${window.spaBase}/patient/${p.patient_uuid}/chart/`}>
-                      {p.person_name}
-                    </Link>
-                  </TableCell>
-                  <TableCell>{p.age}</TableCell>
-                  <TableCell>{p.birthdate}</TableCell>
-                  <TableCell>{p.gender}</TableCell>
-                  <TableCell>{p.visit_for_the_month}</TableCell>
-                  <TableCell>{p.weight}</TableCell>
-                  <TableCell>{p.height}</TableCell>
-                  <TableCell>{p.bmi}</TableCell>
-                  <TableCell>{p.waist_circumference}</TableCell>
-                  <TableCell>{p.bp}</TableCell>
-                  <TableCell>{p.htn}</TableCell>
-                  <TableCell>{p.diabetes}</TableCell>
-                  <TableCell>{p.both_htn_and_diabetic}</TableCell>
-                  <TableCell>{p.rbs}</TableCell>
-                  <TableCell>{p.fbs}</TableCell>
-                  <TableCell>{p.hba1c}</TableCell>
-                  <TableCell>{p.complications_at_enrollment}</TableCell>
-                  <TableCell>{p.treatment}</TableCell>
-                  <TableCell>{p.diabetic_foot_screening}</TableCell>
-                  <TableCell>{p.diabetic_foot}</TableCell>
-                  <TableCell>{p.foot_risk_assessment}</TableCell>
-                  <TableCell>{p.footcare_outcome}</TableCell>
-                  <TableCell>{p.screened_for_tb}</TableCell>
-                  <TableCell>{p.tbs_status}</TableCell>
-                  <TableCell>{p.covered_by_shif ? 'Y' : 'N'}</TableCell>
-                </TableRow>
-              ))}
-            </TableBody>
-          </Table>
-
-        </div>
-
-      </div>
-
-    </>)
+    <div className={styles.tableContainer}>
+      <Table className={classNames(styles.table, styles.tableBordered, styles.tableStriped)}>
+        <TableHead>
+          <TableRow>
+            <TableHeader>No</TableHeader>
+            <TableHeader>Date</TableHeader>
+            <TableHeader>Patient No</TableHeader>
+            <TableHeader>Patient Name</TableHeader>
+            <TableHeader>Age</TableHeader>
+            <TableHeader>D.O.B</TableHeader>
+            <TableHeader>Sex(M/F)</TableHeader>
+            <TableHeader>Visit for the month</TableHeader>
+            <TableHeader>Weight(Kg)</TableHeader>
+            <TableHeader>Height(cm)</TableHeader>
+            <TableHeader>BMI</TableHeader>
+            <TableHeader>Waist Circumference</TableHeader>
+            <TableHeader>BP(mmHg)</TableHeader>
+            <TableHeader>HTN</TableHeader>
+            <TableHeader>Diabetes</TableHeader>
+            <TableHeader>Both Diabetes and Hypetention(HTN)</TableHeader>
+            <TableHeader>RBS(mmol/L)</TableHeader>
+            <TableHeader>FBS(mmol/L)</TableHeader>
+            <TableHeader>HbA1C(%) within 3 months</TableHeader>
+            <TableHeader>Complications/Co-morbidities at enrollment(2)</TableHeader>
+            <TableHeader>Treatment</TableHeader>
+            <TableHeader>Diabetic Foot Screening</TableHeader>
+            <TableHeader>Diabetic Foot(New,Known,Nill)</TableHeader>
+            <TableHeader>Foot Risk Assessment</TableHeader>
+            <TableHeader>Footcare Outcome</TableHeader>
+            <TableHeader>Screened for TB</TableHeader>
+            <TableHeader>TB Status after Screening</TableHeader>
+            <TableHeader>Active NHIF(Y/N)</TableHeader>
+          </TableRow>
+        </TableHead>
+        <TableBody>
+          {moh222PatientList.map((p, index) => (
+            <TableRow key={p.patient_uuid}>
+              <TableCell>{index + 1}</TableCell>
+              <TableCell>{p.encounter_date}</TableCell>
+              <TableCell>{p.amrs_universal_id}</TableCell>
+              <TableCell>
+                <Link href={`${window.spaBase}/patient/${p.patient_uuid}/chart/`}>{p.person_name}</Link>
+              </TableCell>
+              <TableCell>{p.age}</TableCell>
+              <TableCell>{p.birthdate}</TableCell>
+              <TableCell>{p.gender}</TableCell>
+              <TableCell>{p.visit_for_the_month}</TableCell>
+              <TableCell>{p.weight}</TableCell>
+              <TableCell>{p.height}</TableCell>
+              <TableCell>{p.bmi}</TableCell>
+              <TableCell>{p.waist_circumference}</TableCell>
+              <TableCell>{p.bp}</TableCell>
+              <TableCell>{p.htn}</TableCell>
+              <TableCell>{p.diabetes}</TableCell>
+              <TableCell>{p.both_htn_and_diabetic}</TableCell>
+              <TableCell>{p.rbs}</TableCell>
+              <TableCell>{p.fbs}</TableCell>
+              <TableCell>{p.hba1c}</TableCell>
+              <TableCell>{p.complications_at_enrollment}</TableCell>
+              <TableCell>{p.treatment}</TableCell>
+              <TableCell>{p.diabetic_foot_screening}</TableCell>
+              <TableCell>{p.diabetic_foot}</TableCell>
+              <TableCell>{p.foot_risk_assessment}</TableCell>
+              <TableCell>{p.footcare_outcome}</TableCell>
+              <TableCell>{p.screened_for_tb}</TableCell>
+              <TableCell>{p.tbs_status}</TableCell>
+              <TableCell>{p.covered_by_shif ? 'Y' : 'N'}</TableCell>
+            </TableRow>
+          ))}
+        </TableBody>
+      </Table>
+    </div>
+  );
 };
 export default Moh222DailyRegister;

package/src/reports/moh-740/registers/moh-270-permanent-register/moh-270-permanent-register.tsx

@@ -1,79 +1,59 @@
 import { Link, Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from '@carbon/react';
-import React, { useMemo } from 'react';
+import React from 'react';
 import { type Moh270Patient } from '../../types';
-import { formatIndicatorName } from '../../shared/utils/format-indicator';
-import styles from './moh-270-permanent-register.scss';
+import styles from '../../../../common/report-register/register-table.scss';
+import classNames from 'classnames';
 interface Moh270DailyRegisterProps {
   moh270PatientList: Moh270Patient[];
-  indicator: string;
 }
-const Moh270DailyRegister: React.FC<Moh270DailyRegisterProps> = ({ moh270PatientList, indicator }) => {
-  const pageTitle = useMemo(() => formatIndicatorName(indicator ?? ''), [indicator]);
-  const reportTitle = 'Permanent Register - MOH 270';
-  if (!moh270PatientList) {
-    return <>No Data to display</>;
-  }
+const Moh270DailyRegister: React.FC<Moh270DailyRegisterProps> = ({ moh270PatientList }) => {
   return (
-    <>
-      <div className={styles.registerLayout}>
-        <div className={styles.registerHeader}>
-          <h4 className={styles.pageTitle}>{reportTitle}</h4>
-          <h6 className={styles.pageTitle}>{pageTitle}</h6>
-        </div>
-        <div className={styles.content}>
-
-          <Table>
-            <TableHead>
-              <TableRow>
-                <TableHeader>No</TableHeader>
-                <TableHeader>Date</TableHeader>
-                <TableHeader>Patient No</TableHeader>
-                <TableHeader>Name</TableHeader>
-                <TableHeader>D.O.B</TableHeader>
-                <TableHeader>Sex(M/F)</TableHeader>
-                <TableHeader>Telephone No</TableHeader>
-                <TableHeader>Sub County</TableHeader>
-                <TableHeader>Village/Estate</TableHeader>
-                <TableHeader>Landmark</TableHeader>
-                <TableHeader>Treatment supporter</TableHeader>
-                <TableHeader>Diagnosis at enrolment</TableHeader>
-                <TableHeader>Year of diagnosis</TableHeader>
-                <TableHeader>Complications/Co-morbidities at enrollment(2)</TableHeader>
-                <TableHeader>NHIF(Y/N)</TableHeader>
-              </TableRow>
-            </TableHead>
-            <TableBody>
-              {moh270PatientList.map((p, index) => (
-                <TableRow key={p.patient_uuid}>
-                  <TableCell>{index + 1}</TableCell>
-                  <TableCell>{p.encounter_date}</TableCell>
-                  <TableCell>{p.amrs_universal_id}</TableCell>
-                  <TableCell>
-                    <Link href={`${window.spaBase}/patient/${p.patient_uuid}/chart/`}>
-                      {p.person_name}
-                    </Link>
-                  </TableCell>
-                  <TableCell>{p.birthdate}</TableCell>
-                  <TableCell>{p.gender}</TableCell>
-                  <TableCell>{p.phone_number}</TableCell>
-                  <TableCell>{p.sub_county}</TableCell>
-                  <TableCell>{p.ward}</TableCell>
-                  <TableCell>{p.landmark}</TableCell>
-                  <TableCell>{p.contact_of_the_treatment_supporter_and_relationship ?? ''}</TableCell>
-                  <TableCell>{p.diagnosis_at_enrolment ?? ''}</TableCell>
-                  <TableCell>{p.diagnosis_year ?? ''}</TableCell>
-                  <TableCell>{p.complications_at_enrollment ?? ''}</TableCell>
-                  <TableCell>{p.covered_by_shif ? 'Y' : 'N'}</TableCell>
-                </TableRow>
-              ))}
-            </TableBody>
-          </Table>
-
-        </div>
-
-      </div>
-
-    </>
+    <div className={styles.tableContainer}>
+      <Table className={classNames(styles.table, styles.tableBordered, styles.tableStriped)}>
+        <TableHead>
+          <TableRow>
+            <TableHeader>No</TableHeader>
+            <TableHeader>Date</TableHeader>
+            <TableHeader>Patient No</TableHeader>
+            <TableHeader>Name</TableHeader>
+            <TableHeader>D.O.B</TableHeader>
+            <TableHeader>Sex(M/F)</TableHeader>
+            <TableHeader>Telephone No</TableHeader>
+            <TableHeader>Sub County</TableHeader>
+            <TableHeader>Village/Estate</TableHeader>
+            <TableHeader>Landmark</TableHeader>
+            <TableHeader>Treatment supporter</TableHeader>
+            <TableHeader>Diagnosis at enrolment</TableHeader>
+            <TableHeader>Year of diagnosis</TableHeader>
+            <TableHeader>Complications/Co-morbidities at enrollment(2)</TableHeader>
+            <TableHeader>NHIF(Y/N)</TableHeader>
+          </TableRow>
+        </TableHead>
+        <TableBody>
+          {moh270PatientList.map((p, index) => (
+            <TableRow key={p.patient_uuid}>
+              <TableCell>{index + 1}</TableCell>
+              <TableCell>{p.encounter_date}</TableCell>
+              <TableCell>{p.amrs_universal_id}</TableCell>
+              <TableCell>
+                <Link href={`${window.spaBase}/patient/${p.patient_uuid}/chart/`}>{p.person_name}</Link>
+              </TableCell>
+              <TableCell>{p.birthdate}</TableCell>
+              <TableCell>{p.gender}</TableCell>
+              <TableCell>{p.phone_number}</TableCell>
+              <TableCell>{p.sub_county}</TableCell>
+              <TableCell>{p.ward}</TableCell>
+              <TableCell>{p.landmark}</TableCell>
+              <TableCell>{p.contact_of_the_treatment_supporter_and_relationship ?? ''}</TableCell>
+              <TableCell>{p.diagnosis_at_enrolment ?? ''}</TableCell>
+              <TableCell>{p.diagnosis_year ?? ''}</TableCell>
+              <TableCell>{p.complications_at_enrollment ?? ''}</TableCell>
+              <TableCell>{p.covered_by_shif ? 'Y' : 'N'}</TableCell>
+            </TableRow>
+          ))}
+        </TableBody>
+      </Table>
+    </div>
   );
 };
 export default Moh270DailyRegister;

package/src/reports/moh-740/registers/moh-740-patient-list.tsx

@@ -2,65 +2,94 @@ import React, { useEffect, useState } from 'react';
 import { type Moh222Patient, type Moh270Patient } from '../types';
 import { fetchMoh740Register } from '../moh-740.resource';
 import Moh270DailyRegister from './moh-270-permanent-register/moh-270-permanent-register';
-import { InlineLoading } from '@carbon/react';
 import { Moh740Rgisters } from '../shared/utils/indicator-register-map';
 import Moh222DailyRegister from './moh-222-daily-register/moh-222-daily-register';
+import { MOH_222_COLUMNS, MOH_270_COLUMNS } from './moh-740.columns';
+import { RegisterLayout } from '../../../common/report-register';
+import { showReportError } from '../../../common/report-error';
+
 interface Moh740PatientListProps {
   locationUuid: string;
   reportingMonth: string;
   indicators: string;
   register: string;
+  /** Puts the report back; these registers are a view on its own route */
+  onBack: () => void;
 }
-const Moh740PatientList: React.FC<Moh740PatientListProps> = ({ locationUuid, reportingMonth, indicators, register }) => {
+
+const Moh740PatientList: React.FC<Moh740PatientListProps> = ({
+  locationUuid,
+  reportingMonth,
+  indicators,
+  register,
+  onBack,
+}) => {
   const [moh270patientList, setMoh270PatientList] = useState<Moh270Patient[]>([]);
   const [loading, setIsLoading] = useState<boolean>(false);
   const [moh222PatientList, setMoh222PatientList] = useState<Moh222Patient[]>([]);
 
+  const isDaily = register === Moh740Rgisters.DailyRegister;
+
   useEffect(() => {
     if (locationUuid && reportingMonth && indicators) {
       fethPatientList();
     }
-  }, [locationUuid, reportingMonth, indicators,register]);
+  }, [locationUuid, reportingMonth, indicators, register]);
+
   async function fethPatientList() {
     setIsLoading(true);
-    const resp = await fetchMoh740Register({
-      locationUuid: locationUuid,
-      endDate: reportingMonth,
-      indicators: indicators,
-    });
 
-    setIsLoading(false);
+    try {
+      const resp = await fetchMoh740Register({
+        locationUuid: locationUuid,
+        endDate: reportingMonth,
+        indicators: indicators,
+      });
 
-    if (resp) {
-      if (register === Moh740Rgisters.DailyRegister) {
-        setMoh222PatientList(resp as any);
-        setMoh270PatientList([]);
-      }
-      if (register === Moh740Rgisters.PermanentRegister) {
-        setMoh270PatientList(resp);
-        setMoh222PatientList([]);
+      if (resp) {
+        if (register === Moh740Rgisters.DailyRegister) {
+          setMoh222PatientList(resp as any);
+          setMoh270PatientList([]);
+        }
+        if (register === Moh740Rgisters.PermanentRegister) {
+          setMoh270PatientList(resp);
+          setMoh222PatientList([]);
+        }
       }
-
+    } catch (error) {
+      /* Without this a failed fetch left an empty list, which reads on screen
+         as "no clients matched" rather than as a request that did not land. */
+      setMoh222PatientList([]);
+      setMoh270PatientList([]);
+      showReportError('the register', error);
+    } finally {
+      setIsLoading(false);
     }
   }
+
   if (!locationUuid || !reportingMonth || !indicators) {
     return <></>;
   }
-  if (loading) {
-    return <InlineLoading description="Fetching patient list..." />;
-  }
-  return <>
 
-    {
-      moh270patientList && register === Moh740Rgisters.PermanentRegister && <Moh270DailyRegister indicator={indicators} moh270PatientList={moh270patientList} />
-    }
-    {
-      moh222PatientList && register === Moh740Rgisters.DailyRegister && <Moh222DailyRegister
-        moh222PatientList={moh222PatientList}
-        indicator={indicators}
-      />
-    }
-  </>;
+  const rows: Array<Record<string, any>> = isDaily ? moh222PatientList : moh270patientList;
+
+  return (
+    <RegisterLayout
+      parentLabel="MOH-740 Report"
+      onBack={onBack}
+      title={isDaily ? 'Daily Activity Register - MOH 222' : 'Permanent Register - MOH 270'}
+      isLoading={loading}
+      isEmpty={rows.length === 0}
+      columns={isDaily ? MOH_222_COLUMNS : MOH_270_COLUMNS}
+      fetchAll={async () => rows}
+    >
+      {isDaily ? (
+        <Moh222DailyRegister moh222PatientList={moh222PatientList} />
+      ) : (
+        <Moh270DailyRegister moh270PatientList={moh270patientList} />
+      )}
+    </RegisterLayout>
+  );
 };
 
 export default Moh740PatientList;

package/src/reports/moh-740/registers/moh-740.columns.ts

@@ -0,0 +1,52 @@
+import { type RegisterColumn } from '../../../common/report-register';
+
+/** MOH 222, in the order the register prints its columns */
+export const MOH_222_COLUMNS: RegisterColumn[] = [
+  { header: 'No', value: (_row, index) => index + 1 },
+  { header: 'Date', value: (r) => r.encounter_date ?? '' },
+  { header: 'Patient No', value: (r) => r.amrs_universal_id ?? '' },
+  { header: 'Patient Name', value: (r) => r.person_name ?? '' },
+  { header: 'Age', value: (r) => r.age ?? '' },
+  { header: 'D.O.B', value: (r) => r.birthdate ?? '' },
+  { header: 'Sex(M/F)', value: (r) => r.gender ?? '' },
+  { header: 'Visit for the month', value: (r) => r.visit_for_the_month ?? '' },
+  { header: 'Weight(Kg)', value: (r) => r.weight ?? '' },
+  { header: 'Height(cm)', value: (r) => r.height ?? '' },
+  { header: 'BMI', value: (r) => r.bmi ?? '' },
+  { header: 'Waist Circumference', value: (r) => r.waist_circumference ?? '' },
+  { header: 'BP(mmHg)', value: (r) => r.bp ?? '' },
+  { header: 'HTN', value: (r) => r.htn ?? '' },
+  { header: 'Diabetes', value: (r) => r.diabetes ?? '' },
+  { header: 'Both Diabetes and Hypetention(HTN)', value: (r) => r.both_htn_and_diabetic ?? '' },
+  { header: 'RBS(mmol/L)', value: (r) => r.rbs ?? '' },
+  { header: 'FBS(mmol/L)', value: (r) => r.fbs ?? '' },
+  { header: 'HbA1C(%) within 3 months', value: (r) => r.hba1c ?? '' },
+  { header: 'Complications/Co-morbidities at enrollment(2)', value: (r) => r.complications_at_enrollment ?? '' },
+  { header: 'Treatment', value: (r) => r.treatment ?? '' },
+  { header: 'Diabetic Foot Screening', value: (r) => r.diabetic_foot_screening ?? '' },
+  { header: 'Diabetic Foot(New,Known,Nill)', value: (r) => r.diabetic_foot ?? '' },
+  { header: 'Foot Risk Assessment', value: (r) => r.foot_risk_assessment ?? '' },
+  { header: 'Footcare Outcome', value: (r) => r.footcare_outcome ?? '' },
+  { header: 'Screened for TB', value: (r) => r.screened_for_tb ?? '' },
+  { header: 'TB Status after Screening', value: (r) => r.tbs_status ?? '' },
+  { header: 'Active NHIF(Y/N)', value: (r) => (r.covered_by_shif ? 'Y' : 'N') },
+];
+
+/** MOH 270, in the order the register prints its columns */
+export const MOH_270_COLUMNS: RegisterColumn[] = [
+  { header: 'No', value: (_row, index) => index + 1 },
+  { header: 'Date', value: (r) => r.encounter_date ?? '' },
+  { header: 'Patient No', value: (r) => r.amrs_universal_id ?? '' },
+  { header: 'Name', value: (r) => r.person_name ?? '' },
+  { header: 'D.O.B', value: (r) => r.birthdate ?? '' },
+  { header: 'Sex(M/F)', value: (r) => r.gender ?? '' },
+  { header: 'Telephone No', value: (r) => r.phone_number ?? '' },
+  { header: 'Sub County', value: (r) => r.sub_county ?? '' },
+  { header: 'Village/Estate', value: (r) => r.ward ?? '' },
+  { header: 'Landmark', value: (r) => r.landmark ?? '' },
+  { header: 'Treatment supporter', value: (r) => r.contact_of_the_treatment_supporter_and_relationship ?? '' },
+  { header: 'Diagnosis at enrolment', value: (r) => r.diagnosis_at_enrolment ?? '' },
+  { header: 'Year of diagnosis', value: (r) => r.diagnosis_year ?? '' },
+  { header: 'Complications/Co-morbidities at enrollment(2)', value: (r) => r.complications_at_enrollment ?? '' },
+  { header: 'NHIF(Y/N)', value: (r) => (r.covered_by_shif ? 'Y' : 'N') },
+];

package/src/reports/moh-740/shared/utils/indicator-register-map.ts

@@ -14,7 +14,7 @@ const Moh740DIncatorRegisterMap: Record <RegisterKeys, string> = {
   sub_county: '',
   reportingMonth: '',
   cumulative_diabetes_patients_in_care: Moh740Rgisters.PermanentRegister,
-  newly_diagnosed_diabetes: Moh740Rgisters.DailyRegister,
+  newly_diagnosed_diabetes_this_month: Moh740Rgisters.DailyRegister,
   total_type_1_diabetes: Moh740Rgisters.DailyRegister,
   total_type_2_diabetes: Moh740Rgisters.DailyRegister,
   cumulative_htn_patient: Moh740Rgisters.PermanentRegister,
@@ -50,8 +50,8 @@ const Moh740DIncatorRegisterMap: Record <RegisterKeys, string> = {
   dc__age_range__61_and_above__type_2_diabetes_mellitus:Moh740Rgisters.DailyRegister,
   dc__gender__M__cumulative_diabetes_patients_in_care: Moh740Rgisters.PermanentRegister,
   dc__gender__F__cumulative_diabetes_patients_in_care: Moh740Rgisters.PermanentRegister,
-  dc__gender__M__newly_diagnosed_diabetes: Moh740Rgisters.DailyRegister,
-  dc__gender__F__newly_diagnosed_diabetes: Moh740Rgisters.DailyRegister,
+  dc__gender__M__newly_diagnosed_diabetes_this_month: Moh740Rgisters.DailyRegister,
+  dc__gender__F__newly_diagnosed_diabetes_this_month: Moh740Rgisters.DailyRegister,
   dc__gender__M__revisit_to_clinic_known_dm: Moh740Rgisters.DailyRegister,
   dc__gender__F__revisit_to_clinic_known_dm: Moh740Rgisters.DailyRegister,
   dc__gender__M__total_type_1_diabetes: Moh740Rgisters.DailyRegister,

package/src/reports/moh-740/types/index.ts

@@ -13,7 +13,7 @@ export type Moh740Data = {
   sub_county: string;
   reportingMonth: string;
   cumulative_diabetes_patients_in_care: number;
-  newly_diagnosed_diabetes: number;
+  newly_diagnosed_diabetes_this_month: number;
   total_type_1_diabetes: number;
   total_type_2_diabetes: number;
   cumulative_htn_patient: number;
@@ -49,8 +49,8 @@ export type Moh740Data = {
   dc__age_range__61_and_above__type_2_diabetes_mellitus:number;
   dc__gender__M__cumulative_diabetes_patients_in_care: number;
   dc__gender__F__cumulative_diabetes_patients_in_care: number;
-  dc__gender__M__newly_diagnosed_diabetes: number;
-  dc__gender__F__newly_diagnosed_diabetes: number;
+  dc__gender__M__newly_diagnosed_diabetes_this_month: number;
+  dc__gender__F__newly_diagnosed_diabetes_this_month: number;
   dc__gender__M__revisit_to_clinic_known_dm: number;
   dc__gender__F__revisit_to_clinic_known_dm: number;
   dc__gender__M__total_type_1_diabetes: number;