From 191fc75ae77a3488ef87e43248209d3f0c4b86f3 Mon Sep 17 00:00:00 2001 From: Alfred-Mutai Date: Thu, 2 May 2024 16:22:17 +0300 Subject: [PATCH 01/10] Initial MOH731 template --- .../moh-731-report-pdf-view.component.html | 382 +++++++++++++++++- 1 file changed, 380 insertions(+), 2 deletions(-) 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 e62f3113b..21fc3e2e7 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 @@ -20,7 +20,7 @@
- - + --> + + +
+
+ Ministry of Health +
+
+ Ver. July 2023 +
+
+
+ National AIDS & STI Control Program - NASCOP + MOH 731-Ver. July 2023
+ Comprehensive HIV/AIDS reporting form +
+
+
+ County________________________Sub County__________________________Facility______________________MFL_________Month_______Year__________ +
+
+
+
+
+ 1. HIV Testing Services & Pre exposure Prophylaxis +
+
+
+
+
+ 1.1 HIV Tests +
+
+
+
+ Male +
+
+ Female(including PMTCT) +
+
+ Tests +
+
+ HV01-01 +
+
+ HV01-02 +
+
+
+
+ Tests-Facility +
+
+ HV01-03 +
+
+ Tests-Community +
+
+ HV01-04 +
+
+
+
+ Tested KVP +
+
+ HV01-05 +
+
+
+
+ 1.2 HIV Positive Results +
+
+
+
+ Male +
+
+ Female(including PMTCT) +
+
+
+
+ Positive_2-9 +
+
+ HV01-06 +
+
+ HV01-07 +
+
+ Positive_10-14 +
+
+ HV01-08 +
+
+ HV01-09 +
+
+ Positive_15-19 +
+
+ HV01-10 +
+
+ HV01-11 +
+
+ Positive_20-24 +
+
+ HV01-12 +
+
+ HV01-13 +
+
+ Positive_25+ +
+
+ HV01-14 +
+
+ HV01-15 +
+
+ Positive_KVP +
+
+ HV01-16 +
+
+
+
+ Discordant +
+
+ HV01-17 +
+
+ HV01-18 +
+
+
+
+ 1.3 No. Seroconverted while on PrEP +
+
+
+
+ Male +
+
+ Female +
+
+
+
+ HIV Positive +
+
+ HV01-19 +
+
+ HV01-20 +
+
+
+
+
+
+ 1.4 No. Initiated on PrEP(NEW) +
+
+
+
+ Male +
+
+ Female +
+
+
+
+ General popn +
+
+ HV01-21 +
+
+ HV01-22 +
+
+ MSM/MSW +
+
+ HV01-23 +
+
+ PSW +
+
+ HV01-24 +
+
+ PWID/PWUD +
+
+ HV01-25 +
+
+ HV01-26 +
+
+ Discordant Couple +
+
+ HV01-27 +
+
+ HV01-28 +
+
+ Vulnerable Pop +
+
+ HV01-29 +
+
+ HV01-30 +
+
+ AYP (15-24yrs) +
+
+ HV01-31 +
+
+ HV01-32 +
+
+ Pregnant and breastfeeding women +
+
+ HV01-33 +
+
+
+
+ 1.5 No. on Prep Diagnosed with STI +
+
+
+
+ Male +
+
+ Female +
+
+
+
+ General popn +
+
+ HV01-34 +
+
+ HV01-35 +
+
+ MSM/MSW +
+
+ HV01-36 +
+
+ PSW +
+
+ HV01-37 +
+
+ PWID/PWUD +
+
+ HV01-38 +
+
+ HV01-39 +
+
+ Discordant Couple +
+
+ HV01-40 +
+
+ HV01-41 +
+
+ Vulnerable Pop +
+
+ HV01-42 +
+
+ HV01-43 +
+
+ AYP (15-24yrs) +
+
+ HV01-44 +
+
+ HV01-45 +
+
+
+
+
+
+
+ 2. Elimination of Mother-To-Child Transmission(EMTCT) +
+
+ sdfghjk +
+
+ 3. HIV and TB Treatment +
+
+
+
+
+
+ sdfghjk +
+
+ sdfghjk +
+
+ sdfghjk +
+
+
+
+
+
+ kdthfjklh +
+
+ 4. Medical Male Circumcision +
+
+ sdfghjk +
+
+ 5. Post Exposure Prophylaxis +
+
+ sdfghjk +
+
+ +
+
+
+
+ + +
5. Post Exposure Prophylaxis
- sdfghjk +
+
+ Exposed_Occupational +
+
+ HV05-01 + +
+
+ Exposed_Other +
+
+ HV05-02 + +
+
+
+
+ PEP_Occupational +
+
+ HV05-03 + +
+
+ PEP_Other +
+
+ HV05-04 + +
+
From 99b9cfa7ef1668d197ea517490a669235ced3d31 Mon Sep 17 00:00:00 2001 From: Faith Kamau <121166087+hiqedme@users.noreply.github.com> Date: Fri, 3 May 2024 17:27:45 +0300 Subject: [PATCH 04/10] MOH-731 added section 4.3 --- .../moh-731-report-pdf-view.component.html | 76 ++++++++++++++++++- 1 file changed, 75 insertions(+), 1 deletion(-) 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 36f8fceee..f7108aa41 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 @@ -1253,7 +1253,81 @@ 4. Medical Male Circumcision
- sdfghjk +
+ 4.3 Circumcision Adverse Events +
+
+
+ AE_During_Moderate +
+
+ HV04-09 + +
+
+ AE_During_Severe +
+
+ HV04-10 + +
+
+ IAE_Post_Moderate +
+
+ HV04-11 + +
+
+ AE_Post_Severe +
+
+ HV04-12 + +
+
+ Follow up visit less than 14d +
+
+ HV04-13 + +
+
+
Date: Mon, 6 May 2024 12:51:33 +0300 Subject: [PATCH 05/10] Updated MOH template --- .../moh-731-report-pdf-view.component.html | 952 +++++++++++++++--- 1 file changed, 818 insertions(+), 134 deletions(-) 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 f7108aa41..1153a53f1 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 @@ -110,13 +110,13 @@
HV01-01 -
HV01-02 -
@@ -127,7 +127,7 @@
HV01-03 -
@@ -138,7 +138,7 @@ >HV01-04 HV01-05 -
@@ -177,13 +177,13 @@
HV01-06 -
HV01-07 -
@@ -194,7 +194,7 @@ >HV01-08 HV01-09 HV01-10 HV01-11 HV01-12 HV01-13 HV01-14 HV01-15 HV01-16 HV01-17 -
HV01-18 -
@@ -347,13 +347,13 @@
HV01-19 -
HV01-20 -
@@ -379,13 +379,13 @@
HV01-21 -
HV01-22 -
@@ -396,7 +396,7 @@ >HV01-23 HV01-24 -
@@ -418,7 +418,7 @@
HV01-25 -
@@ -426,7 +426,7 @@ >HV01-26 HV01-27 HV01-28 HV01-29 HV01-30 HV01-31 HV01-32 HV01-33 HV01-34 -
HV01-35 -
@@ -567,7 +567,7 @@ >HV01-36 HV01-37 -
@@ -589,7 +589,7 @@
HV01-38 -
@@ -597,7 +597,7 @@ >HV01-39 HV01-40 HV01-41 HV01-42 HV01-43 HV01-44 HV01-45 HV02-01 -
@@ -740,13 +740,13 @@
HV02-02 -
HV02-03 -
@@ -757,7 +757,7 @@ >HV02-04 HV02-05 HV02-06 HV02-07 HV02-08 HV02-09 HV02-10 -
@@ -853,7 +853,7 @@ >HV02-11 HV02-12 HV02-13 HV02-14 -
@@ -913,7 +913,7 @@ >HV02-15 HV02-16 HV02-17 HV02-18 HV02-19 -
@@ -990,7 +990,7 @@ >HV02-20 HV02-21 -
HV02-22 -
@@ -1039,7 +1039,7 @@ >HV02-23 HV02-24 HV02-25 HV02-26 HV02-27 HV02-28 HV02-29 -
@@ -1135,7 +1135,7 @@ >HV02-30 HV02-31 HV02-32 -
@@ -1184,7 +1184,7 @@
HV02-33 -
@@ -1195,7 +1195,7 @@ >HV02-34
-
+
- sdfghjk +
+ 3.1 Starting ART +
+
+
+ Start ART_< 1 +
+
+ (M)HV03-01 + +
+
+ (F)HV03-02 + +
+
+ Start ART_1-4 +
+
+ (M)HV03-03 + +
+
+ (F)HV03-04 + +
+
+ Start ART_5-9 +
+
+ (M)HV03-05 + +
+
+ (F)HV03-06 + +
+
+ Start ART_10-14 +
+
+ (M)HV03-07 + +
+
+ (F)HV03-08 + +
+
+ Start ART_15-19 +
+
+ (M)HV03-09 + +
+
+ (F)HV03-10 + +
+
+ Start ART_20-24 +
+
+ (M)HV03-11 + +
+
+ (F)HV03-12 + +
+
+ Start ART_25+ +
+
+ (M)HV03-13 + +
+
+ (F)HV03-14 + +
+
+
+
+ 3.2 Currently on ART([All]) +
+
+
+ Start ART_< 1 +
+
+ (M)HV03-015 + +
+
+ (F)HV03-016 + +
+
+ Start ART_1-4 +
+
+ (M)HV03-017 + +
+
+ (F)HV03-018 + +
+
+ Start ART_5-9 +
+
+ (M)HV03-019 + +
+
+ (F)HV03-020 + +
+
+ Start ART_10-14 +
+
+ (M)HV03-021 + +
+
+ (F)HV03-022 + +
+
+ Start ART_15-19 +
+
+ (M)HV03-023 + +
+
+ (F)HV03-024 + +
+
+ Start ART_20-24 +
+
+ (M)HV03-025 + +
+
+ (F)HV03-026 + +
+
+ Start ART_25+ +
+
+ (M)HV03-027 + +
+
+ (F)HV03-028 + +
+
+
+
+ 3.3 TB Screening +
+
+
+ Screen for TB_< 15 +
+
+ HV03-029 + +
+
+ Screen for TB_15+ +
+
+ HV03-030 + +
+
+
+
+ 3.4 Starting TPT +
+
+
+ Start TPT_< 15 +
+
+ HV03-031 + +
+
+ Start TPT_15+ +
+
+ HV03-032 + +
+
+
+
+ 3.5 Differentiated Service Delivery +
+
+
+ Established +
+
+ HV03-033 + +
+
+ Not Established +
+
+ HV03-034 + +
+
+ Community +
+
+ HV03-035 + +
+
+ Facility +
+
+ HV03-036 + +
+
+
- sdfghjk -
-
- sdfghjk +
+ 3.6 Nutrition and HIV +
+
+
+ Number SAM + +
+
+ 0-59Months +
+
+ HV03-037 + +
+
+ 5-9Years +
+
+ HV03-038 + +
+
+ 10-14Years +
+
+ HV03-039 + +
+
+ 15-19Years +
+
+ HV03-040 + +
+
+ 20+ +
+
+ HV03-041 + +
+
+ Pregnant & Lactating +
+
+ HV03-042 + +
+
+
+
+ Number MAM + +
+
+ 0-59Months +
+
+ HV03-043 + +
+
+ 5-9Years +
+
+ HV03-044 + +
+
+ 10-14Years +
+
+ HV03-045 + +
+
+ 15-19Years +
+
+ HV03-046 + +
+
+ 20+ +
+
+ HV03-047 + +
+
+ Pregnant & Lactating +
+
+ HV03-048 + +
+
+
+
+ Number SAM+ receiving therapeutic foods +
+
+ 0-59Months +
+
+ HV03-049 + +
+
+ 5-9Years +
+
+ HV03-050 + +
+
+ 10-14Years +
+
+ HV03-051 + +
+
+ 15-19Years +
+
+ HV03-052 + +
+
+ 20+ +
+
+ HV03-053 + +
+
+ Pregnant & Lactating +
+
+ HV03-054 + +
+
+
+
+ Number MAM + receiving Supplemental foods +
+
+ 0-59Months +
+
+ HV03-055 + +
+
+ 5-9Years +
+
+ HV03-056 + +
+
+ 10-14Years +
+
+ HV03-057 + +
+
+ 15-19Years +
+
+ HV03-058 + +
+
+ 20+ +
+
+ HV03-059 + +
+
+ Pregnant & Lactating +
+
+ HV03-060 + +
+
+
+
-
+
- kdthfjklh +
+ 3.7 HIV in TB Clinic +
+
+
+ TB cases _New +
+
+ HV03-061 + +
+
+ TB New_Known HIV Positive(KPs) +
+
+ HV03-062 + +
+
+ TB_New HIV Positive +
+
+ HV03-063 + +
+
+ TB_New_Known HIV Positive(KP) +
+
+ HV03-064 + +
+
+ TB New_Start_HAART +
+
+ HV03-065 + +
+
+
4. Medical Male Circumcision
-
- 4.3 Circumcision Adverse Events +
+ 4.1 Number circumcised
- AE_During_Moderate + Circumcised_0-60 days
HV04-09 - HV04-01 +
- AE_During_Severe + Circumcised_61 days-9 yrs
- HV04-10 - HV04-02 +
- IAE_Post_Moderate + Circumcised_10-14
HV04-11 - HV04-03 +
- AE_Post_Severe + Circumcised_15+
HV04-12 - HV04-04 +
+
+
- Follow up visit less than 14d + Tested_ HIV+
HV04-13 - HV04-05 +
+
+ Tested_ HIV- +
+
+ HV04-06 + +
+
+
+ 4.2 Type of circumcision +
+
+
+ Surgical +
+
+ HV04-07 + +
+
+ Devices +
+
+ HV04-08 + +
+
+
+
+ 4.3 Circumcision Adverse Events +
+
+
+ AE_During_Moderate +
+
+ HV04-09 + +
+
+ AE_During_Severe +
+
+ HV04-10 + +
+
+ IAE_Post_Moderate +
+
+ HV04-11 + +
+
+ AE_Post_Severe +
+
+ HV04-12 + +
+
+ Follow up visit less than 14d +
+
+ HV04-13 + +
+
@@ -1339,7 +2023,7 @@ > 5. Post Exposure Prophylaxis
-
+
Exposed_Occupational @@ -1347,7 +2031,7 @@
HV05-01 -
@@ -1358,7 +2042,7 @@ >HV05-02 HV05-03 -
@@ -1384,7 +2068,7 @@ >HV05-04 Date: Wed, 8 May 2024 11:26:25 +0300 Subject: [PATCH 06/10] MOH-731: Updated report --- .../moh-731-report-pdf-view.component.html | 4876 ++++++++++------- .../moh-731-report-pdf-view.component.ts | 57 +- 2 files changed, 2984 insertions(+), 1949 deletions(-) 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 1153a53f1..80678a74b 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 @@ -11,7 +11,7 @@
- -
diff --git a/src/app/hiv-care-lib/moh-731-report/moh-731-report-pdf-view.component.ts b/src/app/hiv-care-lib/moh-731-report/moh-731-report-pdf-view.component.ts index 893109337..c452b9af8 100644 --- a/src/app/hiv-care-lib/moh-731-report/moh-731-report-pdf-view.component.ts +++ b/src/app/hiv-care-lib/moh-731-report/moh-731-report-pdf-view.component.ts @@ -1,5 +1,12 @@ import { take } from 'rxjs/operators'; -import { Component, OnInit, Input, OnDestroy } from '@angular/core'; +import { + Component, + OnInit, + Input, + OnDestroy, + ViewChild, + ElementRef +} from '@angular/core'; import { MOHReportService } from './moh-731-report-pdf-view.service'; import { SafeResourceUrl, DomSanitizer } from '@angular/platform-browser'; import { LocationResourceService } from '../../openmrs-api/location-resource.service'; @@ -7,6 +14,8 @@ import * as _ from 'lodash'; import { Subscription, BehaviorSubject } from 'rxjs'; import * as Moment from 'moment'; import { PDFDocumentProxy } from 'ng2-pdf-viewer'; +import * as html2canvas from 'html2canvas'; +import * as jsPDF from 'jspdf'; @Component({ selector: 'moh-731-pdf', templateUrl: 'moh-731-report-pdf-view.component.html' @@ -21,13 +30,18 @@ export class MOHReportComponent implements OnInit, OnDestroy { public errorFlag = false; public subscription: Subscription; public locations = []; + public location: any; + public reportData: any; public sectionDefinitions: any; public mohReports: Array; public previousData: any; public numberOfPages = 0; public _data; + month: string | null = null; + year: string | null = null; public stack = []; + @ViewChild('contentToSnapshot') contentToSnapshot!: ElementRef; @Input() public isAggregated = false; @@ -70,6 +84,19 @@ export class MOHReportComponent implements OnInit, OnDestroy { } } + public takeSnapshotAndExport() { + const elementToSnapshot = this.contentToSnapshot.nativeElement; + + html2canvas(elementToSnapshot).then((canvas) => { + const imgData = canvas.toDataURL('image/png'); + const pdf = new jsPDF('p', 'mm', 'a4'); + const imgWidth = 210; // A4 width in mm + const imgHeight = (canvas.height * imgWidth) / canvas.width; + pdf.addImage(imgData, 'PNG', 0, 0, imgWidth, imgHeight); + pdf.save('MOH-731.pdf'); + }); + } + public generatePdf(): void { this.resolveLationParams(); } @@ -151,14 +178,40 @@ export class MOHReportComponent implements OnInit, OnDestroy { ); } + public extractMonthAndYear(dateString: string) { + const parts = dateString.split('-'); + if (parts.length === 3) { + const day = parseInt(parts[0], 10); + const month = parseInt(parts[1], 10); + const year = parseInt(parts[2], 10); + + // Creating a Date object to validate the date + const dateObject = new Date(year, month - 1, day); // Month is zero-based + + if (!isNaN(dateObject.getTime())) { + // Date is valid, extract month and year + this.month = dateObject.toLocaleString('default', { month: 'long' }); + this.year = year.toString(); + } else { + // Invalid date + console.error('Invalid date format.'); + } + } else { + // Invalid date format + console.error('Invalid date format.'); + } + } + private moh731Report(reportsData, sectionDefinitions) { if (Array.isArray(reportsData) && reportsData.length > 0) { // tslint:disable-next-line:prefer-for-of // for (let i = 0; i < reportsData.length; i++) { const paramsArray = this.getLocationHeaders(reportsData); + this.location = paramsArray; + this.extractMonthAndYear(paramsArray[0].endDate); const rowsArray = this.getJoinLocations(reportsData); - + this.reportData = reportsData; this.mohReportService .generateMultiplePdfs(paramsArray, rowsArray, sectionDefinitions) .pipe(take(1)) From 8555a302c9806df09dd4dbc6bb3c96ec59d3a990 Mon Sep 17 00:00:00 2001 From: Alfred-Mutai Date: Wed, 8 May 2024 19:33:47 +0300 Subject: [PATCH 07/10] Sorted formatting --- .../moh-731-report-pdf-view.component.html | 507 ++++++++++++------ 1 file changed, 345 insertions(+), 162 deletions(-) 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 80678a74b..27a108017 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 @@ -49,7 +49,15 @@ >
 National AIDS & STI Control Program - NASCOP National AIDS & STI Control Program - NASCOP HV01-02 HV01-03 HV01-04 HV01-06 HV01-07 HV01-08 HV01-10 HV01-12 HV01-14 HV01-16 HV01-18 HV01-19 HV01-20 HV01-21 HV01-22 HV01-23 {{ reportData[0]?.started_PEP_occupational }} +
+
+ HV01-24 + HV01-25 HV01-27 HV01-29 HV01-31 HV01-33 HV01-35 HV01-36 HV01-38 HV01-40 HV01-42 HV01-44 HV02-01 HV02-02 HV02-03 HV02-04 HV02-06 HV02-08 HV02-10 HV02-11 HV02-13 HV02-15 HV02-17 HV02-19 HV02-20 HV02-22 HV02-23 HV02-25 HV02-27 HV02-29 HV02-30 HV02-32 HV02-33 HV02-34 (F)HV03-02 (M)HV03-03 (M)HV03-05 (M)HV03-07 (M)HV03-09 (M)HV03-11 (M)HV03-13 (M)HV03-015 (F)HV03-016 (M)HV03-017 (M)HV03-019 (M)HV03-021 (M)HV03-023 (M)HV03-025 (M)HV03-027 HV03-029 HV03-030 HV03-032 HV03-034 HV03-036 HV03-038 HV03-040 HV03-042 HV03-044 HV03-046 HV03-048 HV03-050 HV03-052 HV03-054 HV03-056 HV03-058 HV03-060 HV03-062 HV03-064 HV04-01 HV04-02 HV04-04 HV04-06 HV04-08 HV04-10 HV04-12 HV05-01 HV05-02 HV05-04 {{ reportData[0]?.started_PEP_occupational }}0
@@ -156,7 +156,7 @@ display: inline-block; border: 1px solid black; " - >{{ reportData[0]?.started_PEP_occupational }}0
@@ -175,7 +175,7 @@ display: inline-block; border: 1px solid black; " - >{{ reportData[0]?.started_PEP_occupational }}0
@@ -193,7 +193,7 @@ border: 1px solid black; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0
@@ -212,7 +212,7 @@ display: inline-block; border: 1px solid black; " - >{{ reportData[0]?.started_PEP_occupational }}0
@@ -244,7 +244,7 @@ display: inline-block; border: 1px solid black; " - >{{ reportData[0]?.started_PEP_occupational }}0
@@ -258,7 +258,7 @@ display: inline-block; border: 1px solid black; " - >{{ reportData[0]?.started_PEP_occupational }}0
@@ -276,7 +276,7 @@ border: 1px solid black; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0
@@ -291,7 +291,7 @@ border: 1px solid black; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0
@@ -309,7 +309,7 @@ border: 1px solid black; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0
@@ -324,7 +324,7 @@ border: 1px solid black; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -342,7 +342,7 @@ border: 1px solid black; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -357,7 +357,7 @@ border: 1px solid black; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -375,7 +375,7 @@ border: 1px solid black; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -390,7 +390,7 @@ border: 1px solid black; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -408,7 +408,7 @@ border: 1px solid black; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -427,7 +427,7 @@ display: inline-block; border: 1px solid black; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -441,7 +441,7 @@ display: inline-block; border: 1px solid black; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -473,7 +473,7 @@ display: inline-block; border: 1px solid black; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -487,7 +487,7 @@ display: inline-block; border: 1px solid black; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -521,7 +521,7 @@ display: inline-block; border: 1px solid black; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -535,7 +535,7 @@ display: inline-block; border: 1px solid black; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -553,7 +553,7 @@ border: 1px solid black; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -570,21 +570,7 @@ display: inline-block; border: 1px solid black; " - >{{ reportData[0]?.started_PEP_occupational }} - -
- HV01-24 - {{ reportData[0]?.started_PEP_occupational }}0
@@ -616,7 +602,7 @@ border: 1px solid black; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -634,7 +620,7 @@ border: 1px solid black; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -649,7 +635,7 @@ border: 1px solid black; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -667,7 +653,7 @@ border: 1px solid black; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -682,7 +668,7 @@ border: 1px solid black; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -700,7 +686,7 @@ border: 1px solid black; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -715,7 +701,7 @@ border: 1px solid black; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -733,7 +719,7 @@ border: 1px solid black; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -765,7 +751,7 @@ display: inline-block; border: 1px solid black; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -779,7 +765,7 @@ display: inline-block; border: 1px solid black; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -797,7 +783,7 @@ border: 1px solid black; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -814,7 +800,7 @@ display: inline-block; border: 1px solid black; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -846,7 +832,7 @@ border: 1px solid black; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -864,7 +850,7 @@ border: 1px solid black; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -879,7 +865,7 @@ border: 1px solid black; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -897,7 +883,7 @@ border: 1px solid black; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -912,7 +898,7 @@ border: 1px solid black; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -930,7 +916,7 @@ border: 1px solid black; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -945,7 +931,7 @@ border: 1px solid black; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -992,7 +978,7 @@ display: inline-block; border: 1px solid black; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -1020,7 +1006,7 @@ display: inline-block; border: 1px solid black; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -1034,7 +1020,7 @@ display: inline-block; border: 1px solid black; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -1052,7 +1038,7 @@ border: 1px solid black; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -1067,7 +1053,7 @@ border: 1px solid black; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -1085,7 +1071,7 @@ border: 1px solid black; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -1100,7 +1086,7 @@ border: 1px solid black; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -1118,7 +1104,7 @@ border: 1px solid black; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -1133,7 +1119,7 @@ border: 1px solid black; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -1156,7 +1142,7 @@ display: inline-block; border: 1px solid black; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -1174,7 +1160,7 @@ border: 1px solid black; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -1192,7 +1178,7 @@ border: 1px solid black; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -1210,7 +1196,7 @@ border: 1px solid black; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -1233,7 +1219,7 @@ display: inline-block; border: 1px solid black; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -1251,7 +1237,7 @@ border: 1px solid black; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -1269,7 +1255,7 @@ border: 1px solid black; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -1287,7 +1273,7 @@ border: 1px solid black; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -1305,7 +1291,7 @@ border: 1px solid black; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -1330,7 +1316,7 @@ display: inline-block; border: 1px solid black; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -1348,7 +1334,7 @@ border: 1px solid black; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -1384,7 +1370,7 @@ display: inline-block; border: 1px solid black; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -1398,7 +1384,7 @@ display: inline-block; border: 1px solid black; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -1416,7 +1402,7 @@ border: 1px solid black; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -1431,7 +1417,7 @@ border: 1px solid black; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -1449,7 +1435,7 @@ border: 1px solid black; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -1464,7 +1450,7 @@ border: 1px solid black; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -1482,7 +1468,7 @@ border: 1px solid black; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -1497,7 +1483,7 @@ border: 1px solid black; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -1520,7 +1506,7 @@ display: inline-block; border: 1px solid black; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -1538,7 +1524,7 @@ border: 1px solid black; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -1556,7 +1542,7 @@ border: 1px solid black; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -1581,7 +1567,7 @@ display: inline-block; border: 1px solid black; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -1602,7 +1588,7 @@ display: inline-block; border: 1px solid black; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -1620,7 +1606,7 @@ border: 1px solid black; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -1671,7 +1657,10 @@ display: inline-block; border: 1px solid black; " - >{{ reportData[0]?.started_PEP_occupational }}{{ + reportData[0] + ?.dc__age_range__0_to_1__started_art + }} @@ -1685,7 +1674,10 @@ display: inline-block; border: 1px solid black; " - >{{ reportData[0]?.started_PEP_occupational }}{{ + reportData[0] + ?.dc__age_range__0_to_1__started_art + }} @@ -1704,7 +1696,10 @@ border-top: none; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}{{ + reportData[0] + ?.dc__age_range__1_to_9__started_art + }} @@ -1719,7 +1714,10 @@ border: 1px solid black; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}{{ + reportData[0] + ?.dc__age_range__1_to_9__started_art + }} @@ -1738,7 +1736,10 @@ border-top: none; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}{{ + reportData[0] + ?.dc__age_range__1_to_9__started_art + }} @@ -1753,7 +1754,10 @@ border: 1px solid black; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}{{ + reportData[0] + ?.dc__age_range__1_to_9__started_art + }} @@ -1772,7 +1776,10 @@ border-top: none; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}{{ + reportData[0] + ?.dc__age_range__10_to_14__gender__M__started_art + }} @@ -1787,7 +1794,10 @@ border: 1px solid black; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}{{ + reportData[0] + ?.dc__age_range__10_to_14__gender__F__started_art + }} @@ -1806,7 +1816,10 @@ border-top: none; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}{{ + reportData[0] + ?.dc__age_range__15_to_19__gender__M__started_art + }} @@ -1821,7 +1834,10 @@ border: 1px solid black; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}{{ + reportData[0] + ?.dc__age_range__15_to_19__gender__F__started_art + }} @@ -1840,7 +1856,10 @@ border-top: none; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}{{ + reportData[0] + ?.dc__age_range__20_to_24__gender__M__started_art + }} @@ -1855,7 +1874,10 @@ border: 1px solid black; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}{{ + reportData[0] + ?.dc__age_range__20_to_24__gender__F__started_art + }} @@ -1874,7 +1896,10 @@ border-top: none; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}{{ + reportData[0] + ?.dc__age_range__older_than_24__gender__M__started_art + }} @@ -1889,7 +1914,10 @@ border: 1px solid black; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}{{ + reportData[0] + ?.dc__age_range__older_than_24__gender__F__started_art + }} @@ -1918,7 +1946,10 @@ display: inline-block; border: 1px solid black; " - >{{ reportData[0]?.started_PEP_occupational }}{{ + reportData[0] + ?.dc__age_range__0_to_1__current_on_art + }} @@ -1932,7 +1963,10 @@ display: inline-block; border: 1px solid black; " - >{{ reportData[0]?.started_PEP_occupational }}{{ + reportData[0] + ?.dc__age_range__0_to_1__current_on_art + }} @@ -1951,7 +1985,10 @@ border-top: none; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}{{ + reportData[0] + ?.dc__age_range__1_to_9__current_on_art + }} @@ -1966,7 +2003,10 @@ border: 1px solid black; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}{{ + reportData[0] + ?.dc__age_range__1_to_9__current_on_art + }} @@ -1985,7 +2025,10 @@ border-top: none; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}{{ + reportData[0] + ?.dc__age_range__1_to_9__current_on_art + }} @@ -2000,7 +2043,10 @@ border: 1px solid black; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}{{ + reportData[0] + ?.dc__age_range__1_to_9__current_on_art + }} @@ -2019,7 +2065,10 @@ border-top: none; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}{{ + reportData[0] + ?.dc__gender__M__age_range__10_to_14__current_on_art + }} @@ -2034,7 +2083,10 @@ border: 1px solid black; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}{{ + reportData[0] + ?.dc__gender__F__age_range__10_to_14__current_on_art + }} @@ -2053,7 +2105,10 @@ border-top: none; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}{{ + reportData[0] + ?.dc__gender__M__age_range__15_to_19__current_on_art + }} @@ -2068,7 +2123,10 @@ border: 1px solid black; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}{{ + reportData[0] + ?.dc__gender__F__age_range__15_to_19__current_on_art + }} @@ -2087,7 +2145,10 @@ border-top: none; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}{{ + reportData[0] + ?.dc__gender__M__age_range__20_to_24__current_on_art + }} @@ -2102,7 +2163,10 @@ border: 1px solid black; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}{{ + reportData[0] + ?.dc__gender__F__age_range__20_to_24__current_on_art + }} @@ -2121,7 +2185,10 @@ border-top: none; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}{{ + reportData[0] + ?.dc__gender__M__age_range__older_than_24__current_on_art + }} @@ -2136,7 +2203,10 @@ border: 1px solid black; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}{{ + reportData[0] + ?.dc__gender__F__age_range__older_than_24__current_on_art + }} @@ -2159,7 +2229,7 @@ display: inline-block; border: 1px solid black; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -2178,7 +2248,10 @@ border-top: none; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}{{ + reportData[0] + ?.dc__age_range__15_to_19__screened_for_tb + }} @@ -2201,7 +2274,10 @@ display: inline-block; border: 1px solid black; " - >{{ reportData[0]?.started_PEP_occupational }}{{ + reportData[0] + ?.dc__age_range__20_to_24__screened_for_tb + }} @@ -2220,7 +2296,10 @@ border-top: none; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}{{ + reportData[0] + ?.dc__age_range__15_to_19__started_ipt + }} @@ -2243,7 +2322,7 @@ display: inline-block; border: 1px solid black; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -2262,7 +2341,7 @@ border-top: none; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -2281,7 +2360,7 @@ border-top: none; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -2300,7 +2379,7 @@ border-top: none; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -2328,7 +2407,7 @@ display: inline-block; border: 1px solid black; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -2347,7 +2426,7 @@ border-top: none; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -2366,7 +2445,7 @@ border-top: none; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -2385,7 +2464,7 @@ border-top: none; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -2404,7 +2483,7 @@ border-top: none; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -2423,7 +2502,7 @@ border-top: none; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -2445,7 +2524,7 @@ display: inline-block; border: 1px solid black; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -2464,7 +2543,7 @@ border-top: none; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -2483,7 +2562,7 @@ border-top: none; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -2502,7 +2581,7 @@ border-top: none; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -2521,7 +2600,7 @@ border-top: none; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -2540,7 +2619,7 @@ border-top: none; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -2562,7 +2641,7 @@ display: inline-block; border: 1px solid black; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -2581,7 +2660,7 @@ border-top: none; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -2600,7 +2679,7 @@ border-top: none; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -2619,7 +2698,7 @@ border-top: none; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -2638,7 +2717,7 @@ border-top: none; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -2657,7 +2736,7 @@ border-top: none; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -2679,7 +2758,7 @@ display: inline-block; border: 1px solid black; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -2698,7 +2777,7 @@ border-top: none; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -2717,7 +2796,7 @@ border-top: none; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -2736,7 +2815,7 @@ border-top: none; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -2755,7 +2834,7 @@ border-top: none; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -2774,7 +2853,7 @@ border-top: none; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -2807,7 +2886,7 @@ display: inline-block; border: 1px solid black; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -2826,7 +2905,7 @@ border-top: none; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -2845,7 +2924,7 @@ border-top: none; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -2864,7 +2943,7 @@ border-top: none; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -2883,7 +2962,7 @@ border-top: none; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -2918,7 +2997,7 @@ display: inline-block; border: 1px solid black; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -2937,7 +3016,7 @@ border-top: none; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -2956,7 +3035,7 @@ border-top: none; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -2975,7 +3054,7 @@ border-top: none; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -2994,7 +3073,7 @@ display: inline-block; border: 1px solid black; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -3013,7 +3092,7 @@ border-top: none; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -3035,9 +3114,7 @@ display: inline-block; border: 1px solid black; " - >{{ - reportData[0]?.started_PEP_occupational - }}0 @@ -3056,9 +3133,7 @@ border-top: none; border-top: none; " - >{{ - reportData[0]?.started_PEP_occupational - }}0 @@ -3081,9 +3156,7 @@ display: inline-block; border: 1px solid black; " - >{{ - reportData[0]?.started_PEP_occupational - }}0 @@ -3101,9 +3174,7 @@ border: 1px solid black; border-top: none; " - >{{ - reportData[0]?.started_PEP_occupational - }}0 @@ -3121,9 +3192,7 @@ border: 1px solid black; border-top: none; " - >{{ - reportData[0]?.started_PEP_occupational - }}0 @@ -3141,9 +3210,7 @@ border: 1px solid black; border-top: none; " - >{{ - reportData[0]?.started_PEP_occupational - }}0 @@ -3161,9 +3228,7 @@ border: 1px solid black; border-top: none; " - >{{ - reportData[0]?.started_PEP_occupational - }}0 @@ -3196,7 +3261,7 @@ display: inline-block; border: 1px solid black; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -3214,7 +3279,7 @@ border: 1px solid black; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -3233,7 +3298,7 @@ display: inline-block; border: 1px solid black; " - >{{ reportData[0]?.started_PEP_occupational }}0 @@ -3251,7 +3316,7 @@ border: 1px solid black; border-top: none; " - >{{ reportData[0]?.started_PEP_occupational }}0 From 3bec6d58b49c658b95d12a8afa8424adfaefa1bc Mon Sep 17 00:00:00 2001 From: Alfred-Mutai Date: Thu, 9 May 2024 10:51:09 +0300 Subject: [PATCH 09/10] Updated PSW to FSW --- .../moh-731-report/moh-731-report-pdf-view.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ab1ea8330..87f17d9f7 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 @@ -558,7 +558,7 @@ >
- PSW + FSW
- PSW + FSW
Date: Tue, 14 May 2024 10:28:15 +0300 Subject: [PATCH 10/10] Sorted formatting --- .../moh-731-report/moh-731-report-pdf-view.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 87f17d9f7..ff3af87f5 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 @@ -1091,7 +1091,7 @@ >
- Tested at PNC_>=6 weeks + Tested at PNC_> 6 weeks