@ampath/esm-reports-app 1.0.0-next.51 → 1.0.0-next.52

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. package/dist/907.js +1 -1
  2. package/dist/907.js.map +1 -1
  3. package/dist/ampath-esm-reports-app.js +1 -1
  4. package/dist/routes.json +1 -1
  5. package/package.json +1 -1
  6. package/src/reports/moh-745/moh-745.component.tsx +212 -173
  7. package/src/reports/moh-745/registers/type.ts +151 -0
  8. package/src/resources/moh-745.resource.ts +4 -8
package/src/reports/moh-745/moh-745.component.tsx CHANGED
@@ -11,9 +11,10 @@ import { getMoh745 } from '../../resources/moh-745.resource';
11
11
  import { useNavigate } from 'react-router-dom';
12
12
  import { ReportSkeleton } from '../../common/report-skeleton';
13
13
  import { ReportPage } from '../../common/report-page';
14
+ import { type CancerScreeningResult } from './registers/type';
14
15
 
15
16
  const Moh745Component: React.FC = () => {
16
- const [moh745Data, setMoh745Data] = useState<any>([]);
17
+ const [moh745Data, setMoh745Data] = useState<CancerScreeningResult | null>(null);
17
18
  const isReportGenerated = hasReportData(moh745Data);
18
19
  const [isLoading, setIsLoading] = useState<boolean>(false);
19
20
  const [startDate, setStartDate] = useState<string>('');
@@ -44,12 +45,15 @@ const Moh745Component: React.FC = () => {
44
45
  };
45
46
  try {
46
47
  const data = await getMoh745(params);
47
- const flatData = Object.assign({}, ...data.result);
48
- setMoh745Data(flatData);
49
- setIsLoading(false);
48
+ if(data){
49
+ setMoh745Data(data);
50
+ }else{
51
+ setMoh745Data(null);
52
+ }
50
53
  } catch (error) {
51
- setIsLoading(false);
52
54
  showReportError('the MOH-745 report', error);
55
+ }finally{
56
+ setIsLoading(false);
53
57
  }
54
58
  };
55
59
 
@@ -157,105 +161,123 @@ const Moh745Component: React.FC = () => {
157
161
  <tbody>
158
162
  <tr>
159
163
  <td>1 a) Number of clients who received VIA or VIA/VILLI Screening</td>
160
- <td onClick={() => navigateToRegister('via_villi_less_25_initial_screening')}>
161
- {moh745Data.via_villi_less_25_initial_screening}
164
+ <td onClick={() => navigateToRegister('dc__screening_visit_type__initial__age_range__less_than_25__screened_via_or_via_vili')}>
165
+ {moh745Data?.dc__screening_visit_type__initial__age_range__less_than_25__screened_via_or_via_vili ?? 0}
162
166
  </td>
163
- <td onClick={() => navigateToRegister('via_villi_25_49_initial_screening')}>
164
- {moh745Data.via_villi_25_49_initial_screening}
167
+ <td onClick={() => navigateToRegister('dc__screening_visit_type__initial__age_range__25_to_49__screened_via_or_via_vili')}>
168
+ {moh745Data?.dc__screening_visit_type__initial__age_range__25_to_49__screened_via_or_via_vili ?? 0}
165
169
  </td>
166
170
  <td onClick={() => navigateToRegister('via_villi_50_above_initial_screening')}>
167
- {moh745Data.via_villi_50_above_initial_screening}
171
+ {moh745Data?.dc__screening_visit_type__initial__age_range__50_and_above__screened_via_or_via_vili ?? 0}
172
+ </td>
173
+ <td>
174
+ {moh745Data?.screened_via_or_via_vili_initial_visit ?? 0}
168
175
  </td>
169
- <td></td>
170
176
  <td onClick={() => navigateToRegister('via_villi_less_25_routine_screening')}>
171
- {moh745Data.via_villi_less_25_routine_screening}
177
+ {moh745Data?.dc__screening_visit_type__routine__age_range__less_than_25__screened_via_or_via_vili ?? 0}
172
178
  </td>
173
179
  <td onClick={() => navigateToRegister('via_villi_25_49_routine_screening')}>
174
- {moh745Data.via_villi_25_49_routine_screening}
180
+ {moh745Data?.dc__screening_visit_type__routine__age_range__25_to_49__screened_via_or_via_vili ?? 0}
175
181
  </td>
176
182
  <td onClick={() => navigateToRegister('via_villi_50_above_routine_screening')}>
177
- {moh745Data.via_villi_50_above_routine_screening}
183
+ {moh745Data?.dc__screening_visit_type__routine__age_range__50_and_above__screened_via_or_via_vili ?? 0}
184
+ </td>
185
+ <td>
186
+ {moh745Data?.screened_via_or_via_vili_initial_visit ?? 0}
178
187
  </td>
179
- <td></td>
180
188
  <td onClick={() => navigateToRegister('via_villi_less_25_post_treatment_screening')}>
181
- {moh745Data.via_villi_less_25_post_treatment_screening}
189
+ {moh745Data?.dc__screening_visit_type__post_treatment__age_range__less_than_25__screened_via_or_via_vili ?? 0}
182
190
  </td>
183
191
  <td onClick={() => navigateToRegister('via_villi_25_49_post_treatment_screening')}>
184
- {moh745Data.via_villi_25_49_post_treatment_screening}
192
+ {moh745Data?.dc__screening_visit_type__post_treatment__age_range__25_to_49__screened_via_or_via_vili ?? 0}
185
193
  </td>
186
194
  <td onClick={() => navigateToRegister('via_villi_50_above_post_treatment_screening')}>
187
- {moh745Data.via_villi_50_above_post_treatment_screening}
195
+ {moh745Data?.dc__screening_visit_type__post_treatment__age_range__50_and_above__screened_via_or_via_vili ?? 0}
188
196
  </td>
189
- <td></td>
190
- <td onClick={() => navigateToRegister('via_villi_total')}>{moh745Data.via_villi_total}</td>
197
+ <td>
198
+ {moh745Data?.screened_via_or_via_vili_post_treatment_visit ?? 0}
199
+ </td>
200
+ <td onClick={() => navigateToRegister('via_villi_total')}></td>
191
201
  </tr>
192
202
  <tr>
193
203
  <td> b) Number of clients who received Pap smear</td>
194
204
  <td onClick={() => navigateToRegister('pap_smear_less_25_initial_screening')}>
195
- {moh745Data.pap_smear_less_25_initial_screening}
205
+ {moh745Data?.dc__screening_visit_type__initial__age_range__less_than_25__screened_pap_smear ?? 0}
196
206
  </td>
