diff --git a/src/app/hiv-care-lib/moh-731-report/moh-731-report-pdf-view.component.html b/src/app/hiv-care-lib/moh-731-report/moh-731-report-pdf-view.component.html
index 27a108017..ab1ea8330 100644
--- a/src/app/hiv-care-lib/moh-731-report/moh-731-report-pdf-view.component.html
+++ b/src/app/hiv-care-lib/moh-731-report/moh-731-report-pdf-view.component.html
@@ -142,7 +142,7 @@
                             display: inline-block;
                             border: 1px solid black;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -156,7 +156,7 @@
                             display: inline-block;
                             border: 1px solid black;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -175,7 +175,7 @@
                             display: inline-block;
                             border: 1px solid black;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -193,7 +193,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -212,7 +212,7 @@
                             display: inline-block;
                             border: 1px solid black;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -244,7 +244,7 @@
                             display: inline-block;
                             border: 1px solid black;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -258,7 +258,7 @@
                             display: inline-block;
                             border: 1px solid black;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -276,7 +276,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -291,7 +291,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -309,7 +309,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -324,7 +324,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -342,7 +342,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -357,7 +357,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -375,7 +375,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -390,7 +390,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -408,7 +408,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -427,7 +427,7 @@
                             display: inline-block;
                             border: 1px solid black;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -441,7 +441,7 @@
                             display: inline-block;
                             border: 1px solid black;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -473,7 +473,7 @@
                             display: inline-block;
                             border: 1px solid black;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -487,7 +487,7 @@
                             display: inline-block;
                             border: 1px solid black;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -521,7 +521,7 @@
                             display: inline-block;
                             border: 1px solid black;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -535,7 +535,7 @@
                             display: inline-block;
                             border: 1px solid black;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -553,7 +553,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -570,21 +570,7 @@
                             display: inline-block;
                             border: 1px solid black;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
-                        ></span
-                      >
-                    </div>
-                    <div class="col-md-5">
-                      <span
-                        >HV01-24
-                        <i
-                          style="
-                            width: 55px;
-                            text-align: center;
-                            display: inline-block;
-                            border: 1px solid black;
-                          "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -616,7 +602,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -634,7 +620,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -649,7 +635,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -667,7 +653,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -682,7 +668,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -700,7 +686,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -715,7 +701,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -733,7 +719,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -765,7 +751,7 @@
                             display: inline-block;
                             border: 1px solid black;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -779,7 +765,7 @@
                             display: inline-block;
                             border: 1px solid black;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -797,7 +783,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -814,7 +800,7 @@
                             display: inline-block;
                             border: 1px solid black;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -846,7 +832,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -864,7 +850,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -879,7 +865,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -897,7 +883,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -912,7 +898,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -930,7 +916,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -945,7 +931,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -992,7 +978,7 @@
                             display: inline-block;
                             border: 1px solid black;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1020,7 +1006,7 @@
                             display: inline-block;
                             border: 1px solid black;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1034,7 +1020,7 @@
                             display: inline-block;
                             border: 1px solid black;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1052,7 +1038,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1067,7 +1053,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1085,7 +1071,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1100,7 +1086,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1118,7 +1104,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1133,7 +1119,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1156,7 +1142,7 @@
                             display: inline-block;
                             border: 1px solid black;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1174,7 +1160,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1192,7 +1178,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1210,7 +1196,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1233,7 +1219,7 @@
                             display: inline-block;
                             border: 1px solid black;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1251,7 +1237,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1269,7 +1255,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1287,7 +1273,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1305,7 +1291,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1330,7 +1316,7 @@
                             display: inline-block;
                             border: 1px solid black;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1348,7 +1334,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1384,7 +1370,7 @@
                             display: inline-block;
                             border: 1px solid black;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1398,7 +1384,7 @@
                             display: inline-block;
                             border: 1px solid black;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1416,7 +1402,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1431,7 +1417,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1449,7 +1435,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1464,7 +1450,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1482,7 +1468,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1497,7 +1483,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1520,7 +1506,7 @@
                             display: inline-block;
                             border: 1px solid black;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1538,7 +1524,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1556,7 +1542,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1581,7 +1567,7 @@
                             display: inline-block;
                             border: 1px solid black;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1602,7 +1588,7 @@
                             display: inline-block;
                             border: 1px solid black;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1620,7 +1606,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1671,7 +1657,10 @@
                                 display: inline-block;
                                 border: 1px solid black;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >{{
+                                reportData[0]
+                                  ?.dc__age_range__0_to_1__started_art
+                              }}</i
                             ></span
                           >
                         </div>
