@ampath/esm-reports-app 1.0.0-next.62 → 1.0.0-next.64

package/src/reports/moh-731/linelist/moh-731-linelist-sections.ts

@@ -408,15 +408,64 @@ export const MOH_731_LINELIST_SECTIONS = {
     fetchPatientList: getMoh366PatientList,
     columns: [cccNumber, name, nupi, sex, age, phoneNumber],
   },
+  /* 3.6 Nutrition and HIV (HV03-037 to HV03-060): one row per client, their
+     latest SAM / MAM status in the period, from the ETL's nutrition dataset
+     (service/moh-731/ver-2023/nutrition) */
   nutrition: {
     title: 'Nutrition and HIV',
     fetchPatientList: getMoh366PatientList,
-    columns: [cccNumber, name, nupi, sex, age, phoneNumber],
+    columns: [
+      {
+        header: 'Visit Date',
+        value: (row) => formatDate(row.encounter_date),
+        sortValue: (row) => row.encounter_date,
+      },
+      { header: 'Name', field: 'full_name' },
+      { header: 'CCC Number', field: 'ccc_number', text: true },
+      { header: 'NUPI', field: 'nupi', text: true },
+      { header: 'AMRS Number', field: 'amrs_number', text: true },
+      { header: 'Sex', field: 'gender' },
+      { header: 'Age', field: 'age' },
+      { header: 'Age (Months)', field: 'age_months', hidden: true },
+      { header: 'SAM / MAM', field: 'sam_mam' },
+      { header: 'Food Given', field: 'food_given' },
+      { header: 'Pregnant / Lactating', field: 'pregnant_lactating' },
+      { header: 'Current ARV Regimen', field: 'current_arv_regimen' },
+      { header: 'ARV Line', field: 'cur_arv_line', hidden: true },
+      {
+        header: 'ART Start Date',
+        value: (row) => formatDate(row.art_start_date),
+        sortValue: (row) => row.art_start_date,
+      },
+      { header: 'RTC Date', value: (row) => formatDate(row.rtc_date), sortValue: (row) => row.rtc_date },
+      { header: 'HIV Clinic', field: 'hiv_clinic', hidden: true },
+      { header: 'Encounter Type', field: 'encounter_type', hidden: true },
+      { header: 'Location', field: 'location' },
+      { header: 'Entered By', field: 'entered_by', hidden: true },
+    ],
   },
+  /* 5. Post Exposure Prophylaxis (HV05-01 to HV05-04): one row per exposure, from
+     the ETL's PEP dataset (service/moh-731/ver-2023/pep) */
   pep: {
     title: 'Post Exposure Prophylaxis',
     fetchPatientList: getMoh366PatientList,
-    columns: [cccNumber, name, nupi, sex, age, phoneNumber],
+    columns: [
+      {
+        header: 'Exposure Date',
+        value: (row) => formatDate(row.exposure_date),
+        sortValue: (row) => row.exposure_date,
+      },
+      { header: 'Name', field: 'full_name' },
+      { header: 'CCC Number', field: 'ccc_number', text: true },
+      { header: 'NUPI', field: 'nupi', text: true },
+      { header: 'AMRS Number', field: 'amrs_number', text: true },
+      { header: 'Sex', field: 'gender' },
+      { header: 'Age', field: 'age' },
+      { header: 'Exposure Type', field: 'exposure_type' },
+      { header: 'PEP Given', field: 'pep_given_status' },
+      { header: 'Location', field: 'location' },
+      { header: 'Entered By', field: 'entered_by' },
+    ],
   },
 } satisfies Record<string, Moh731LinelistSection>;
 

package/src/reports/moh-731/moh-731.component.tsx

@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
 
 import styles from './moh-731.scss';
 import { ReportFiltersComponent, type ReportPeriod } from '../../common/report-filters';
@@ -13,7 +13,7 @@ import HivTestingandPreExposusreProphylaxis from './sections/hiv-testing-and-pre
 import PmtctComponent from './sections/pmtct.component';
 import HivAndTBTreatmentComponent from './sections/hiv-and-tb-treatment.component';
 import { ReportSkeleton } from '../../common/report-skeleton';