197
207
  <td onClick={() => navigateToRegister('pap_smear_25_49_initial_screening')}>
198
- {moh745Data.pap_smear_25_49_initial_screening}
208
+ {moh745Data?.dc__screening_visit_type__initial__age_range__25_to_49__screened_pap_smear ?? 0}
199
209
  </td>
200
210
  <td onClick={() => navigateToRegister('pap_smear_50_above_initial_screening')}>
201
- {moh745Data.pap_smear_50_above_initial_screening}
211
+ {moh745Data?.dc__screening_visit_type__initial__age_range__50_and_above__screened_pap_smear ?? 0}
212
+ </td>
213
+ <td>
214
+ {moh745Data?.screened_pap_smear_initial_visit ?? 0}
202
215
  </td>
203
- <td></td>
204
216
  <td onClick={() => navigateToRegister('pap_smear_less_25_routine_screening')}>
205
- {moh745Data.pap_smear_less_25_routine_screening}
217
+ {moh745Data?.dc__screening_visit_type__routine__age_range__less_than_25__screened_pap_smear ?? 0}
206
218
  </td>
207
219
  <td onClick={() => navigateToRegister('pap_smear_25_49_routine_screening')}>
208
- {moh745Data.pap_smear_25_49_routine_screening}
220
+ {moh745Data?.dc__screening_visit_type__routine__age_range__25_to_49__screened_pap_smear ?? 0}
209
221
  </td>
210
222
  <td onClick={() => navigateToRegister('pap_smear_50_above_routine_screening')}>
211
- {moh745Data.pap_smear_50_above_routine_screening}
223
+ {moh745Data?.dc__screening_visit_type__routine__age_range__50_and_above__screened_pap_smear ?? 0}
224
+ </td>
225
+ <td>
226
+ {moh745Data?.screened_pap_smear_routine_visit ?? 0}
212
227
  </td>
213
- <td></td>
214
228
  <td onClick={() => navigateToRegister('pap_smear_less_25_post_treatment_screening')}>
215
- {moh745Data.pap_smear_less_25_post_treatment_screening}
229
+ {moh745Data?.dc__screening_visit_type__post_treatment__age_range__less_than_25__screened_pap_smear ?? 0}
216
230
  </td>
217
231
  <td onClick={() => navigateToRegister('pap_smear_25_49_post_treatment_screening')}>
218
- {moh745Data.pap_smear_25_49_post_treatment_screening}
232
+ {moh745Data?.dc__screening_visit_type__post_treatment__age_range__25_to_49__screened_pap_smear ?? 0}
219
233
  </td>
220
234
  <td onClick={() => navigateToRegister('pap_smear_50_above_post_treatment_screening')}>
221
- {moh745Data.pap_smear_50_above_post_treatment_screening}
235
+ {moh745Data?.dc__screening_visit_type__post_treatment__age_range__50_and_above__screened_pap_smear ?? 0}
222
236
  </td>
223
- <td></td>
224
- <td onClick={() => navigateToRegister('pap_smear_total')}>{moh745Data.pap_smear_total}</td>
237
+ <td>
238
+ {moh745Data?.screened_pap_smear_post_treatment_visit ?? 0}
239
+ </td>
240
+ <td onClick={() => navigateToRegister('pap_smear_total')}></td>
225
241
  </tr>
226
242
  <tr>
227
243
  <td> c) Number of clients who received HPV Test</td>
228
244
  <td onClick={() => navigateToRegister('hpv_test_less_25_initial_screening')}>
229
- {moh745Data.hpv_test_less_25_initial_screening}
245
+ {moh745Data?.dc__screening_visit_type__initial__age_range__less_than_25__screened_hpv ?? 0}
230
246
  </td>
231
247
  <td onClick={() => navigateToRegister('hpv_test_25_49_initial_screening')}>
232
- {moh745Data.hpv_test_25_49_initial_screening}
248
+ {moh745Data?.dc__screening_visit_type__initial__age_range__25_to_49__screened_hpv ?? 0}
233
249
  </td>
234
250
  <td onClick={() => navigateToRegister('hpv_test_50_above_initial_screening')}>
235
- {moh745Data.hpv_test_50_above_initial_screening}
251
+ {moh745Data?.dc__screening_visit_type__initial__age_range__50_and_above__screened_hpv ?? 0}
252
+ </td>
253
+ <td>
254
+ {moh745Data?.screened_hpv_initial_visit ?? 0}
236
255
  </td>
237
- <td></td>
238
256
  <td onClick={() => navigateToRegister('hpv_test_less_25_routine_screening')}>
239
- {moh745Data.hpv_test_less_25_routine_screening}
257
+ {moh745Data?.dc__screening_visit_type__routine__age_range__less_than_25__screened_hpv ?? 0}
240
258
  </td>
241
259
  <td onClick={() => navigateToRegister('hpv_test_25_49_routine_screening')}>
242
- {moh745Data.hpv_test_25_49_routine_screening}
260
+ {moh745Data?.dc__screening_visit_type__routine__age_range__25_to_49__screened_hpv ?? 0}
243
261
  </td>
244
262
  <td onClick={() => navigateToRegister('hpv_test_50_above_routine_screening')}>
245
- {moh745Data.hpv_test_50_above_routine_screening}
263
+ {moh745Data?.dc__screening_visit_type__routine__age_range__50_and_above__screened_hpv ?? 0}
264
+ </td>
265
+ <td>
266
+ {moh745Data?.screened_hpv_routine_visit ?? 0}
246
267
  </td>
247
- <td></td>
248
268
  <td onClick={() => navigateToRegister('hpv_test_less_25_post_treatment_screening')}>
249
- {moh745Data.hpv_test_less_25_post_treatment_screening}
269
+ {moh745Data?.dc__screening_visit_type__post_treatment__age_range__less_than_25__screened_hpv ?? 0}
250
270
  </td>
251
271
  <td onClick={() => navigateToRegister('hpv_test_25_49_post_treatment_screening')}>
252
- {moh745Data.hpv_test_25_49_post_treatment_screening}
272
+ {moh745Data?.dc__screening_visit_type__post_treatment__age_range__25_to_49__screened_hpv ?? 0}
253
273
  </td>
254
274
  <td onClick={() => navigateToRegister('hpv_test_50_above_post_treatment_screening')}>
255
- {moh745Data.hpv_test_50_above_post_treatment_screening}
275
+ {moh745Data?.dc__screening_visit_type__post_treatment__age_range__50_and_above__screened_hpv ?? 0}
256
276
  </td>