@@ -1685,7 +1674,10 @@
                                 display: inline-block;
                                 border: 1px solid black;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >{{
+                                reportData[0]
+                                  ?.dc__age_range__0_to_1__started_art
+                              }}</i
                             ></span
                           >
                         </div>
@@ -1704,7 +1696,10 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >{{
+                                reportData[0]
+                                  ?.dc__age_range__1_to_9__started_art
+                              }}</i
                             ></span
                           >
                         </div>
@@ -1719,7 +1714,10 @@
                                 border: 1px solid black;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >{{
+                                reportData[0]
+                                  ?.dc__age_range__1_to_9__started_art
+                              }}</i
                             ></span
                           >
                         </div>
@@ -1738,7 +1736,10 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >{{
+                                reportData[0]
+                                  ?.dc__age_range__1_to_9__started_art
+                              }}</i
                             ></span
                           >
                         </div>
@@ -1753,7 +1754,10 @@
                                 border: 1px solid black;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >{{
+                                reportData[0]
+                                  ?.dc__age_range__1_to_9__started_art
+                              }}</i
                             ></span
                           >
                         </div>
@@ -1772,7 +1776,10 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >{{
+                                reportData[0]
+                                  ?.dc__age_range__10_to_14__gender__M__started_art
+                              }}</i
                             ></span
                           >
                         </div>
@@ -1787,7 +1794,10 @@
                                 border: 1px solid black;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >{{
+                                reportData[0]
+                                  ?.dc__age_range__10_to_14__gender__F__started_art
+                              }}</i
                             ></span
                           >
                         </div>
@@ -1806,7 +1816,10 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >{{
+                                reportData[0]
+                                  ?.dc__age_range__15_to_19__gender__M__started_art
+                              }}</i
                             ></span
                           >
                         </div>
@@ -1821,7 +1834,10 @@
                                 border: 1px solid black;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >{{
+                                reportData[0]
+                                  ?.dc__age_range__15_to_19__gender__F__started_art
+                              }}</i
                             ></span
                           >
                         </div>
@@ -1840,7 +1856,10 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >{{
+                                reportData[0]
+                                  ?.dc__age_range__20_to_24__gender__M__started_art
+                              }}</i
                             ></span
                           >
                         </div>
@@ -1855,7 +1874,10 @@
                                 border: 1px solid black;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >{{
+                                reportData[0]
+                                  ?.dc__age_range__20_to_24__gender__F__started_art
+                              }}</i
                             ></span
                           >
                         </div>
@@ -1874,7 +1896,10 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >{{
+                                reportData[0]
+                                  ?.dc__age_range__older_than_24__gender__M__started_art
+                              }}</i
                             ></span
                           >
                         </div>
@@ -1889,7 +1914,10 @@
                                 border: 1px solid black;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >{{
+                                reportData[0]
+                                  ?.dc__age_range__older_than_24__gender__F__started_art
+                              }}</i
                             ></span
                           >
                         </div>
@@ -1918,7 +1946,10 @@
                                 display: inline-block;
                                 border: 1px solid black;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >{{
+                                reportData[0]
+                                  ?.dc__age_range__0_to_1__current_on_art
+                              }}</i
                             ></span
                           >
                         </div>
@@ -1932,7 +1963,10 @@
                                 display: inline-block;
                                 border: 1px solid black;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >{{
+                                reportData[0]
+                                  ?.dc__age_range__0_to_1__current_on_art
+                              }}</i
                             ></span
                           >
                         </div>