-import { usePageScale } from '../../common/report-page';
+import { downloadSheetPdf, usePageScale } from '../../common/report-page';
 import Moh731Summary from './summary/moh-731-summary.component';
 import { useOpenMoh731Linelist } from './linelist/use-open-moh-731-linelist';
 
@@ -98,6 +98,20 @@ const Moh731Report: React.FC<Moh731Props> = () => {
   /** Fills the available width, never rendering below A4 */
   const { ref: viewportRef, scale } = usePageScale<HTMLDivElement>(SHEET_WIDTH_MM);
 
+  /* Download PDF saves the form whichever tab is open; the file is made from a
+     copy, so the sheet on screen is left as it is */
+  const formRef = useRef<HTMLDivElement>(null);
+  const downloadPdf = async () => {
+    if (!formRef.current) {
+      return;
+    }
+    const name = ['MOH-731', facility, startDate ? dayjs(startDate).format('YYYY-MM') : '']
+      .filter(Boolean)
+      .join('_')
+      .replace(/[^a-z0-9_-]+/gi, '-');
+    await downloadSheetPdf(formRef.current, `${name}.pdf`);
+  };
+
   const fetchMoh731ReportData = async ({ startDate, endDate }: ReportPeriod) => {
     setIsLoading(true);
     setStartDate(startDate);
@@ -129,6 +143,7 @@ const Moh731Report: React.FC<Moh731Props> = () => {
         isLoading={isLoading}
         isReportGenerated={isReportGenerated}
         generatedPeriod={{ startDate, endDate }}
+        onDownloadPdf={downloadPdf}
       />
       {isLoading && <ReportSkeleton blocks={3} />}
       {!isLoading && !isReportGenerated && (
@@ -148,7 +163,7 @@ const Moh731Report: React.FC<Moh731Props> = () => {
                 <div className={styles.viewport} ref={viewportRef}>
                   {/* The scale is a custom property rather than an inline `zoom`, so
                 the print stylesheet can still reset it to 1 */}
-                  <div className={styles.form} style={{ '--page-zoom': scale } as React.CSSProperties}>
+                  <div className={styles.form} ref={formRef} style={{ '--page-zoom': scale } as React.CSSProperties}>
                     {/* Ministry line sits above the ruled sheet, as on the printed form */}
                     <div className={styles.ministryLine}>
                       <span>Ministry of Health</span>

package/src/reports/moh-731/moh-731.scss

@@ -217,6 +217,12 @@ $section-gap: 0.8mm; // around a divider
   display: flex;
   align-items: stretch;
   border-bottom: $rule;
+
+  /* the sheet's own border closes the last section; a second rule there
+     doubles the line */
+  &:last-child {
+    border-bottom: none;
+  }
 }
 
 .flexColumn {

package/src/reports/moh-731/sections/hiv-and-tb-treatment.component.tsx

@@ -628,7 +628,13 @@ const HivAndTBTreatmentComponent: React.FC<HivAndTBTreatmentComponentProps> = ({
                     <td>Pregnant & Lactating</td>
                     <td className={styles.textBox}>
                       <span>HV03-042</span>
-                      <div className={styles.rectangle}></div>
+                      <div
+                        onClick={() => openLinelist('HV03-042')}
+                        className={styles.rectangle}
+                        title="Click to open linelist"
+                      >
+                        {MOH731Data.has_sam_preg_lact}
+                      </div>
                     </td>
                     <td></td>
                   </tr>
@@ -716,7 +722,13 @@ const HivAndTBTreatmentComponent: React.FC<HivAndTBTreatmentComponentProps> = ({
                     <td>Pregnant & Lactating</td>
                     <td className={styles.textBox}>
                       <span>HV03-048</span>
-                      <div className={styles.rectangle}></div>
+                      <div
+                        onClick={() => openLinelist('HV03-048')}
+                        className={styles.rectangle}
+                        title="Click to open linelist"
+                      >
+                        {MOH731Data.has_smm_preg_lact}
+                      </div>
                     </td>
                     <td></td>
                   </tr>
@@ -804,7 +816,13 @@ const HivAndTBTreatmentComponent: React.FC<HivAndTBTreatmentComponentProps> = ({
                     <td>Pregnant & Lactating</td>
                     <td className={styles.textBox}>
                       <span>HV03-054</span>
-                      <div className={styles.rectangle}></div>
+                      <div
+                        onClick={() => openLinelist('HV03-054')}
+                        className={styles.rectangle}
+                        title="Click to open linelist"
+                      >
+                        {MOH731Data.severe_acute_supp_preg_lact}
+                      </div>
                     </td>
                     <td></td>
                   </tr>
@@ -892,7 +910,13 @@ const HivAndTBTreatmentComponent: React.FC<HivAndTBTreatmentComponentProps> = ({
                     <td>Pregnant & Lactating</td>
                     <td className={styles.textBox}>
                       <span>HV03-060</span>
-                      <div className={styles.rectangle}></div>
+                      <div
+                        onClick={() => openLinelist('HV03-060')}
+                        className={styles.rectangle}
+                        title="Click to open linelist"
+                      >
+                        {MOH731Data.severe_moderate_supp_preg_lact}
+                      </div>
                     </td>
                     <td></td>
                   </tr>
@@ -906,6 +930,8 @@ const HivAndTBTreatmentComponent: React.FC<HivAndTBTreatmentComponentProps> = ({
           <table className={styles.block}>
             <tbody>
               <tr>
+                {/* Not reported yet: the earlier figures were misleading, so each box
+                    shows - until this section's queries are corrected */}
                 <td className={styles.blockTitle} colSpan={3}>
                   3.7 HIV in TB Clinic
                 </td>
@@ -914,13 +940,7 @@ const HivAndTBTreatmentComponent: React.FC<HivAndTBTreatmentComponentProps> = ({
                 <td>TB cases_New</td>
                 <td className={styles.textBox}>
                   <span>HV03-061</span>
-                  <div
-                    onClick={() => openLinelist('HV03-061')}
-                    className={styles.rectangle}
-                    title="Click to open linelist"
-                  >
-                    {MOH731Data.start_tb}
-                  </div>
+                  <div className={styles.rectangle}>-</div>
                 </td>
                 <td></td>
               </tr>
@@ -932,13 +952,7 @@ const HivAndTBTreatmentComponent: React.FC<HivAndTBTreatmentComponentProps> = ({
                 </td>
                 <td className={styles.textBox}>
                   <span>HV03-062</span>
-                  <div
-                    onClick={() => openLinelist('HV03-062')}
-                    className={styles.rectangle}
-                    title="Click to open linelist"
-                  >
-                    {MOH731Data.start_tb_known_positive}
-                  </div>
+                  <div className={styles.rectangle}>-</div>
                 </td>
                 <td></td>
               </tr>
@@ -946,13 +960,7 @@ const HivAndTBTreatmentComponent: React.FC<HivAndTBTreatmentComponentProps> = ({
                 <td>TB_New HIV Positive</td>
                 <td className={styles.textBox}>
                   <span>HV03-063</span>
-                  <div
-                    onClick={() => openLinelist('HV03-063')}
-                    className={styles.rectangle}
-                    title="Click to open linelist"
-                  >
-                    {MOH731Data.start_tb_positive}
-                  </div>
+                  <div className={styles.rectangle}>-</div>
                 </td>
                 <td></td>
               </tr>
@@ -964,13 +972,7 @@ const HivAndTBTreatmentComponent: React.FC<HivAndTBTreatmentComponentProps> = ({
                 </td>
                 <td className={styles.textBox}>
                   <span>HV03-064</span>
-                  <div
-                    onClick={() => openLinelist('HV03-064')}
-                    className={styles.rectangle}
-                    title="Click to open linelist"
-                  >
-                    {MOH731Data.start_tb_on_art}
-                  </div>
+                  <div className={styles.rectangle}>-</div>
                 </td>
                 <td></td>
               </tr>
@@ -978,18 +980,13 @@ const HivAndTBTreatmentComponent: React.FC<HivAndTBTreatmentComponentProps> = ({
                 <td>TB New_Start_HAART</td>
                 <td className={styles.textBox}>
                   <span>HV03-065</span>
-                  <div
-                    onClick={() => openLinelist('HV03-065')}
-                    className={styles.rectangle}
-                    title="Click to open linelist"
-                  >
-                    {MOH731Data.start_tb_art_new}
-                  </div>
+                  <div className={styles.rectangle}>-</div>
                 </td>
                 <td></td>
               </tr>
             </tbody>
           </table>
+          {/* Not reported by the system yet, so each box shows - */}
           <h5 className={styles.columnHeader}>4. Medical Male Circumcision</h5>
           <table className={styles.block}>
             <tbody>
@@ -1002,7 +999,7 @@ const HivAndTBTreatmentComponent: React.FC<HivAndTBTreatmentComponentProps> = ({
                 <td>Circumcised_0-60 days</td>
                 <td className={styles.textBox}>
                   <span>HV04-01</span>
-                  <div className={styles.rectangle}></div>
+                  <div className={styles.rectangle}>-</div>
                 </td>
                 <td></td>
               </tr>
@@ -1010,7 +1007,7 @@ const HivAndTBTreatmentComponent: React.FC<HivAndTBTreatmentComponentProps> = ({
                 <td>Circumcised_61 days -9 yrs</td>
                 <td className={styles.textBox}>
                   <span>HV04-02</span>
-                  <div className={styles.rectangle}></div>
+                  <div className={styles.rectangle}>-</div>
                 </td>
                 <td></td>
               </tr>
@@ -1018,7 +1015,7 @@ const HivAndTBTreatmentComponent: React.FC<HivAndTBTreatmentComponentProps> = ({
                 <td>Circumcised_10-14</td>
                 <td className={styles.textBox}>
                   <span>HV04-03</span>
-                  <div className={styles.rectangle}></div>
+                  <div className={styles.rectangle}>-</div>
                 </td>
                 <td></td>
               </tr>
@@ -1026,7 +1023,7 @@ const HivAndTBTreatmentComponent: React.FC<HivAndTBTreatmentComponentProps> = ({
                 <td>Circumcised_15 +</td>
                 <td className={styles.textBox}>
                   <span>HV04-04</span>
-                  <div className={styles.rectangle}></div>
+                  <div className={styles.rectangle}>-</div>
                 </td>
                 <td></td>
               </tr>
@@ -1039,7 +1036,7 @@ const HivAndTBTreatmentComponent: React.FC<HivAndTBTreatmentComponentProps> = ({
                 <td className={styles.spaceAfter}>Tested_ HIV+</td>
                 <td className={styles.textBox}>
                   <span>HV04-05</span>
-                  <div className={styles.rectangle}></div>
+                  <div className={styles.rectangle}>-</div>
                 </td>
                 <td></td>
               </tr>
@@ -1047,7 +1044,7 @@ const HivAndTBTreatmentComponent: React.FC<HivAndTBTreatmentComponentProps> = ({
                 <td className={styles.spaceAfter}>Tested_ HIV-</td>
                 <td className={styles.textBox}>
                   <span>HV04-06</span>
-                  <div className={styles.rectangle}></div>
+                  <div className={styles.rectangle}>-</div>
                 </td>
                 <td></td>
               </tr>
@@ -1065,7 +1062,7 @@ const HivAndTBTreatmentComponent: React.FC<HivAndTBTreatmentComponentProps> = ({
                 <td>Surgical</td>
                 <td className={styles.textBox}>
                   <span>HV04-07</span>
-                  <div className={styles.rectangle}></div>
+                  <div className={styles.rectangle}>-</div>
                 </td>
                 <td></td>
               </tr>
@@ -1073,7 +1070,7 @@ const HivAndTBTreatmentComponent: React.FC<HivAndTBTreatmentComponentProps> = ({
                 <td>Devices</td>
                 <td className={styles.textBox}>
                   <span>HV04-08</span>
-                  <div className={styles.rectangle}></div>
+                  <div className={styles.rectangle}>-</div>
                 </td>
                 <td></td>
               </tr>
@@ -1091,7 +1088,7 @@ const HivAndTBTreatmentComponent: React.FC<HivAndTBTreatmentComponentProps> = ({
                 <td>AE_During_Moderate</td>
                 <td className={styles.textBox}>
                   <span>HV04-09</span>
-                  <div className={styles.rectangle}></div>
+                  <div className={styles.rectangle}>-</div>
                 </td>
                 <td></td>
               </tr>
@@ -1099,7 +1096,7 @@ const HivAndTBTreatmentComponent: React.FC<HivAndTBTreatmentComponentProps> = ({
                 <td>AE_During_Severe</td>
                 <td className={styles.textBox}>
                   <span>HV04-10</span>
-                  <div className={styles.rectangle}></div>
+                  <div className={styles.rectangle}>-</div>
                 </td>
                 <td></td>
               </tr>
@@ -1112,7 +1109,7 @@ const HivAndTBTreatmentComponent: React.FC<HivAndTBTreatmentComponentProps> = ({
                 <td className={styles.spaceAfter}>AE_Post_Moderate</td>
                 <td className={styles.textBox}>
                   <span>HV04-11</span>
-                  <div className={styles.rectangle}></div>
+                  <div className={styles.rectangle}>-</div>
                 </td>
                 <td></td>
               </tr>
@@ -1120,7 +1117,7 @@ const HivAndTBTreatmentComponent: React.FC<HivAndTBTreatmentComponentProps> = ({
                 <td className={styles.spaceAfter}>AE_Post_Severe</td>
                 <td className={styles.textBox}>
                   <span>HV04-12</span>
-                  <div className={styles.rectangle}></div>
+                  <div className={styles.rectangle}>-</div>
                 </td>
                 <td></td>
               </tr>
@@ -1133,7 +1130,7 @@ const HivAndTBTreatmentComponent: React.FC<HivAndTBTreatmentComponentProps> = ({
                 <td className={styles.spaceAfter}>Follow up visit &lt; 14d</td>
                 <td className={styles.textBox}>
                   <span>HV04-13</span>
-                  <div className={styles.rectangle}></div>
+                  <div className={styles.rectangle}>-</div>
                 </td>
                 <td></td>
               </tr>

package/src/reports/moh-731/summary/moh-731-summary.config.ts

@@ -61,13 +61,12 @@ export interface SummarySection {
 
 const SEX = ['Male', 'Female'];
 
-/* Sections still on the earlier datasets, whose figures and linelists do not yet
-   agree; they get totals once their queries are corrected */
 /* Section 4: nothing reports these figures yet, on the form or here */
-const NOT_REPORTED = 'Not yet reported by the system; these boxes are blank on the form too.';
+const NOT_REPORTED = 'Not yet reported by the system; these boxes show – on the form too.';
 
-const PENDING_QUERIES =
-  "Figures as reported. Totals will follow once this section's queries are corrected, as its linelists don't match its figures yet.";
+/* 3.7: the earlier figures were misleading, so they are withheld, here and on the form */
+const TB_CLINIC_NOT_REPORTED =
+  "Not reported until this section's queries are corrected: the earlier figures were misleading, so these boxes show – on the form too.";
 
 const prepPopulations = (codes: Record<string, [SummaryCell, SummaryCell]>): SummaryRow[] => [
   { label: 'General population', cells: codes.general },
@@ -190,6 +189,7 @@ export const MOH_731_SUMMARY: SummarySection[] = [
     subsections: [
       {
         block: '2.1 Maternal HIV Testing',
+        note: 'PNC with no delivery date: PNC tests that fit neither PNC box (no delivery date, or one after the test), for data cleanup. Not on the form, so not in the total.',
         tables: [
           {
             columns: ['Initial test', 'Retest'],
@@ -199,6 +199,8 @@ export const MOH_731_SUMMARY: SummarySection[] = [
               { label: 'L&D', cells: ['HV02-04', 'HV02-05'] },
               { label: 'PNC ≤6 weeks', cells: ['HV02-06', 'HV02-07'] },
               { label: 'PNC >6 weeks', cells: ['HV02-08', 'HV02-09'] },
+              /* not on the form: PNC tests no delivery date places either side of six weeks */
+              { label: 'PNC with no delivery date', cells: ['PNC-NODD-I', 'PNC-NODD-R'], excluded: true },
               /* known positives are not tested, so they are not tests */
               { label: 'Known positive at 1st ANC', only: 'HV02-01', excluded: true },
             ],
@@ -370,6 +372,7 @@ export const MOH_731_SUMMARY: SummarySection[] = [
       {
         /* two splits of the same clients, each with its own total */
         block: '3.5 Differentiated Service Delivery',
+        note: 'Both tables are the clients on ART and add up to 3.2 Currently on ART. Not categorized: no stability, or no DSD model, recorded.',
         tables: [
           {
             title: 'By stability',
@@ -377,7 +380,8 @@ export const MOH_731_SUMMARY: SummarySection[] = [
             totalLabel: 'Total by stability',
             rows: [
               { label: 'Established', only: 'HV03-033' },
-              { label: 'Not established', only: 'HV03-034' },
+              { label: 'Not established', only: 'DSD-NE' },
+              { label: 'Not categorized', only: 'DSD-NC' },
             ],
           },
           {
@@ -385,18 +389,21 @@ export const MOH_731_SUMMARY: SummarySection[] = [
             columns: [],
             totalLabel: 'Total by model',
             rows: [
-              { label: 'Community', only: 'HV03-035' },
-              { label: 'Facility', only: 'HV03-036' },
+              { label: 'Community', only: 'DSD-CO' },
+              { label: 'Facility', only: 'DSD-FA' },
+              { label: 'Not categorized', only: 'DSD-MNC' },
             ],
           },
         ],
       },
       {
         block: '3.6 Nutrition and HIV',
-        note: PENDING_QUERIES,
+        note: 'Clients on ART by their latest SAM / MAM status in the period, by age at the period end. Pregnant & lactating women are counted in their own row only, not in an age band.',
         tables: [
           {
             columns: ['SAM+', 'MAM+', 'SAM+ on therapeutic foods', 'MAM+ on supplemental foods'],
+            totalLabel: 'Total',
+            /* a client is SAM or MAM, and food is of the same clients: no row total */
             rowTotals: false,
             rows: [
               { label: '0–5 months', cells: ['HV03-037', 'HV03-043', 'HV03-049', 'HV03-055'] },
@@ -404,22 +411,23 @@ export const MOH_731_SUMMARY: SummarySection[] = [
               { label: '5–9 years', cells: ['HV03-039', 'HV03-045', 'HV03-051', 'HV03-057'] },
               { label: '10–17 years', cells: ['HV03-040', 'HV03-046', 'HV03-052', 'HV03-058'] },
               { label: '18+ years', cells: ['HV03-041', 'HV03-047', 'HV03-053', 'HV03-059'] },
+              { label: 'Pregnant & lactating', cells: ['HV03-042', 'HV03-048', 'HV03-054', 'HV03-060'] },
             ],
           },
         ],
       },
       {
         block: '3.7 HIV in TB Clinic',
-        note: PENDING_QUERIES,
+        note: TB_CLINIC_NOT_REPORTED,
         tables: [
           {
             columns: [],
             rows: [
-              { label: 'New TB cases', only: 'HV03-061' },
-              { label: 'Known HIV positive', only: 'HV03-062' },
-              { label: 'on HAART', only: 'HV03-064', ofWhich: true },
-              { label: 'Newly tested HIV positive', only: 'HV03-063' },
-              { label: 'started HAART', only: 'HV03-065', ofWhich: true },
+              { label: 'New TB cases' },
+              { label: 'Known HIV positive' },
+              { label: 'on HAART', ofWhich: true },
+              { label: 'Newly tested HIV positive' },
+              { label: 'started HAART', ofWhich: true },
             ],
           },
         ],
@@ -489,7 +497,7 @@ export const MOH_731_SUMMARY: SummarySection[] = [
     subsections: [
       {
         block: '5. Post Exposure Prophylaxis',
-        note: "Given PEP: figures as reported. A total will follow once its query is corrected, as its linelists don't match its figures yet.",
+        note: 'Other includes sexual assault. Given PEP is of the exposed.',
         tables: [
           {
             title: 'Exposed',
@@ -503,6 +511,7 @@ export const MOH_731_SUMMARY: SummarySection[] = [
           {
             title: 'Given PEP',
             columns: [],
+            totalLabel: 'Total given PEP',
             rows: [
               { label: 'Occupational', only: 'HV05-03' },
               { label: 'Other', only: 'HV05-04' },

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

@@ -15,6 +15,7 @@ const Moh270DailyRegister: React.FC<Moh270DailyRegisterProps> = ({ moh270Patient
             <TableHeader>No</TableHeader>
             <TableHeader>Date</TableHeader>
             <TableHeader>Encounter Date</TableHeader>
+            <TableHeader>RTC Date</TableHeader>
             <TableHeader>Patient No</TableHeader>
             <TableHeader>Name</TableHeader>
             <TableHeader>D.O.B</TableHeader>
@@ -36,6 +37,7 @@ const Moh270DailyRegister: React.FC<Moh270DailyRegisterProps> = ({ moh270Patient
               <TableCell>{index + 1}</TableCell>
               <TableCell>{p?.enrollment_date ?? ''}</TableCell>
               <TableCell>{p?.encounter_date ?? ''}</TableCell>
+              <TableCell>{p?.rtc_date ?? ''}</TableCell>
               <TableCell>{p.amrs_universal_id}</TableCell>
               <TableCell>
                 <Link href={`${window.spaBase}/patient/${p.patient_uuid}/chart/`}>{p.person_name}</Link>

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

@@ -36,6 +36,8 @@ export const MOH_222_COLUMNS: RegisterColumn[] = [
 export const MOH_270_COLUMNS: RegisterColumn[] = [
   { header: 'No', value: (_row, index) => index + 1 },
   { header: 'Date', value: (r) => r.encounter_date ?? '' },
+  { header: 'Encounter Date', value: (r) => r.encounter_date ?? '' },
+  { header: 'RTC Date', value: (r) => r.rtc_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 ?? '' },

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

@@ -155,6 +155,7 @@ export type Moh270Patient = {
   gender: string;
   amrs_universal_id: string;
   encounter_date: string;
+  rtc_date: string;
   endDate: string;
   covered_by_shif: number;
   patient_uuid: string;

package/src/resources/moh-362.resource.ts

@@ -0,0 +1,27 @@
+import { openmrsFetch } from '@openmrs/esm-framework';
+import { buildEtlUrl } from '../utils/get-base-url';
+
+interface Moh362Params {
+  locationUuids: string;
+  startDate: string;
+  endDate: string;
+}
+
+/**
+ * MOH 362 HTS Lab, Referral & Linkage Register: one row per test in the
+ * period -- the same tests as MOH 731 1.1 HIV Tests -- for the whole facility of
+ * the location, with the register's details.
+ */
+export async function getMoh362(params: Moh362Params): Promise<Array<Record<string, unknown>>> {
+  const url = await buildEtlUrl('moh-362-register', {
+    locationUuids: params.locationUuids,
+    startDate: params.startDate,
+    endDate: params.endDate,
+  });
+  const response = await openmrsFetch(url);
+  if (!response.ok) {
+    throw new Error(`Failed to fetch the MOH 362 register: ${response.status} - ${await response.text()}`);
+  }
+  const data = await response.json();
+  return Array.isArray(data) ? data : [];
+}

package/src/root.component.tsx

@@ -24,6 +24,7 @@ import Moh731Report from './reports/moh-731/moh-731.component';
 import Moh366Register from './reports/moh-731/registers/moh-366.component';
 import PrepRegisterComponent from './reports/moh-731/registers/prep-register.component';
 import Moh731Linelist from './reports/moh-731/linelist/moh-731-linelist.component';
+import Moh362Register from './registers/moh-362/moh-362.component';
 import styles from './root.scss';
 import Moh510RegisterComponent from './reports/moh-710/registers/moh-510/moh-510.component';
 
@@ -59,6 +60,7 @@ const RootComponent: React.FC = () => {
           <Route path="/moh-366-register" element={<Moh366Register />} />
           <Route path="/prep-register" element={<PrepRegisterComponent />} />
           <Route path="/moh-510-register" element={<Moh510RegisterComponent />} />
+          <Route path="/moh-362" element={<Moh362Register />} />
         </Routes>
       </div>
     </BrowserRouter>