257
- <td></td>
258
- <td onClick={() => navigateToRegister('hpv_test_total')}>{moh745Data.hpv_test_total}</td>
277
+ <td>
278
+ {moh745Data?.screened_hpv_post_treatment_visit ?? 0}
279
+ </td>
280
+ <td onClick={() => navigateToRegister('hpv_test_total')}></td>
259
281
  </tr>
260
282
  <tr>
261
283
  <td>Total Clients Screened (1 a, b &c Above)</td>
@@ -276,108 +298,120 @@ const Moh745Component: React.FC = () => {
276
298
  <tr>
277
299
  <td>2 a) Number of clients with Positive VIA or VIA/VILLI result</td>
278
300
  <td onClick={() => navigateToRegister('positive_via_villi_less_25_initial_screening')}>
279
- {moh745Data.positive_via_villi_less_25_initial_screening}
301
+ {moh745Data?.dc__screening_visit_type__initial__age_range__less_than_25__positive_via_or_via_vili_test_result ?? 0}
280
302
  </td>
281
303
  <td onClick={() => navigateToRegister('positive_via_villi_25_49_initial_screening')}>
282
- {moh745Data.positive_via_villi_25_49_initial_screening}
304
+ {moh745Data?.dc__screening_visit_type__initial__age_range__25_to_49__positive_via_or_via_vili_test_result ?? 0}
283
305
  </td>
284
306
  <td onClick={() => navigateToRegister('positive_via_villi_50_above_initial_screening')}>
285
- {moh745Data.positive_via_villi_50_above_initial_screening}
307
+ {moh745Data?.dc__screening_visit_type__initial__age_range__50_and_above__positive_via_or_via_vili_test_result ?? 0}
308
+ </td>
309
+ <td>
310
+ { moh745Data?.positive_via_or_via_vili_test_result_initial_visit ?? 0}
286
311
  </td>
287
- <td></td>
288
312
  <td onClick={() => navigateToRegister('positive_via_villi_less_25_routine_screening')}>
289
- {moh745Data.positive_via_villi_less_25_routine_screening}
313
+ {moh745Data?.dc__screening_visit_type__routine__age_range__less_than_25__positive_via_or_via_vili_test_result ?? 0}
290
314
  </td>
291
315
  <td onClick={() => navigateToRegister('positive_via_villi_25_49_routine_screening')}>
292
- {moh745Data.positive_via_villi_25_49_routine_screening}
316
+ {moh745Data?.dc__screening_visit_type__routine__age_range__25_to_49__positive_via_or_via_vili_test_result ?? 0}
293
317
  </td>
294
318
  <td onClick={() => navigateToRegister('positive_via_villi_50_above_routine_screening')}>
295
- {moh745Data.positive_via_villi_50_above_routine_screening}
319
+ {moh745Data?.dc__screening_visit_type__routine__age_range__50_and_above__positive_via_or_via_vili_test_result ?? 0}
320
+ </td>
321
+ <td>
322
+ {moh745Data?.positive_via_or_via_vili_test_result_routine_visit ?? 0}
296
323
  </td>
297
- <td></td>
298
324
  <td onClick={() => navigateToRegister('positive_via_villi_less_25_post_treatment_screening')}>
299
- {moh745Data.positive_via_villi_less_25_post_treatment_screening}
325
+ {moh745Data?.dc__screening_visit_type__post_treatment__age_range__less_than_25__positive_via_or_via_vili_test_result ?? 0}
300
326
  </td>
301
327
  <td onClick={() => navigateToRegister('positive_via_villi_25_49_post_treatment_screening')}>
302
- {moh745Data.positive_via_villi_25_49_post_treatment_screening}
328
+ {moh745Data?.dc__screening_visit_type__post_treatment__age_range__25_to_49__positive_via_or_via_vili_test_result ?? 0}
303
329
  </td>
304
330
  <td onClick={() => navigateToRegister('positive_via_villi_50_above_post_treatment_screening')}>
305
- {moh745Data.positive_via_villi_50_above_post_treatment_screening}
331
+ {moh745Data?.dc__screening_visit_type__post_treatment__age_range__50_and_above__positive_via_or_via_vili_test_result ?? 0}
332
+ </td>
333
+ <td>
334
+ {moh745Data?.positive_via_or_via_vili_test_result_post_treatment_visit ?? 0}
306
335
  </td>
307
- <td></td>
308
336
  <td onClick={() => navigateToRegister('positive_via_villi_total')}>
309
- {moh745Data.positive_via_villi_total}
337
+
310
338
  </td>
311
339
  </tr>
312
340
  <tr>
313
341
  <td> b) Number of clients with Positive Cytology result</td>
314
342
  <td onClick={() => navigateToRegister('positive_cytology_less_25_initial_screening')}>
315
- {moh745Data.positive_cytology_less_25_initial_screening}
343
+
316
344
  </td>
317
345
  <td onClick={() => navigateToRegister('positive_cytology_25_49_initial_screening')}>
318
- {moh745Data.positive_cytology_25_49_initial_screening}
346
+
319
347
  </td>
320
348
  <td onClick={() => navigateToRegister('positive_cytology_50_above_initial_screening')}>
321
- {moh745Data.positive_cytology_50_above_initial_screening}
349
+
322
350
  </td>
323
351
  <td></td>
324
352
  <td onClick={() => navigateToRegister('positive_cytology_less_25_routine_screening')}>
325
- {moh745Data.positive_cytology_less_25_routine_screening}
353
+
326
354
  </td>
327
355
  <td onClick={() => navigateToRegister('positive_cytology_25_49_routine_screening')}>
328
- {moh745Data.positive_cytology_25_49_routine_screening}
356
+
329
357
  </td>
330
358
  <td onClick={() => navigateToRegister('positive_cytology_50_above_routine_screening')}>
331
- {moh745Data.positive_cytology_50_above_routine_screening}
359
+
332
360
  </td>
333
361
  <td></td>
334
362
  <td onClick={() => navigateToRegister('positive_cytology_less_25_post_treatment_screening')}>
335
- {moh745Data.positive_cytology_less_25_post_treatment_screening}
363
+
336
364
  </td>
337
365
  <td onClick={() => navigateToRegister('positive_cytology_25_49_post_treatment_screening')}>
338
- {moh745Data.positive_cytology_25_49_post_treatment_screening}
366
+
339
367
  </td>
340
368
  <td onClick={() => navigateToRegister('positive_cytology_50_above_post_treatment_screening')}>
341
- {moh745Data.positive_cytology_50_above_post_treatment_screening}
369
+
342
370
  </td>
343
371
  <td></td>
344
372
  <td onClick={() => navigateToRegister('positive_cytology_total')}>