@@ -1951,7 +1985,10 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >{{
+                                reportData[0]
+                                  ?.dc__age_range__1_to_9__current_on_art
+                              }}</i
                             ></span
                           >
                         </div>
@@ -1966,7 +2003,10 @@
                                 border: 1px solid black;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >{{
+                                reportData[0]
+                                  ?.dc__age_range__1_to_9__current_on_art
+                              }}</i
                             ></span
                           >
                         </div>
@@ -1985,7 +2025,10 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >{{
+                                reportData[0]
+                                  ?.dc__age_range__1_to_9__current_on_art
+                              }}</i
                             ></span
                           >
                         </div>
@@ -2000,7 +2043,10 @@
                                 border: 1px solid black;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >{{
+                                reportData[0]
+                                  ?.dc__age_range__1_to_9__current_on_art
+                              }}</i
                             ></span
                           >
                         </div>
@@ -2019,7 +2065,10 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >{{
+                                reportData[0]
+                                  ?.dc__gender__M__age_range__10_to_14__current_on_art
+                              }}</i
                             ></span
                           >
                         </div>
@@ -2034,7 +2083,10 @@
                                 border: 1px solid black;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >{{
+                                reportData[0]
+                                  ?.dc__gender__F__age_range__10_to_14__current_on_art
+                              }}</i
                             ></span
                           >
                         </div>
@@ -2053,7 +2105,10 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >{{
+                                reportData[0]
+                                  ?.dc__gender__M__age_range__15_to_19__current_on_art
+                              }}</i
                             ></span
                           >
                         </div>
@@ -2068,7 +2123,10 @@
                                 border: 1px solid black;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >{{
+                                reportData[0]
+                                  ?.dc__gender__F__age_range__15_to_19__current_on_art
+                              }}</i
                             ></span
                           >
                         </div>
@@ -2087,7 +2145,10 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >{{
+                                reportData[0]
+                                  ?.dc__gender__M__age_range__20_to_24__current_on_art
+                              }}</i
                             ></span
                           >
                         </div>
@@ -2102,7 +2163,10 @@
                                 border: 1px solid black;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >{{
+                                reportData[0]
+                                  ?.dc__gender__F__age_range__20_to_24__current_on_art
+                              }}</i
                             ></span
                           >
                         </div>
@@ -2121,7 +2185,10 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >{{
+                                reportData[0]
+                                  ?.dc__gender__M__age_range__older_than_24__current_on_art
+                              }}</i
                             ></span
                           >
                         </div>
@@ -2136,7 +2203,10 @@
                                 border: 1px solid black;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >{{
+                                reportData[0]
+                                  ?.dc__gender__F__age_range__older_than_24__current_on_art
+                              }}</i
                             ></span
                           >
                         </div>
@@ -2159,7 +2229,7 @@
                                 display: inline-block;
                                 border: 1px solid black;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2178,7 +2248,10 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >{{
+                                reportData[0]
+                                  ?.dc__age_range__15_to_19__screened_for_tb
+                              }}</i
                             ></span
                           >
                         </div>
@@ -2201,7 +2274,10 @@
                                 display: inline-block;
                                 border: 1px solid black;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >{{
+                                reportData[0]
+                                  ?.dc__age_range__20_to_24__screened_for_tb
+                              }}</i
                             ></span
                           >
                         </div>
@@ -2220,7 +2296,10 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >{{
+                                reportData[0]
+                                  ?.dc__age_range__15_to_19__started_ipt
+                              }}</i
                             ></span
                           >
                         </div>