345
- {moh745Data.positive_cytology_total}
373
+
346
374
  </td>
347
375
  </tr>
348
376
  <tr>
349
377
  <td> c) Number of clients with Positive HPV result</td>
350
378
  <td onClick={() => navigateToRegister('positive_hpv_less_25_initial_screening')}>
351
- {moh745Data.positive_hpv_less_25_initial_screening}
379
+ {moh745Data?.dc__screening_visit_type__initial__age_range__less_than_25__positive_hpv_test_result ?? 0}
352
380
  </td>
353
381
  <td onClick={() => navigateToRegister('positive_hpv_25_49_initial_screening')}>
354
- {moh745Data.positive_hpv_25_49_initial_screening}
382
+ {moh745Data?.dc__screening_visit_type__initial__age_range__25_to_49__positive_hpv_test_result ?? 0}
355
383
  </td>
356
384
  <td onClick={() => navigateToRegister('positive_hpv_50_above_initial_screening')}>
357
- {moh745Data.positive_hpv_50_above_initial_screening}
385
+ {moh745Data?.dc__screening_visit_type__initial__age_range__50_and_above__positive_hpv_test_result ?? 0}
386
+ </td>
387
+ <td>
388
+ {moh745Data?.positive_hpv_test_result_initial_visit ?? 0}
358
389
  </td>
359
- <td></td>
360
390
  <td onClick={() => navigateToRegister('positive_hpv_less_25_routine_screening')}>
361
- {moh745Data.positive_hpv_less_25_routine_screening}
391
+ {moh745Data?.dc__screening_visit_type__routine__age_range__less_than_25__positive_hpv_test_result ?? 0}
362
392
  </td>
363
393
  <td onClick={() => navigateToRegister('positive_hpv_25_49_routine_screening')}>
364
- {moh745Data.positive_hpv_25_49_routine_screening}
394
+ {moh745Data?.dc__screening_visit_type__routine__age_range__25_to_49__positive_hpv_test_result ?? 0}
365
395
  </td>
366
396
  <td onClick={() => navigateToRegister('positive_hpv_50_above_routine_screening')}>
367
- {moh745Data.positive_hpv_50_above_routine_screening}
397
+ {moh745Data?.dc__screening_visit_type__routine__age_range__50_and_above__positive_hpv_test_result ?? 0}
398
+ </td>
399
+ <td>
400
+ {moh745Data?.positive_hpv_test_result_routine_visit ?? 0}
368
401
  </td>
369
- <td></td>
370
402
  <td onClick={() => navigateToRegister('positive_hpv_less_25_post_treatment_screening')}>
371
- {moh745Data.positive_hpv_less_25_post_treatment_screening}
403
+ {moh745Data?.dc__screening_visit_type__post_treatment__age_range__less_than_25__positive_hpv_test_result ?? 0}
372
404
  </td>
373
405
  <td onClick={() => navigateToRegister('positive_hpv_25_49_post_treatment_screening')}>
374
- {moh745Data.positive_hpv_25_49_post_treatment_screening}
406
+ {moh745Data?.dc__screening_visit_type__post_treatment__age_range__25_to_49__positive_hpv_test_result ?? 0}
375
407
  </td>
376
408
  <td onClick={() => navigateToRegister('positive_hpv_50_above_post_treatment_screening')}>
377
- {moh745Data.positive_hpv_50_above_post_treatment_screening}
409
+ {moh745Data?.dc__screening_visit_type__post_treatment__age_range__50_and_above__positive_hpv_test_result ?? 0}
378
410
  </td>
379
- <td></td>
380
- <td onClick={() => navigateToRegister('positive_hpv_total')}>{moh745Data.positive_hpv_total}</td>
411
+ <td>
412
+ {moh745Data?.positive_hpv_test_result_post_treatment_visit ?? 0}
413
+ </td>
414
+ <td onClick={() => navigateToRegister('positive_hpv_total')}></td>
381
415
  </tr>
382
416
  <tr>
383
417
  <td>Total Clients Screened positive (2 a, b &c Above)</td>
@@ -398,185 +432,189 @@ const Moh745Component: React.FC = () => {
398
432
  <tr>
399
433
  <td>3) Number of clients with suspicios cancer lessions </td>
400
434
  <td onClick={() => navigateToRegister('suspicious_cancer_lessions_less_25_initial_screening')}>
401
- {moh745Data.suspicious_cancer_lessions_less_25_initial_screening}
435
+ {moh745Data?.dc__screening_visit_type__initial__age_range__less_than_25__via_or_via_vili_suspicious_lesion ?? 0}
402
436
  </td>
403
437
  <td onClick={() => navigateToRegister('suspicious_cancer_lessions_25_49_initial_screening')}>
404
- {moh745Data.suspicious_cancer_lessions_25_49_initial_screening}
438
+ {moh745Data?.dc__screening_visit_type__initial__age_range__25_to_49__via_or_via_vili_suspicious_lesion ?? 0}
405
439
  </td>
406
440
  <td onClick={() => navigateToRegister('suspicious_cancer_lessions_50_above_initial_screening')}>
407
- {moh745Data.suspicious_cancer_lessions_50_above_initial_screening}
441
+ {moh745Data?.dc__screening_visit_type__initial__age_range__50_and_above__via_or_via_vili_suspicious_lesion ?? 0}
442
+ </td>
443
+ <td>
444
+ {moh745Data?.via_or_via_vili_suspicious_lesion_initial_visit ?? 0}
408
445
  </td>
409
- <td>{}</td>
410
446
  <td onClick={() => navigateToRegister('suspicious_cancer_lessions_less_25_routine_screening')}>
411
- {moh745Data.suspicious_cancer_lessions_less_25_routine_screening}
447
+ { moh745Data?.dc__screening_visit_type__routine__age_range__less_than_25__via_or_via_vili_suspicious_lesion ?? 0}
412
448
  </td>
413
449
  <td onClick={() => navigateToRegister('suspicious_cancer_lessions_25_49_routine_screening')}>
414
- {moh745Data.suspicious_cancer_lessions_25_49_routine_screening}
450
+ { moh745Data?.dc__screening_visit_type__routine__age_range__25_to_49__via_or_via_vili_suspicious_lesion ?? 0}
415
451
  </td>
416
452
  <td onClick={() => navigateToRegister('suspicious_cancer_lessions_50_above_routine_screening')}>
417
- {moh745Data.suspicious_cancer_lessions_50_above_routine_screening}
453
+ { moh745Data?.dc__screening_visit_type__routine__age_range__50_and_above__via_or_via_vili_suspicious_lesion ?? 0}
454
+ </td>
455
+ <td>
456
+ {moh745Data?.via_or_via_vili_suspicious_lesion_routine_visit ?? 0}
418
457
  </td>
419
- <td>{}</td>
420
458
  <td onClick={() => navigateToRegister('suspicious_cancer_lessions_less_25_post_treatment_screening')}>
421
- {moh745Data.suspicious_cancer_lessions_less_25_post_treatment_screening}
459
+ { moh745Data?.dc__screening_visit_type__post_treatment__age_range__less_than_25__via_or_via_vili_suspicious_lesion ?? 0}
422
460
  </td>
423
461
  <td onClick={() => navigateToRegister('suspicious_cancer_lessions_25_49_post_treatment_screening')}>
424
- {moh745Data.suspicious_cancer_lessions_25_49_post_treatment_screening}
462
+ {moh745Data?.dc__screening_visit_type__post_treatment__age_range__25_to_49__via_or_via_vili_suspicious_lesion ?? 0}
425
463
  </td>
426
464
  <td
427
465
  onClick={() => navigateToRegister('suspicious_cancer_lessions_50_above_post_treatment_screening')}
428
466
  >
429
- {moh745Data.suspicious_cancer_lessions_50_above_post_treatment_screening}
467
+ {moh745Data?.dc__screening_visit_type__post_treatment__age_range__50_and_above__via_or_via_vili_suspicious_lesion ?? 0}
430
468
  </td>
431
- <td>{}</td>
469
+ <td> {moh745Data?.via_or_via_vili_suspicious_lesion_post_treatment_visit ?? 0}</td>
432
470
  <td onClick={() => navigateToRegister('suspicious_cancer_lessions_total')}>
433
- {moh745Data.suspicious_cancer_lessions_total}
471
+
434
472
  </td>
435
473
  </tr>
436
474
  <tr>
437
475
  <td>4) Number of clients treated using Cryotherapy</td>
438
476
  <td onClick={() => navigateToRegister('cryotherapy_treatment_less_25_initial_screening')}>
439
- {moh745Data.cryotherapy_treatment_less_25_initial_screening}
477
+ {moh745Data?.dc__screening_visit_type__initial__age_range__less_than_25__treated_via_cyrotherapy ?? 0}
440
478
  </td>
441
479
  <td onClick={() => navigateToRegister('cryotherapy_treatment_25_49_initial_screening')}>
442
- {moh745Data.cryotherapy_treatment_25_49_initial_screening}
480
+ {moh745Data?.dc__screening_visit_type__initial__age_range__25_to_49__treated_via_cyrotherapy ?? 0}
443
481
  </td>
444
482
  <td onClick={() => navigateToRegister('cryotherapy_treatment_50_above_initial_screening')}>
445
- {moh745Data.cryotherapy_treatment_50_above_initial_screening}
483
+ {moh745Data?.dc__screening_visit_type__initial__age_range__50_and_above__treated_via_cyrotherapy ?? 0}
446
484
  </td>
447
- <td>{}</td>
485
+ <td>{0}</td>
448
486
  <td onClick={() => navigateToRegister('cryotherapy_treatment_less_25_routine_screening')}>
449
- {moh745Data.cryotherapy_treatment_less_25_routine_screening}
487
+ {moh745Data?.dc__screening_visit_type__routine__age_range__less_than_25__treated_via_cyrotherapy ?? 0}
450
488
  </td>
451
489
  <td onClick={() => navigateToRegister('cryotherapy_treatment_25_49_routine_screening')}>
452
- {moh745Data.cryotherapy_treatment_25_49_routine_screening}
490
+ {moh745Data?.dc__screening_visit_type__routine__age_range__25_to_49__treated_via_cyrotherapy ?? 0}
453
491
  </td>
454
492
  <td onClick={() => navigateToRegister('cryotherapy_treatment_50_above_routine_screening')}>
455
- {moh745Data.cryotherapy_treatment_50_above_routine_screening}
493
+ {moh745Data?.dc__screening_visit_type__routine__age_range__50_and_above__treated_via_cyrotherapy ?? 0}
456
494
  </td>
457
- <td>{}</td>
495
+ <td>{0}</td>
458
496
  <td onClick={() => navigateToRegister('cryotherapy_treatment_less_25_post_treatment_screening')}>
459
- {moh745Data.cryotherapy_treatment_less_25_post_treatment_screening}
497
+ {moh745Data?.dc__screening_visit_type__post_treatment__age_range__less_than_25__treated_via_cyrotherapy ?? 0}
460
498
  </td>
461
499
  <td onClick={() => navigateToRegister('cryotherapy_treatment_25_49_post_treatment_screening')}>
462
- {moh745Data.cryotherapy_treatment_25_49_post_treatment_screening}
500
+ {moh745Data?.dc__screening_visit_type__post_treatment__age_range__25_to_49__treated_via_cyrotherapy ?? 0}
463
501
  </td>
464
502
  <td onClick={() => navigateToRegister('cryotherapy_treatment_50_above_post_treatment_screening')}>
465
- {moh745Data.cryotherapy_treatment_50_above_post_treatment_screening}
503
+ {moh745Data?.dc__screening_visit_type__post_treatment__age_range__50_and_above__treated_via_cyrotherapy ?? 0}
466
504
  </td>
467
- <td>{}</td>
505
+ <td>{0}</td>
468
506
  <td onClick={() => navigateToRegister('cryotherapy_treatment_total')}>
469
- {moh745Data.cryotherapy_treatment_total}
507
+
470
508
  </td>
471
509
  </tr>
472
510
  <tr>
473
511
  <td>5) Number of clients treated using Thermocoagulation</td>
474
512
  <td onClick={() => navigateToRegister('thermocoagulation_treatment_less_25_initial_screening')}>
475
- {moh745Data.thermocoagulation_treatment_less_25_initial_screening}
513
+ {moh745Data?.dc__screening_visit_type__initial__age_range__less_than_25__treated_via_thermo_coagulation ?? 0}
476
514
  </td>
477
515
  <td onClick={() => navigateToRegister('thermocoagulation_treatment_25_49_initial_screening')}>
478
- {moh745Data.thermocoagulation_treatment_25_49_initial_screening}
516
+ {moh745Data?.dc__screening_visit_type__initial__age_range__25_to_49__treated_via_thermo_coagulation ?? 0}
479
517
  </td>
480
518
  <td onClick={() => navigateToRegister('thermocoagulation_treatment_50_above_initial_screening')}>
481
- {moh745Data.thermocoagulation_treatment_50_above_initial_screening}
519
+ {moh745Data?.dc__screening_visit_type__initial__age_range__50_and_above__treated_via_thermo_coagulation ?? 0}
482
520
  </td>