@@ -2243,7 +2322,7 @@
                                 display: inline-block;
                                 border: 1px solid black;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2262,7 +2341,7 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2281,7 +2360,7 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2300,7 +2379,7 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2328,7 +2407,7 @@
                                 display: inline-block;
                                 border: 1px solid black;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2347,7 +2426,7 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2366,7 +2445,7 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2385,7 +2464,7 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2404,7 +2483,7 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2423,7 +2502,7 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2445,7 +2524,7 @@
                                 display: inline-block;
                                 border: 1px solid black;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2464,7 +2543,7 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2483,7 +2562,7 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2502,7 +2581,7 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2521,7 +2600,7 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2540,7 +2619,7 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2562,7 +2641,7 @@
                                 display: inline-block;
                                 border: 1px solid black;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2581,7 +2660,7 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2600,7 +2679,7 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2619,7 +2698,7 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2638,7 +2717,7 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2657,7 +2736,7 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2679,7 +2758,7 @@
                                 display: inline-block;
                                 border: 1px solid black;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2698,7 +2777,7 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2717,7 +2796,7 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2736,7 +2815,7 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2755,7 +2834,7 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2774,7 +2853,7 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2807,7 +2886,7 @@
                                 display: inline-block;
                                 border: 1px solid black;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2826,7 +2905,7 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2845,7 +2924,7 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2864,7 +2943,7 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2883,7 +2962,7 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2918,7 +2997,7 @@
                                 display: inline-block;
                                 border: 1px solid black;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2937,7 +3016,7 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2956,7 +3035,7 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2975,7 +3054,7 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2994,7 +3073,7 @@
                                 display: inline-block;
                                 border: 1px solid black;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -3013,7 +3092,7 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -3035,9 +3114,7 @@
                                   display: inline-block;
                                   border: 1px solid black;
                                 "
-                                >{{
-                                  reportData[0]?.started_PEP_occupational
-                                }}</i
+                                >0</i
                               ></span
                             >
                           </div>
@@ -3056,9 +3133,7 @@
                                   border-top: none;
                                   border-top: none;
                                 "
-                                >{{
-                                  reportData[0]?.started_PEP_occupational
-                                }}</i
+                                >0</i
                               ></span
                             >
                           </div>
@@ -3081,9 +3156,7 @@
                                   display: inline-block;
                                   border: 1px solid black;
                                 "
-                                >{{
-                                  reportData[0]?.started_PEP_occupational
-                                }}</i
+                                >0</i
                               ></span
                             >
                           </div>
@@ -3101,9 +3174,7 @@
                                   border: 1px solid black;
                                   border-top: none;
                                 "
-                                >{{
-                                  reportData[0]?.started_PEP_occupational
-                                }}</i
+                                >0</i
                               ></span
                             >
                           </div>
@@ -3121,9 +3192,7 @@
                                   border: 1px solid black;
                                   border-top: none;
                                 "
-                                >{{
-                                  reportData[0]?.started_PEP_occupational
-                                }}</i
+                                >0</i
                               ></span
                             >
                           </div>
@@ -3141,9 +3210,7 @@
                                   border: 1px solid black;
                                   border-top: none;
                                 "
-                                >{{
-                                  reportData[0]?.started_PEP_occupational
-                                }}</i
+                                >0</i
                               ></span
                             >
                           </div>
@@ -3161,9 +3228,7 @@
                                   border: 1px solid black;
                                   border-top: none;
                                 "
-                                >{{
-                                  reportData[0]?.started_PEP_occupational
-                                }}</i
+                                >0</i
                               ></span
                             >
                           </div>
@@ -3196,7 +3261,7 @@
                               display: inline-block;
                               border: 1px solid black;
                             "
-                            >{{ reportData[0]?.started_PEP_occupational }}</i
+                            >0</i
                           ></span
                         >
                       </div>
@@ -3214,7 +3279,7 @@
                               border: 1px solid black;
                               border-top: none;
                             "
-                            >{{ reportData[0]?.started_PEP_occupational }}</i
+                            >0</i
                           ></span
                         >
                       </div>
@@ -3233,7 +3298,7 @@
                               display: inline-block;
                               border: 1px solid black;
                             "
-                            >{{ reportData[0]?.started_PEP_occupational }}</i
+                            >0</i
                           ></span
                         >
                       </div>
@@ -3251,7 +3316,7 @@
                               border: 1px solid black;
                               border-top: none;
                             "
-                            >{{ reportData[0]?.started_PEP_occupational }}</i
+                            >0</i
                           ></span
                         >
                       </div>