483
- <td>{}</td>
521
+ <td>{moh745Data?.treatment_method_thermo_coagulation_initial_visit ?? 0}</td>
484
522
  <td onClick={() => navigateToRegister('thermocoagulation_treatment_less_25_routine_screening')}>
485
- {moh745Data.thermocoagulation_treatment_less_25_routine_screening}
523
+ {moh745Data?.dc__screening_visit_type__routine__age_range__less_than_25__treated_via_thermo_coagulation ?? 0}
486
524
  </td>
487
525
  <td onClick={() => navigateToRegister('thermocoagulation_treatment_25_49_routine_screening')}>
488
- {moh745Data.thermocoagulation_treatment_25_49_routine_screening}
526
+ {moh745Data?.dc__screening_visit_type__routine__age_range__25_to_49__treated_via_thermo_coagulation ?? 0}
489
527
  </td>
490
528
  <td onClick={() => navigateToRegister('thermocoagulation_treatment_50_above_routine_screening')}>
491
- {moh745Data.thermocoagulation_treatment_50_above_routine_screening}
529
+ {moh745Data?.dc__screening_visit_type__routine__age_range__50_and_above__treated_via_thermo_coagulation ?? 0}
492
530
  </td>
493
- <td>{}</td>
531
+ <td>{moh745Data?.treatment_method_thermo_coagulation_routine_visit ?? 0}</td>
494
532
  <td
495
533
  onClick={() => navigateToRegister('thermocoagulation_treatment_less_25_post_treatment_screening')}
496
534
  >
497
- {moh745Data.thermocoagulation_treatment_less_25_post_treatment_screening}
535
+ {moh745Data?.dc__screening_visit_type__post_treatment__age_range__less_than_25__treated_via_thermo_coagulation ?? 0}
498
536
  </td>
499
537
  <td onClick={() => navigateToRegister('thermocoagulation_treatment_25_49_post_treatment_screening')}>
500
- {moh745Data.thermocoagulation_treatment_25_49_post_treatment_screening}
538
+ {moh745Data?.dc__screening_visit_type__post_treatment__age_range__25_to_49__treated_via_thermo_coagulation ?? 0}
501
539
  </td>
502
540
  <td
503
541
  onClick={() => navigateToRegister('thermocoagulation_treatment_50_above_post_treatment_screening')}
504
542
  >
505
- {moh745Data.thermocoagulation_treatment_50_above_post_treatment_screening}
543
+ {moh745Data?.dc__screening_visit_type__post_treatment__age_range__50_and_above__treated_via_thermo_coagulation ?? 0}
506
544
  </td>
507
- <td>{}</td>
545
+ <td>{moh745Data?.treatment_method_thermo_coagulation_post_treatment_visit ?? 0}</td>
508
546
  <td onClick={() => navigateToRegister('thermocoagulation_treatment_total')}>
509
- {moh745Data.thermocoagulation_treatment_total}
547
+
510
548
  </td>
511
549
  </tr>
512
550
  <tr>
513
551
  <td>6) Number of clients treated using LEEP</td>
514
552
  <td onClick={() => navigateToRegister('leep_treatment_less_25_initial_screening')}>
515
- {moh745Data.leep_treatment_less_25_initial_screening}
553
+ {moh745Data?.dc__screening_visit_type__initial__age_range__less_than_25__treated_via_leep ?? 0}
516
554
  </td>
517
555
  <td onClick={() => navigateToRegister('leep_treatment_25_49_initial_screening')}>
518
- {moh745Data.leep_treatment_25_49_initial_screening}
556
+ {moh745Data?.dc__screening_visit_type__initial__age_range__25_to_49__treated_via_leep ?? 0}
519
557
  </td>
520
558
  <td onClick={() => navigateToRegister('leep_treatment_50_above_initial_screening')}>
521
- {moh745Data.leep_treatment_50_above_initial_screening}
559
+ {moh745Data?.dc__screening_visit_type__initial__age_range__50_and_above__treated_via_leep ?? 0}
522
560
  </td>
523
- <td>{}</td>
561
+ <td>{moh745Data?.treatment_method_leep_initial_visit ?? 0}</td>
524
562
  <td onClick={() => navigateToRegister('leep_treatment_less_25_routine_screening')}>
525
- {moh745Data.leep_treatment_less_25_routine_screening}
563
+ {moh745Data?.dc__screening_visit_type__routine__age_range__less_than_25__treated_via_leep ?? 0}
526
564
  </td>
527
565
  <td onClick={() => navigateToRegister('leep_treatment_25_49_routine_screening')}>
528
- {moh745Data.leep_treatment_25_49_routine_screening}
566
+ {moh745Data?.dc__screening_visit_type__routine__age_range__25_to_49__treated_via_leep ?? 0}
529
567
  </td>
530
568
  <td onClick={() => navigateToRegister('leep_treatment_50_above_routine_screening')}>
531
- {moh745Data.leep_treatment_50_above_routine_screening}
569
+ {moh745Data?.dc__screening_visit_type__routine__age_range__50_and_above__treated_via_leep ?? 0}
532
570
  </td>
533
- <td>{}</td>
571
+ <td>{moh745Data?.treatment_method_leep_routine_visit ?? 0}</td>
534
572
  <td onClick={() => navigateToRegister('leep_treatment_less_25_post_treatment_screening')}>
535
- {moh745Data.leep_treatment_less_25_post_treatment_screening}
573
+ {moh745Data?.dc__screening_visit_type__post_treatment__age_range__less_than_25__treated_via_leep ?? 0}
536
574
  </td>
537
575
  <td onClick={() => navigateToRegister('leep_treatment_25_49_post_treatment_screening')}>
538
- {moh745Data.leep_treatment_25_49_post_treatment_screening}
576
+ {moh745Data?.dc__screening_visit_type__post_treatment__age_range__25_to_49__treated_via_leep ?? 0}
539
577
  </td>
540
578
  <td onClick={() => navigateToRegister('leep_treatment_50_above_post_treatment_screening')}>
541
- {moh745Data.leep_treatment_50_above_post_treatment_screening}
579
+ {moh745Data?.dc__screening_visit_type__post_treatment__age_range__50_and_above__treated_via_leep ?? 0}
542
580
  </td>
543
- <td>{}</td>
544
- <td onClick={() => navigateToRegister('leep_treatment_total')}>{moh745Data.leep_treatment_total}</td>
581
+ <td>{moh745Data?.treatment_method_leep_post_treatment_visit ?? 0}</td>
582
+ <td onClick={() => navigateToRegister('leep_treatment_total')}></td>
545
583
  </tr>
546
584
  <tr>
547
585
  <td>7) Numeber of other treatment given (e.g Hysterectomy, cone)</td>
548
586
  <td onClick={() => navigateToRegister('other_treatment_less_25_initial_screening')}>
549
- {moh745Data.other_treatment_less_25_initial_screening}
587
+ {moh745Data?.dc__screening_visit_type__initial__age_range__less_than_25__treated_via_other ?? 0}
550
588
  </td>
551
589
  <td onClick={() => navigateToRegister('other_treatment_25_49_initial_screening')}>
552
- {moh745Data.other_treatment_25_49_initial_screening}
590
+ {moh745Data?.dc__screening_visit_type__initial__age_range__25_to_49__treated_via_other ?? 0}
553
591
  </td>
554
592
  <td onClick={() => navigateToRegister('other_treatment_50_above_initial_screening')}>
555
- {moh745Data.other_treatment_50_above_initial_screening}
593
+ {moh745Data?.dc__screening_visit_type__initial__age_range__50_and_above__treated_via_other ?? 0}
556
594
  </td>
557
- <td>{}</td>
595
+ <td>{moh745Data?.treatment_method_other_initial_visit ?? 0}</td>
558
596
  <td onClick={() => navigateToRegister('other_treatment_less_25_routine_screening')}>
559
- {moh745Data.other_treatment_less_25_routine_screening}
597
+ {moh745Data?.dc__screening_visit_type__routine__age_range__less_than_25__treated_via_other ?? 0}
560
598
  </td>
561
599
  <td onClick={() => navigateToRegister('other_treatment_25_49_routine_screening')}>
562
- {moh745Data.other_treatment_25_49_routine_screening}
600
+ {moh745Data?.dc__screening_visit_type__routine__age_range__25_to_49__treated_via_other ?? 0}
563
601
  </td>
564
602
  <td onClick={() => navigateToRegister('other_treatment_50_above_routine_screening')}>
565
- {moh745Data.other_treatment_50_above_routine_screening}
603
+ {moh745Data?.dc__screening_visit_type__routine__age_range__50_and_above__treated_via_other ?? 0}
566
604
  </td>
567
- <td>{}</td>
605
+ <td>{moh745Data?.treatment_method_other_routine_visit ?? 0}</td>
568
606
  <td onClick={() => navigateToRegister('other_treatment_less_25_post_treatment_screening')}>
569
- {moh745Data.other_treatment_less_25_post_treatment_screening}
607
+ {moh745Data?.dc__screening_visit_type__post_treatment__age_range__less_than_25__treated_via_other ?? 0}
570
608
  </td>
571
609
  <td onClick={() => navigateToRegister('other_treatment_25_49_post_treatment_screening')}>
572
- {moh745Data.other_treatment_25_49_post_treatment_screening}
610
+ {moh745Data?.dc__screening_visit_type__post_treatment__age_range__25_to_49__treated_via_other ?? 0}
573
611
  </td>
574
612
  <td onClick={() => navigateToRegister('other_treatment_50_above_post_treatment_screening')}>
575
- {moh745Data.other_treatment_50_above_post_treatment_screening}
613
+ {moh745Data?.dc__screening_visit_type__post_treatment__age_range__50_and_above__treated_via_other ?? 0}
576
614
  </td>
577
- <td>{}</td>
615
+ <td>{moh745Data?.treatment_method_other_post_treatment_visit ?? 0}</td>
578
616
  <td onClick={() => navigateToRegister('other_treatment_total')}>
579
- {moh745Data.other_treatment_total}
617
+
580
618
  </td>
581
619
  </tr>
582
620
  <tr>
@@ -586,65 +624,66 @@ const Moh745Component: React.FC = () => {
586
624
  navigateToRegister('hiv_positive_screened_cervical_cancer_less_25_initial_screening')
587
625
  }
588
626
  >
589
- {moh745Data.hiv_positive_screened_cervical_cancer_less_25_initial_screening}
627
+ {moh745Data?.dc__screening_visit_type__initial__age_range__less_than_25__hiv_positive_screened ?? 0}
590
628
  </td>
591
629
  <td
592
630
  onClick={() => navigateToRegister('hiv_positive_screened_cervical_cancer_25_49_initial_screening')}
593
631
  >
594
- {moh745Data.hiv_positive_screened_cervical_cancer_25_49_initial_screening}
632
+ {moh745Data?.dc__screening_visit_type__initial__age_range__25_to_49__hiv_positive_screened ?? 0}
595
633
  </td>
596
634
  <td
597
635
  onClick={() =>
598
636
  navigateToRegister('hiv_positive_screened_cervical_cancer_50_above_initial_screening')
599
637
  }
600
638
  >
601
- {moh745Data.hiv_positive_screened_cervical_cancer_50_above_initial_screening}
639
+ {moh745Data?.dc__screening_visit_type__initial__age_range__50_and_above__hiv_positive_screened ?? 0}
602
640
  </td>
603
- <td>{}</td>
641
+ <td>{moh745Data?.hiv_positive_screened_initial_visit ?? 0}</td>
604
642
  <td
605
643
  onClick={() =>
606
644
  navigateToRegister('hiv_positive_screened_cervical_cancer_less_25_routine_screening')
607
645
  }
608
646
  >
609
- {moh745Data.hiv_positive_screened_cervical_cancer_less_25_routine_screening}
647
+ {moh745Data?.dc__screening_visit_type__routine__age_range__less_than_25__hiv_positive_screened ?? 0}
610
648
  </td>
611
649
  <td
612
650
  onClick={() => navigateToRegister('hiv_positive_screened_cervical_cancer_25_49_routine_screening')}
613
651
  >
614
- {moh745Data.hiv_positive_screened_cervical_cancer_25_49_routine_screening}
652
+ {moh745Data?.dc__screening_visit_type__routine__age_range__25_to_49__hiv_positive_screened ?? 0}
615
653
  </td>
616
654
  <td
617
655
  onClick={() =>
618
656
  navigateToRegister('hiv_positive_screened_cervical_cancer_50_above_routine_screening')
619
657
  }
620
658
  >
621
- {moh745Data.hiv_positive_screened_cervical_cancer_50_above_routine_screening}
659
+ {moh745Data?.dc__screening_visit_type__routine__age_range__50_and_above__hiv_positive_screened ?? 0}
622
660
  </td>
623
- <td>{}</td>
661
+ <td>{moh745Data?.hiv_positive_screened_routine_visit ?? 0}</td>
624
662
  <td
625
663
  onClick={() =>
626
664
  navigateToRegister('hiv_positive_screened_cervical_cancer_less_25_post_treatment_screening')
627
665
  }
628
666
  >
629
- {moh745Data.hiv_positive_screened_cervical_cancer_less_25_post_treatment_screening}
667
+ {moh745Data?.dc__screening_visit_type__post_treatment__age_range__less_than_25__hiv_positive_screened ?? 0}
630
668
  </td>
631
669
  <td
632
670
  onClick={() =>
633
671
  navigateToRegister('hiv_positive_screened_cervical_cancer_25_49_post_treatment_screening')
634
672
  }
635
673
  >
636
- {moh745Data.hiv_positive_screened_cervical_cancer_25_49_post_treatment_screening}
674
+
675
+ {moh745Data?.dc__screening_visit_type__post_treatment__age_range__25_to_49__hiv_positive_screened ?? 0}
637
676
  </td>
638
677
  <td
639
678
  onClick={() =>
640
679
  navigateToRegister('hiv_positive_screened_cervical_cancer_50_above_post_treatment_screening')
641
680
  }
642
681
  >
643
- {moh745Data.hiv_positive_screened_cervical_cancer_50_above_post_treatment_screening}
682
+ {moh745Data?.dc__screening_visit_type__post_treatment__age_range__50_and_above__hiv_positive_screened ?? 0}
644
683
  </td>
645
- <td>{}</td>
684
+ <td>{moh745Data?.hiv_positive_screened_post_treatment_visit ?? 0}</td>
646
685
  <td onClick={() => navigateToRegister('hiv_positive_screened_cervical_cancer_total')}>
647
- {moh745Data.hiv_positive_screened_cervical_cancer_total}
686
+
648
687
  </td>
649
688
  </tr>
650
689
  <tr>
@@ -654,65 +693,65 @@ const Moh745Component: React.FC = () => {
654
693
  navigateToRegister('hiv_positive_cervical_cancer_positive_less_25_initial_screening')
655
694
  }
656
695
  >
657
- {moh745Data.hiv_positive_cervical_cancer_positive_less_25_initial_screening}
696
+ {moh745Data?.dc__screening_visit_type__initial__age_range__less_than_25__hiv_positive_screened_positive_result ?? 0}
658
697
  </td>
659
698
  <td
660
699
  onClick={() => navigateToRegister('hiv_positive_cervical_cancer_positive_25_49_initial_screening')}
661
700
  >
662
- {moh745Data.hiv_positive_cervical_cancer_positive_25_49_initial_screening}
701
+ {moh745Data?.dc__screening_visit_type__initial__age_range__25_to_49__hiv_positive_screened_positive_result ?? 0}
663
702
  </td>
664
703
  <td
665
704
  onClick={() =>
666
705
  navigateToRegister('hiv_positive_cervical_cancer_positive_50_above_initial_screening')
667
706
  }
668
707
  >
669
- {moh745Data.hiv_positive_cervical_cancer_positive_50_above_initial_screening}
708
+ {moh745Data?.dc__screening_visit_type__initial__age_range__50_and_above__hiv_positive_screened_positive_result ?? 0}
670
709
  </td>
671
- <td>{}</td>
710
+ <td>{moh745Data?.hiv_positive_screened_positive_result_initial_visit ?? 0}</td>
672
711
  <td
673
712
  onClick={() =>
674
713
  navigateToRegister('hiv_positive_cervical_cancer_positive_less_25_routine_screening')
675
714
  }
676
715
  >
677
- {moh745Data.hiv_positive_cervical_cancer_positive_less_25_routine_screening}
716
+ {moh745Data?.dc__screening_visit_type__routine__age_range__less_than_25__hiv_positive_screened_positive_result ?? 0}
678
717
  </td>
679
718
  <td
680
719
  onClick={() => navigateToRegister('hiv_positive_cervical_cancer_positive_25_49_routine_screening')}
681
720
  >
682
- {moh745Data.hiv_positive_cervical_cancer_positive_25_49_routine_screening}
721
+ {moh745Data?.dc__screening_visit_type__routine__age_range__25_to_49__hiv_positive_screened_positive_result ?? 0}
683
722
  </td>
684
723
  <td
685
724
  onClick={() =>
686
725
  navigateToRegister('hiv_positive_cervical_cancer_positive_50_above_routine_screening')
687
726
  }
688
727
  >
689
- {moh745Data.hiv_positive_cervical_cancer_positive_50_above_routine_screening}
728
+ {moh745Data?.dc__screening_visit_type__routine__age_range__50_and_above__hiv_positive_screened_positive_result ?? 0}
690
729
  </td>
691
- <td>{}</td>
730
+ <td>{moh745Data?.hiv_positive_screened_positive_result_routine_visit ?? 0}</td>
692
731
  <td
693
732
  onClick={() =>
694
733
  navigateToRegister('hiv_positive_cervical_cancer_positive_less_25_post_treatment_screening')
695
734
  }
696
735
  >
697
- {moh745Data.hiv_positive_cervical_cancer_positive_less_25_post_treatment_screening}
736
+ {moh745Data?.dc__screening_visit_type__post_treatment__age_range__less_than_25__hiv_positive_screened_positive_result ?? 0}
698
737
  </td>
699
738
  <td
700
739
  onClick={() =>
701
740
  navigateToRegister('hiv_positive_cervical_cancer_positive_25_49_post_treatment_screening')
702
741
  }
703
742
  >
704
- {moh745Data.hiv_positive_cervical_cancer_positive_25_49_post_treatment_screening}
743
+ {moh745Data?.dc__screening_visit_type__post_treatment__age_range__25_to_49__hiv_positive_screened_positive_result ?? 0}
705
744
  </td>
706
745
  <td
707
746
  onClick={() =>
708
747
  navigateToRegister('hiv_positive_cervical_cancer_positive_50_above_post_treatment_screening')
709
748
  }
710
749
  >
711
- {moh745Data.hiv_positive_cervical_cancer_positive_50_above_post_treatment_screening}
750
+ {moh745Data?.dc__screening_visit_type__post_treatment__age_range__50_and_above__hiv_positive_screened_positive_result ?? 0}
712
751
  </td>
713
- <td>{}</td>
752
+ <td>{moh745Data?.hiv_positive_screened_positive_result_post_treatment_visit ?? 0}</td>
714
753
  <td onClick={() => navigateToRegister('hiv_positive_cervical_cancer_positive_total')}>
715
- {moh745Data.hiv_positive_cervical_cancer_positive_total}
754
+
716
755
  </td>
717
756
  </tr>
718
757
  </tbody>