diff --git a/Common-UI b/Common-UI
index bb57ecfa..93c91570 160000
--- a/Common-UI
+++ b/Common-UI
@@ -1 +1 @@
-Subproject commit bb57ecfac052a50bd85dc30eba1ca93335c34344
+Subproject commit 93c915707165d8ebeefa5c62cc087b08184b261a
diff --git a/pom.xml b/pom.xml
index e93a64ef..4e3972b4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.iemr.aam-ui</groupId>
 	<artifactId>aam-ui</artifactId>
-	<version>3.1.0</version>
+	<version>3.6.0</version>
 	<name>AAM-UI</name>
 	<description>Piramal - AAM: Module ui</description>
 	<packaging>war</packaging>
diff --git a/scripts/ci-prebuild.js b/scripts/ci-prebuild.js
index 53af2b50..b3da3723 100755
--- a/scripts/ci-prebuild.js
+++ b/scripts/ci-prebuild.js
@@ -58,6 +58,12 @@ const defaultEnvValues = {
   SITE_KEY: '',
   CAPTCHA_CHALLENGE_URL: '',
   ENABLE_CAPTCHA: false,
+  SITE_ID: '1',
+  TRACKER_URL: 'https://matomo.piramalswasthya.org/',
+  TRACKING_PLATFORM: 'matomo',
+  TRACKING_ENABLED: 'true',
+  ENABLE_CHO_REPORT_BUTTON: true,
+  DHIS_URL:'',
 };
 
 // Generate output data
diff --git a/src/app/app-modules/core/components/app-footer/app-footer.component.html b/src/app/app-modules/core/components/app-footer/app-footer.component.html
index e0e99a6d..7bb9f582 100644
--- a/src/app/app-modules/core/components/app-footer/app-footer.component.html
+++ b/src/app/app-modules/core/components/app-footer/app-footer.component.html
@@ -1,6 +1,6 @@
 <footer class="footer container-fluid">
   <div class="row">
-    <div class="col-4 text-left">
+    <div class="col-3 text-left">
       <span
         class="footer-text"
         *ngIf="currentLanguageSet === null || currentLanguageSet === undefined"
@@ -12,7 +12,7 @@
         >{{ currentLanguageSet?.coreComponents?.poweredByWipro }}</span
       >
     </div>
-    <div class="col-4 text-center">
+    <div class="col-3 text-center">
       <p
         class="footer-text"
         *ngIf="currentLanguageSet === null || currentLanguageSet === undefined"
@@ -28,7 +28,21 @@
         {{version }}
       </p>
     </div>
-    <div class="col-4 text-end">
+    <div
+      class="col-3 text-end"
+      style="cursor: pointer"
+      [routerLink]="['/feedback']"
+      [queryParams]="{ sl: 'AAM' }"
+      role="link"
+    >
+      <mat-icon style="vertical-align: top; font-size: medium; margin-right: 2%"
+        >mail</mat-icon
+      >
+      <span class="footer-text"
+        >{{ currentLanguageSet?.platform_feedback?.feedback ?? "Feedback" }}
+      </span>
+    </div>
+    <div class="col-3 text-end">
       <p class="footer-text">
         <span
           class="footer-text"
diff --git a/src/app/app-modules/core/components/app-header/app-header.component.html b/src/app/app-modules/core/components/app-header/app-header.component.html
index 4bc3d2d5..0319218b 100644
--- a/src/app/app-modules/core/components/app-header/app-header.component.html
+++ b/src/app/app-modules/core/components/app-header/app-header.component.html
@@ -180,6 +180,7 @@
             [routerLink]="[item.work[1].link]"
             routerLinkActive="active"
             [ngClass]="{ active: updateCSSToShowActiveRegistrar }"
+            (click)="trackFieldInteraction('Role_Registrar')"
           >
             {{ item.work[1].label }}
           </button>
@@ -195,12 +196,18 @@
             mat-button
             [routerLink]="[item.link]"
             routerLinkActive="active"
+            (click)="trackFieldInteraction('Role_' + item.role)"
           >
             {{ item.label }}
           </button>
         </li>
         <li class="nav-item" *ngIf="item.role === 'TC Specialist'">
-          <button class="nav-btn" mat-button [matMenuTriggerFor]="TCitems">
+          <button 
+            class="nav-btn" 
+            mat-button 
+            [matMenuTriggerFor]="TCitems"
+            (click)="trackFieldInteraction('Role_TC Specialist')"
+          >
             {{ item.label }}
             <span class="caret"></span>
           </button>
diff --git a/src/app/app-modules/core/components/app-header/app-header.component.ts b/src/app/app-modules/core/components/app-header/app-header.component.ts
index b11902b2..5efe559b 100644
--- a/src/app/app-modules/core/components/app-header/app-header.component.ts
+++ b/src/app/app-modules/core/components/app-header/app-header.component.ts
@@ -36,6 +36,7 @@ import { IotService } from '../../services/iot.service';
 import { MatDialog } from '@angular/material/dialog';
 import { environment } from 'src/environments/environment';
 import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service';
+import { AmritTrackingService } from 'Common-UI/src/tracking';
 
 @Component({
   selector: 'app-header',
@@ -74,6 +75,7 @@ export class AppHeaderComponent implements OnInit, AfterContentChecked {
     private dialog: MatDialog,
     public service: IotService,
     readonly sessionstorage: SessionStorageService,
+    private trackingService: AmritTrackingService,
   ) {}
 
   ngOnInit() {
@@ -260,13 +262,15 @@ export class AppHeaderComponent implements OnInit, AfterContentChecked {
 
   logout() {
     this.auth.logout().subscribe((res) => {
-      this.router.navigate(['/login']).then((result) => {
-        if (result) {
-          this.changeLanguage('English');
-          this.sessionstorage.clear();
-          sessionStorage.clear();
-        }
-      });
+      this.router
+        .navigate(['/feedback'], { queryParams: { sl: 'HWC' } })
+        .then((result) => {
+          if (result) {
+            this.changeLanguage('English');
+            this.sessionstorage.clear();
+            sessionStorage.clear();
+          }
+        });
     });
   }
   getSwymedLogout() {
@@ -330,4 +334,8 @@ export class AppHeaderComponent implements OnInit, AfterContentChecked {
       width: '600px',
     });
   }
+
+  trackFieldInteraction(fieldName: string) {
+    this.trackingService.trackFieldInteraction(fieldName, 'Roles');
+  }
 }
diff --git a/src/app/app-modules/core/components/beneficiary-details/beneficiary-details.component.html b/src/app/app-modules/core/components/beneficiary-details/beneficiary-details.component.html
index 5da6b0b4..7836034a 100644
--- a/src/app/app-modules/core/components/beneficiary-details/beneficiary-details.component.html
+++ b/src/app/app-modules/core/components/beneficiary-details/beneficiary-details.component.html
@@ -20,6 +20,36 @@
         <tr style="color: #595959; font-size: 14px">
           <td>{{ beneficiary?.benName }}</td>
         </tr>
+        <ng-container *ngIf="beneficiary?.fatherName">
+          <tr style="font-size: 14px; color: #000000">
+            <th id="fatherName">
+              {{ current_language_set?.bendetails?.fatherName }}:
+            </th>
+          </tr>
+          <tr style="color: #595959; font-size: 14px">
+            <td>{{ beneficiary?.fatherName }}</td>
+          </tr>
+        </ng-container>
+        <ng-container *ngIf="beneficiary?.lastName">
+          <tr style="font-size: 14px; color: #000000">
+            <th id="lastName">
+              {{ current_language_set?.bendetails?.lastName }}:
+            </th>
+          </tr>
+          <tr style="color: #595959; font-size: 14px">
+            <td>{{ beneficiary?.lastName }}</td>
+          </tr>
+        </ng-container>
+        <ng-container *ngIf="beneficiary?.preferredPhoneNum">
+          <tr style="font-size: 14px; color: #000000">
+            <th id="phoneNo">
+              {{ current_language_set?.bendetails?.phoneNo }}:
+            </th>
+          </tr>
+          <tr style="color: #595959; font-size: 14px">
+            <td>{{ beneficiary?.preferredPhoneNum }}</td>
+          </tr>
+        </ng-container>
         <tr style="font-size: 14px; color: #000000">
           <th id="gender">
             {{ current_language_set?.bendetails?.gender }} /
diff --git a/src/app/app-modules/core/services/http-interceptor.service.ts b/src/app/app-modules/core/services/http-interceptor.service.ts
index b39d4a93..4fcb5b6d 100644
--- a/src/app/app-modules/core/services/http-interceptor.service.ts
+++ b/src/app/app-modules/core/services/http-interceptor.service.ts
@@ -51,16 +51,27 @@ export class HttpInterceptorService implements HttpInterceptor {
     this.assignSelectedLanguage();
     const key: any = sessionStorage.getItem('key');
     let modifiedReq = null;
-    if (key !== undefined && key !== null) {
-      modifiedReq = req.clone({
-        headers: req.headers
-          .set('Authorization', key)
-          .set('Content-Type', 'application/json'),
-      });
+
+    const isPlatformFeedback =
+      req.url && req.url.toLowerCase().includes('/platform-feedback');
+
+    if (isPlatformFeedback) {
+      const headers = req.headers
+        .delete('Authorization')
+        .set('Content-Type', 'application/json');
+      modifiedReq = req.clone({ headers });
     } else {
-      modifiedReq = req.clone({
-        headers: req.headers.set('Authorization', ''),
-      });
+      if (key !== undefined && key !== null) {
+        modifiedReq = req.clone({
+          headers: req.headers
+            .set('Authorization', key)
+            .set('Content-Type', 'application/json'),
+        });
+      } else {
+        modifiedReq = req.clone({
+          headers: req.headers.set('Authorization', ''),
+        });
+      }
     }
     return next.handle(modifiedReq).pipe(
       tap((event: HttpEvent<any>) => {
@@ -76,6 +87,29 @@ export class HttpInterceptorService implements HttpInterceptor {
       catchError((error: HttpErrorResponse) => {
         console.error(error);
         this.spinnerService.setLoading(false);
+        if (error.status === 401) {
+          this.handleSessionExpiry(
+            this.currentLanguageSet.sessionExpiredPleaseLogin ||
+              'Session has expired, please login again.',
+          );
+        } else if (error.status === 403) {
+          this.handleSessionExpiry(
+            this.currentLanguageSet.accessDenied ||
+              'Access Denied. You do not have permission to access this resource.',
+          );
+        } else if (error.status === 500) {
+          this.handleSessionExpiry(
+            this.currentLanguageSet.internaleServerError,
+          );
+        } else {
+          this.handleSessionExpiry(
+            error.message ||
+              this.currentLanguageSet.somethingWentWrong ||
+              'Something went wrong. Please try again later.',
+          );
+        }
+        sessionStorage.clear();
+        this.sessionstorage.clear();
         return throwError(error.error);
       }),
     );
@@ -98,7 +132,8 @@ export class HttpInterceptorService implements HttpInterceptor {
         'Unable to fetch session object from Redis server'
     ) {
       this.handleSessionExpiry(
-        this.currentLanguageSet.sessionExpiredPleaseLogin,
+        this.currentLanguageSet.sessionExpiredPleaseLogin ||
+          'Session has expired, please login again.',
       );
     } else {
       this.startTimer();
@@ -140,7 +175,8 @@ export class HttpInterceptorService implements HttpInterceptor {
                 sessionStorage.clear();
                 this.sessionstorage.clear();
                 this.confirmationService.alert(
-                  this.currentLanguageSet.sessionExpired,
+                  this.currentLanguageSet.sessionExpired ||
+                    'Session has expired, please login again.',
                   'error',
                 );
                 this.router.navigate(['/login']);
@@ -150,7 +186,8 @@ export class HttpInterceptorService implements HttpInterceptor {
                   sessionStorage.clear();
                   this.sessionstorage.clear();
                   this.confirmationService.alert(
-                    this.currentLanguageSet.sessionExpired,
+                    this.currentLanguageSet.sessionExpired ||
+                      'Session has expired, please login again.',
                     'error',
                   );
                   this.router.navigate(['/login']);
diff --git a/src/app/app-modules/core/services/http-service.service.ts b/src/app/app-modules/core/services/http-service.service.ts
index b305e09e..a9fb08b3 100644
--- a/src/app/app-modules/core/services/http-service.service.ts
+++ b/src/app/app-modules/core/services/http-service.service.ts
@@ -22,7 +22,13 @@ export class HttpServiceService {
   constructor(
     private _http: HttpClient,
     private http: HttpClient,
-  ) {}
+  ) {
+    const storedLang = localStorage.getItem('appLanguage');
+    this.language = storedLang ? JSON.parse(storedLang) : null;
+
+    this.appCurrentLanguge = new BehaviorSubject(this.language);
+    this.currentLangugae$ = this.appCurrentLanguge.asObservable();
+  }
 
   fetchLanguageSet() {
     console.log('Here i come');
@@ -34,10 +40,8 @@ export class HttpServiceService {
   }
 
   getCurrentLanguage(response: any) {
-    console.log('here at one', response);
     this.language = response;
-    console.log('teste', this.language);
+    localStorage.setItem('appLanguage', JSON.stringify(response));
     this.appCurrentLanguge.next(response);
-    console.log('here at two', this.appCurrentLanguge.value);
   }
 }
diff --git a/src/app/app-modules/lab/worklist/worklist.component.ts b/src/app/app-modules/lab/worklist/worklist.component.ts
index b0b2fddc..d86ce9eb 100644
--- a/src/app/app-modules/lab/worklist/worklist.component.ts
+++ b/src/app/app-modules/lab/worklist/worklist.component.ts
@@ -139,6 +139,9 @@ export class WorklistComponent implements OnInit, OnDestroy, DoCheck {
         }
       },
       (err) => {
+        if (err?.handled) {
+          return;
+        }
         this.confirmationService.alert(err, 'error');
       },
     );
diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/diagnosis.component.html b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/diagnosis.component.html
index f6ad2e5b..9e64c55f 100644
--- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/diagnosis.component.html
+++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/diagnosis.component.html
@@ -11,30 +11,36 @@
     [caseRecordMode]="caseRecordMode"
     [generalDiagnosisForm]="generalDiagnosisForm"
     [visitCat]="visitCategory"
+    (click)="trackFieldInteraction('General OPD Diagnosis Component')"
   ></app-general-opd-diagnosis>
   <app-anc-diagnosis
     *ngIf="visitCategory === 'ANC'"
     [caseRecordMode]="caseRecordMode"
     [generalDiagnosisForm]="generalDiagnosisForm"
+    (click)="trackFieldInteraction('ANC Diagnosis Component')"
   ></app-anc-diagnosis>
   <app-pnc-diagnosis
     *ngIf="visitCategory === 'PNC'"
     [caseRecordMode]="caseRecordMode"
     [generalDiagnosisForm]="generalDiagnosisForm"
+    (click)="trackFieldInteraction('PNC Diagnosis Component')"
   ></app-pnc-diagnosis>
   <app-ncd-care-diagnosis
     *ngIf="visitCategory === 'NCD care'"
     [caseRecordMode]="caseRecordMode"
     [generalDiagnosisForm]="generalDiagnosisForm"
+    (click)="trackFieldInteraction('NCD Care Diagnosis Component')"
   ></app-ncd-care-diagnosis>
   <app-covid-diagnosis
     *ngIf="visitCategory === 'COVID-19 Screening'"
     [caseRecordMode]="caseRecordMode"
     [generalDiagnosisForm]="generalDiagnosisForm"
+    (click)="trackFieldInteraction('COVID Diagnosis Component')"
   ></app-covid-diagnosis>
   <app-ncd-screening-diagnosis
     *ngIf="visitCategory === 'NCD screening'"
     [caseRecordMode]="caseRecordMode"
     [generalDiagnosisForm]="generalDiagnosisForm"
+    (click)="trackFieldInteraction('NCD Screening Diagnosis Component')"
   ></app-ncd-screening-diagnosis>
 </section>
diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/diagnosis.component.ts b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/diagnosis.component.ts
index e52388af..9ff9a874 100644
--- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/diagnosis.component.ts
+++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/diagnosis.component.ts
@@ -23,6 +23,7 @@ import { Component, OnInit, Input, DoCheck } from '@angular/core';
 import { FormGroup } from '@angular/forms';
 import { HttpServiceService } from 'src/app/app-modules/core/services/http-service.service';
 import { SetLanguageComponent } from 'src/app/app-modules/core/components/set-language.component';
+import { AmritTrackingService } from 'Common-UI/src/tracking';
 
 @Component({
   selector: 'app-diagnosis',
@@ -40,7 +41,10 @@ export class DiagnosisComponent implements OnInit, DoCheck {
   caseRecordMode!: string;
   current_language_set: any;
 
-  constructor(public httpServiceService: HttpServiceService) {}
+  constructor(
+    public httpServiceService: HttpServiceService,
+    private trackingService: AmritTrackingService,
+  ) {}
 
   ngOnInit() {
     this.assignSelectedLanguage();
@@ -54,4 +58,8 @@ export class DiagnosisComponent implements OnInit, DoCheck {
     getLanguageJson.setLanguage();
     this.current_language_set = getLanguageJson.currentLanguageObject;
   }
+
+  trackFieldInteraction(fieldName: string) {
+    this.trackingService.trackFieldInteraction(fieldName, 'Diagnosis');
+  }
 }
diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/general-opd-diagnosis/general-opd-diagnosis.component.html b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/general-opd-diagnosis/general-opd-diagnosis.component.html
index aa8f2a5e..f684b395 100644
--- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/general-opd-diagnosis/general-opd-diagnosis.component.html
+++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/general-opd-diagnosis/general-opd-diagnosis.component.html
@@ -38,12 +38,16 @@
                         (keyup)="onDiagnosisInputKeyup(diagnosisInput.value, i)" />
                     </mat-form-field>
         
-                    <mat-autocomplete #autoDiagnosis="matAutocomplete" autoActiveFirstOption [displayWith]="displayDiagnosis"
-                      (optionSelected)="onDiagnosisSelected($event.option.value, i)">
+                    <mat-autocomplete #autoDiagnosis="matAutocomplete" appAutocompleteScroller [threshold]="0.6"
+                      (nearEnd)="onAutoNearEnd(i)" (panelReady)="onPanelReady(i, $event)" autoActiveFirstOption
+                      [displayWith]="displayDiagnosis" (optionSelected)="onDiagnosisSelected($event.option.value, i)">
                       <mat-option *ngFor="let diag of suggestedDiagnosisList[i]" [value]="diag">
                         {{ diag.term }}
                       </mat-option>
+                      <mat-option *ngIf="loadingMore[i]" disabled>Loading…</mat-option>
+                      <mat-option *ngIf="noMore[i]" disabled>End of results</mat-option>
                     </mat-autocomplete>
+                  
                   </div>
         
                   <!-- Action Buttons (Add & Remove) -->
diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/general-opd-diagnosis/general-opd-diagnosis.component.ts b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/general-opd-diagnosis/general-opd-diagnosis.component.ts
index 13bc4b8a..d94fa445 100644
--- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/general-opd-diagnosis/general-opd-diagnosis.component.ts
+++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/general-opd-diagnosis/general-opd-diagnosis.component.ts
@@ -64,6 +64,17 @@ export class GeneralOpdDiagnosisComponent
   designation: any;
   specialist = false;
   suggestedDiagnosisList: any = [];
+  private readonly PAGE_BASE = 0;
+  pageSize: number | undefined = undefined;
+
+  private readonly BOOTSTRAP_MAX_PAGES = 3; // when first page can't scroll, prefill up to this many extra pages
+
+  loadingMore: boolean[] = [];
+  noMore: boolean[] = [];
+  wantMore: boolean[] = [];
+  pageByIndex: number[] = [];
+  lastQueryByIndex: string[] = [];
+
   constructor(
     private fb: FormBuilder,
     public httpServiceService: HttpServiceService,
@@ -110,7 +121,6 @@ export class GeneralOpdDiagnosisComponent
       const beneficiaryRegID = this.sessionstorage.getItem('beneficiaryRegID');
       const visitID = this.sessionstorage.getItem('visitID');
       const visitCategory = this.sessionstorage.getItem('visitCategory');
-
       const specialistFlagString =
         this.sessionstorage.getItem('specialist_flag');
 
@@ -263,16 +273,28 @@ export class GeneralOpdDiagnosisComponent
     if (this.diagnosisSubscription) {
       this.diagnosisSubscription.unsubscribe();
     }
+    if (this.MMUdiagnosisSubscription) {
+      this.MMUdiagnosisSubscription.unsubscribe?.();
+    }
   }
 
   onDiagnosisInputKeyup(value: string, index: number) {
-    if (value.length >= 3) {
-      this.masterdataService
-        .searchDiagnosisBasedOnPageNo(value, index)
-        .subscribe((results: any) => {
-          this.suggestedDiagnosisList[index] = results?.data?.sctMaster;
-        });
+    const term = (value || '').trim();
+
+    if (term.length >= 3) {
+      if (this.lastQueryByIndex[index] !== term) {
+        this.lastQueryByIndex[index] = term;
+        this.pageByIndex[index] = 0; // logical 0th page
+        this.noMore[index] = false;
+        this.wantMore[index] = false;
+        this.suggestedDiagnosisList[index] = [];
+      }
+      this.fetchPage(index, false);
     } else {
+      this.lastQueryByIndex[index] = '';
+      this.pageByIndex[index] = 0;
+      this.noMore[index] = false;
+      this.wantMore[index] = false;
       this.suggestedDiagnosisList[index] = [];
     }
   }
@@ -282,17 +304,111 @@ export class GeneralOpdDiagnosisComponent
   }
 
   onDiagnosisSelected(selected: any, index: number) {
-    // this.patientQuickConsultForm.get(['provisionalDiagnosisList', index])?.setValue(selected);
     const diagnosisFormArray = this.generalDiagnosisForm.get(
       'provisionalDiagnosisList',
     ) as FormArray;
     const diagnosisFormGroup = diagnosisFormArray.at(index) as FormGroup;
 
-    // Set the nested and top-level fields
     diagnosisFormGroup.patchValue({
       viewProvisionalDiagnosisProvided: selected,
       conceptID: selected?.conceptID || null,
       term: selected?.term || null,
     });
   }
+
+  onPanelReady(index: number, panelEl: HTMLElement) {
+    if (panelEl.scrollHeight <= panelEl.clientHeight && !this.noMore[index]) {
+      this.bootstrapUntilScrollable(index, panelEl);
+    }
+  }
+
+  onAutoNearEnd(index: number) {
+    if (!this.loadingMore[index] && !this.noMore[index]) {
+      this.fetchPage(index, true);
+    } else if (this.loadingMore[index]) {
+      this.wantMore[index] = true;
+    }
+  }
+
+  private bootstrapUntilScrollable(rowIndex: number, panelEl: HTMLElement) {
+    let fetched = 0;
+
+    const tryFill = () => {
+      const scrollable = panelEl.scrollHeight > panelEl.clientHeight;
+      if (
+        scrollable ||
+        this.noMore[rowIndex] ||
+        fetched >= this.BOOTSTRAP_MAX_PAGES
+      )
+        return;
+
+      if (this.loadingMore[rowIndex]) {
+        requestAnimationFrame(tryFill);
+        return;
+      }
+
+      fetched++;
+      this.fetchPage(rowIndex, true);
+
+      requestAnimationFrame(tryFill);
+    };
+
+    if (this.lastQueryByIndex[rowIndex]?.length >= 3) {
+      tryFill();
+    }
+  }
+
+  private fetchPage(index: number, append = false) {
+    const term = this.lastQueryByIndex[index];
+    if (!term) return;
+
+    const nextLogical = (this.pageByIndex[index] ?? 0) + (append ? 1 : 0);
+    const pageAtReq = nextLogical + this.PAGE_BASE;
+
+    if (this.loadingMore[index]) return;
+    this.loadingMore[index] = true;
+
+    const termAtReq = term;
+
+    this.masterdataService
+      .searchDiagnosisBasedOnPageNo(termAtReq, pageAtReq)
+      .subscribe({
+        next: (results: any) => {
+          if (this.lastQueryByIndex[index] !== termAtReq) return;
+
+          const list = results?.data?.sctMaster ?? [];
+
+          if (append) {
+            const existing = new Set(
+              (this.suggestedDiagnosisList[index] ?? []).map(
+                (d: any) => d.id ?? d.code ?? d.term,
+              ),
+            );
+            this.suggestedDiagnosisList[index] = [
+              ...(this.suggestedDiagnosisList[index] ?? []),
+              ...list.filter(
+                (d: any) => !existing.has(d.id ?? d.code ?? d.term),
+              ),
+            ];
+          } else {
+            this.suggestedDiagnosisList[index] = list;
+          }
+
+          this.pageByIndex[index] = nextLogical;
+          if (!list.length) {
+            this.noMore[index] = true;
+          }
+        },
+        error: () => {
+          console.error('Error fetching diagnosis data');
+        },
+        complete: () => {
+          const wantChain = this.wantMore[index] && !this.noMore[index];
+          this.loadingMore[index] = false;
+          this.wantMore[index] = false;
+
+          if (wantChain) this.fetchPage(index, true);
+        },
+      });
+  }
 }
diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-care-diagnosis/ncd-care-diagnosis.component.html b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-care-diagnosis/ncd-care-diagnosis.component.html
index ae17aa4c..c155990a 100644
--- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-care-diagnosis/ncd-care-diagnosis.component.html
+++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-care-diagnosis/ncd-care-diagnosis.component.html
@@ -113,15 +113,18 @@ <h4>{{ current_language_set?.casesheet?.provisionalDiag }}</h4>
               <mat-form-field class="input-full-width" appearance="fill">
                 <mat-label>{{ current_language_set?.casesheet?.provisionalDiag }}</mat-label>
                 <input matInput type="text" autocomplete="off" name="viewProvisionalDiagnosisProvided"
-                  formControlName="viewProvisionalDiagnosisProvided" minlength="3" maxlength="100" required #diagnosisInput
+                  formControlName="viewProvisionalDiagnosisProvided" minlength="3" maxlength="100"  #diagnosisInput
                   [matAutocomplete]="autoDiagnosis" (keyup)="onDiagnosisInputKeyup(diagnosisInput.value, i)" />
               </mat-form-field>
     
-              <mat-autocomplete #autoDiagnosis="matAutocomplete" autoActiveFirstOption [displayWith]="displayDiagnosis"
-                (optionSelected)="onDiagnosisSelected($event.option.value, i)">
+              <mat-autocomplete #autoDiagnosis="matAutocomplete" appAutocompleteScroller [threshold]="0.6"
+                (nearEnd)="onAutoNearEnd(i)" (panelReady)="onPanelReady(i, $event)" autoActiveFirstOption
+                [displayWith]="displayDiagnosis" (optionSelected)="onDiagnosisSelected($event.option.value, i)">
                 <mat-option *ngFor="let diag of suggestedDiagnosisList[i]" [value]="diag">
                   {{ diag.term }}
                 </mat-option>
+                <mat-option *ngIf="loadingMore[i]" disabled>Loading…</mat-option>
+                <mat-option *ngIf="noMore[i]" disabled>End of results</mat-option>
               </mat-autocomplete>
             </div>
     
diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-care-diagnosis/ncd-care-diagnosis.component.ts b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-care-diagnosis/ncd-care-diagnosis.component.ts
index 5807d1ef..50bdd96d 100644
--- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-care-diagnosis/ncd-care-diagnosis.component.ts
+++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-care-diagnosis/ncd-care-diagnosis.component.ts
@@ -63,6 +63,16 @@ export class NcdCareDiagnosisComponent implements OnInit, DoCheck, OnDestroy {
   attendantType: any;
   enableNCDCondition = false;
   suggestedDiagnosisList: any = [];
+  private readonly PAGE_BASE = 0;
+  pageSize: number | undefined = undefined;
+
+  private readonly BOOTSTRAP_MAX_PAGES = 3; // when first page can't scroll, prefill up to this many extra pages
+
+  loadingMore: boolean[] = [];
+  noMore: boolean[] = [];
+  wantMore: boolean[] = [];
+  pageByIndex: number[] = [];
+  lastQueryByIndex: string[] = [];
 
   constructor(
     private fb: FormBuilder,
@@ -291,13 +301,22 @@ export class NcdCareDiagnosisComponent implements OnInit, DoCheck, OnDestroy {
     }
   }
   onDiagnosisInputKeyup(value: string, index: number) {
-    if (value.length >= 3) {
-      this.masterdataService
-        .searchDiagnosisBasedOnPageNo(value, index)
-        .subscribe((results: any) => {
-          this.suggestedDiagnosisList[index] = results?.data?.sctMaster;
-        });
+    const term = (value || '').trim();
+
+    if (term.length >= 3) {
+      if (this.lastQueryByIndex[index] !== term) {
+        this.lastQueryByIndex[index] = term;
+        this.pageByIndex[index] = 0; // logical 0th page
+        this.noMore[index] = false;
+        this.wantMore[index] = false;
+        this.suggestedDiagnosisList[index] = [];
+      }
+      this.fetchPage(index, false);
     } else {
+      this.lastQueryByIndex[index] = '';
+      this.pageByIndex[index] = 0;
+      this.noMore[index] = false;
+      this.wantMore[index] = false;
       this.suggestedDiagnosisList[index] = [];
     }
   }
@@ -320,4 +339,100 @@ export class NcdCareDiagnosisComponent implements OnInit, DoCheck, OnDestroy {
       term: selected?.term || null,
     });
   }
+
+  onPanelReady(index: number, panelEl: HTMLElement) {
+    if (panelEl.scrollHeight <= panelEl.clientHeight && !this.noMore[index]) {
+      this.bootstrapUntilScrollable(index, panelEl);
+    }
+  }
+
+  onAutoNearEnd(index: number) {
+    if (!this.loadingMore[index] && !this.noMore[index]) {
+      this.fetchPage(index, true);
+    } else if (this.loadingMore[index]) {
+      this.wantMore[index] = true;
+    }
+  }
+
+  private bootstrapUntilScrollable(rowIndex: number, panelEl: HTMLElement) {
+    let fetched = 0;
+
+    const tryFill = () => {
+      const scrollable = panelEl.scrollHeight > panelEl.clientHeight;
+      if (
+        scrollable ||
+        this.noMore[rowIndex] ||
+        fetched >= this.BOOTSTRAP_MAX_PAGES
+      )
+        return;
+
+      if (this.loadingMore[rowIndex]) {
+        requestAnimationFrame(tryFill);
+        return;
+      }
+
+      fetched++;
+      this.fetchPage(rowIndex, true);
+
+      requestAnimationFrame(tryFill);
+    };
+
+    if (this.lastQueryByIndex[rowIndex]?.length >= 3) {
+      tryFill();
+    }
+  }
+
+  private fetchPage(index: number, append = false) {
+    const term = this.lastQueryByIndex[index];
+    if (!term) return;
+
+    const nextLogical = (this.pageByIndex[index] ?? 0) + (append ? 1 : 0);
+    const pageAtReq = nextLogical + this.PAGE_BASE;
+
+    if (this.loadingMore[index]) return;
+    this.loadingMore[index] = true;
+
+    const termAtReq = term;
+
+    this.masterdataService
+      .searchDiagnosisBasedOnPageNo(termAtReq, pageAtReq)
+      .subscribe({
+        next: (results: any) => {
+          if (this.lastQueryByIndex[index] !== termAtReq) return;
+
+          const list = results?.data?.sctMaster ?? [];
+
+          if (append) {
+            const existing = new Set(
+              (this.suggestedDiagnosisList[index] ?? []).map(
+                (d: any) => d.id ?? d.code ?? d.term,
+              ),
+            );
+            this.suggestedDiagnosisList[index] = [
+              ...(this.suggestedDiagnosisList[index] ?? []),
+              ...list.filter(
+                (d: any) => !existing.has(d.id ?? d.code ?? d.term),
+              ),
+            ];
+          } else {
+            this.suggestedDiagnosisList[index] = list;
+          }
+
+          this.pageByIndex[index] = nextLogical;
+          if (!list.length) {
+            this.noMore[index] = true;
+          }
+        },
+        error: () => {
+          console.error('Error fetching diagnosis data');
+        },
+        complete: () => {
+          const wantChain = this.wantMore[index] && !this.noMore[index];
+          this.loadingMore[index] = false;
+          this.wantMore[index] = false;
+
+          if (wantChain) this.fetchPage(index, true);
+        },
+      });
+  }
 }
diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-screening-diagnosis/ncd-screening-diagnosis.component.html b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-screening-diagnosis/ncd-screening-diagnosis.component.html
index 0c10133d..889d8677 100644
--- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-screening-diagnosis/ncd-screening-diagnosis.component.html
+++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-screening-diagnosis/ncd-screening-diagnosis.component.html
@@ -17,16 +17,19 @@ <h4 *ngIf="!enableProvisionalDiag">
             <mat-form-field class="input-full-width" appearance="fill">
               <mat-label>{{ current_language_set?.casesheet?.provisionalDiag }}</mat-label>
               <input matInput type="text" autocomplete="off" name="viewProvisionalDiagnosisProvided"
-                formControlName="viewProvisionalDiagnosisProvided" minlength="3" maxlength="100" required #diagnosisInput
+                formControlName="viewProvisionalDiagnosisProvided" minlength="3" maxlength="100"  #diagnosisInput
                 [matAutocomplete]="autoDiagnosis" (keyup)="onDiagnosisInputKeyup(diagnosisInput.value, i)" />
             </mat-form-field>
     
-            <mat-autocomplete #autoDiagnosis="matAutocomplete" autoActiveFirstOption [displayWith]="displayDiagnosis"
-              (optionSelected)="onDiagnosisSelected($event.option.value, i)">
-              <mat-option *ngFor="let diag of suggestedDiagnosisList[i]" [value]="diag">
-                {{ diag.term }}
-              </mat-option>
-            </mat-autocomplete>
+              <mat-autocomplete #autoDiagnosis="matAutocomplete" appAutocompleteScroller [threshold]="0.6"
+                (nearEnd)="onAutoNearEnd(i)" (panelReady)="onPanelReady(i, $event)" autoActiveFirstOption
+                [displayWith]="displayDiagnosis" (optionSelected)="onDiagnosisSelected($event.option.value, i)">
+                <mat-option *ngFor="let diag of suggestedDiagnosisList[i]" [value]="diag">
+                  {{ diag.term }}
+                </mat-option>
+                <mat-option *ngIf="loadingMore[i]" disabled>Loading…</mat-option>
+                <mat-option *ngIf="noMore[i]" disabled>End of results</mat-option>
+              </mat-autocomplete>
           </div>
     
           <!-- Action Buttons (Add & Remove) -->
diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-screening-diagnosis/ncd-screening-diagnosis.component.ts b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-screening-diagnosis/ncd-screening-diagnosis.component.ts
index 5f4f8446..4ceaf249 100644
--- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-screening-diagnosis/ncd-screening-diagnosis.component.ts
+++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-screening-diagnosis/ncd-screening-diagnosis.component.ts
@@ -98,6 +98,16 @@ export class NcdScreeningDiagnosisComponent
   previousVisitConfirmedDiseasesSubscription!: Subscription;
   enableProvisionalDiag = false;
   suggestedDiagnosisList: any = [];
+  private readonly PAGE_BASE = 0;
+  pageSize: number | undefined = undefined;
+
+  private readonly BOOTSTRAP_MAX_PAGES = 3; // when first page can't scroll, prefill up to this many extra pages
+
+  loadingMore: boolean[] = [];
+  noMore: boolean[] = [];
+  wantMore: boolean[] = [];
+  pageByIndex: number[] = [];
+  lastQueryByIndex: string[] = [];
   constructor(
     private fb: FormBuilder,
     private doctorService: DoctorService,
@@ -539,16 +549,28 @@ export class NcdScreeningDiagnosisComponent
     if (this.previousVisitConfirmedDiseasesSubscription) {
       this.previousVisitConfirmedDiseasesSubscription.unsubscribe();
     }
+    if (this.MMUdiagnosisSubscription) {
+      this.MMUdiagnosisSubscription.unsubscribe();
+    }
   }
 
   onDiagnosisInputKeyup(value: string, index: number) {
-    if (value.length >= 3) {
-      this.masterdataService
-        .searchDiagnosisBasedOnPageNo(value, index)
-        .subscribe((results: any) => {
-          this.suggestedDiagnosisList[index] = results?.data?.sctMaster;
-        });
+    const term = (value || '').trim();
+
+    if (term.length >= 3) {
+      if (this.lastQueryByIndex[index] !== term) {
+        this.lastQueryByIndex[index] = term;
+        this.pageByIndex[index] = 0; // logical 0th page
+        this.noMore[index] = false;
+        this.wantMore[index] = false;
+        this.suggestedDiagnosisList[index] = [];
+      }
+      this.fetchPage(index, false);
     } else {
+      this.lastQueryByIndex[index] = '';
+      this.pageByIndex[index] = 0;
+      this.noMore[index] = false;
+      this.wantMore[index] = false;
       this.suggestedDiagnosisList[index] = [];
     }
   }
@@ -571,4 +593,100 @@ export class NcdScreeningDiagnosisComponent
       term: selected?.term || null,
     });
   }
+
+  onPanelReady(index: number, panelEl: HTMLElement) {
+    if (panelEl.scrollHeight <= panelEl.clientHeight && !this.noMore[index]) {
+      this.bootstrapUntilScrollable(index, panelEl);
+    }
+  }
+
+  onAutoNearEnd(index: number) {
+    if (!this.loadingMore[index] && !this.noMore[index]) {
+      this.fetchPage(index, true);
+    } else if (this.loadingMore[index]) {
+      this.wantMore[index] = true;
+    }
+  }
+
+  private bootstrapUntilScrollable(rowIndex: number, panelEl: HTMLElement) {
+    let fetched = 0;
+
+    const tryFill = () => {
+      const scrollable = panelEl.scrollHeight > panelEl.clientHeight;
+      if (
+        scrollable ||
+        this.noMore[rowIndex] ||
+        fetched >= this.BOOTSTRAP_MAX_PAGES
+      )
+        return;
+
+      if (this.loadingMore[rowIndex]) {
+        requestAnimationFrame(tryFill);
+        return;
+      }
+
+      fetched++;
+      this.fetchPage(rowIndex, true);
+
+      requestAnimationFrame(tryFill);
+    };
+
+    if (this.lastQueryByIndex[rowIndex]?.length >= 3) {
+      tryFill();
+    }
+  }
+
+  private fetchPage(index: number, append = false) {
+    const term = this.lastQueryByIndex[index];
+    if (!term) return;
+
+    const nextLogical = (this.pageByIndex[index] ?? 0) + (append ? 1 : 0);
+    const pageAtReq = nextLogical + this.PAGE_BASE;
+
+    if (this.loadingMore[index]) return;
+    this.loadingMore[index] = true;
+
+    const termAtReq = term;
+
+    this.masterdataService
+      .searchDiagnosisBasedOnPageNo(termAtReq, pageAtReq)
+      .subscribe({
+        next: (results: any) => {
+          if (this.lastQueryByIndex[index] !== termAtReq) return;
+
+          const list = results?.data?.sctMaster ?? [];
+
+          if (append) {
+            const existing = new Set(
+              (this.suggestedDiagnosisList[index] ?? []).map(
+                (d: any) => d.id ?? d.code ?? d.term,
+              ),
+            );
+            this.suggestedDiagnosisList[index] = [
+              ...(this.suggestedDiagnosisList[index] ?? []),
+              ...list.filter(
+                (d: any) => !existing.has(d.id ?? d.code ?? d.term),
+              ),
+            ];
+          } else {
+            this.suggestedDiagnosisList[index] = list;
+          }
+
+          this.pageByIndex[index] = nextLogical;
+          if (!list.length) {
+            this.noMore[index] = true;
+          }
+        },
+        error: () => {
+          console.error('Error fetching diagnosis data');
+        },
+        complete: () => {
+          const wantChain = this.wantMore[index] && !this.noMore[index];
+          this.loadingMore[index] = false;
+          this.wantMore[index] = false;
+
+          if (wantChain) this.fetchPage(index, true);
+        },
+      });
+  }
 }
diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/pnc-diagnosis/pnc-diagnosis.component.html b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/pnc-diagnosis/pnc-diagnosis.component.html
index 88408df8..6ef708aa 100644
--- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/pnc-diagnosis/pnc-diagnosis.component.html
+++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/pnc-diagnosis/pnc-diagnosis.component.html
@@ -7,6 +7,7 @@ <h4>{{ current_language_set?.casesheet?.provisionalDiag }}</h4>
         </header>
         <ng-container formArrayName="provisionalDiagnosisList">
           <div
+            class="row"
             *ngFor="
               let diagnosis of provisionalDiagnosisControls;
               let i = index;
@@ -17,37 +18,55 @@ <h4>{{ current_language_set?.casesheet?.provisionalDiag }}</h4>
               <div class="col-xs-12 col-sm-9 box">
                 <mat-form-field class="input-full-width">
                   <input
+                    #provisionalDiagnosisInput
                     matInput
-                    allowText="inputFieldValidator"
-                    appDiagnosisSearch
-                    [diagnosisListForm]="diagnosis"
-                    name="viewProvisionalDiagnosisProvided"
+                    type="text"
                     formControlName="viewProvisionalDiagnosisProvided"
-                    maxlength="100"
                     minlength="3"
-                    [previousSelected]="
-                      generalDiagnosisForm.value.provisionalDiagnosisList
+                    maxlength="100"
+                    [matAutocomplete]="autoDiagnosis"
+                    (keyup)="
+                      onDiagnosisInputKeyup(
+                        'provisional',
+                        provisionalDiagnosisInput.value,
+                        i
+                      )
                     "
                   />
-                  <mat-icon
-                    class="search-btn"
-                    *ngIf="
-                      !diagnosis.get('viewProvisionalDiagnosisProvided')
-                        ?.disabled
-                    "
-                    matSuffix
-                    appDiagnosisSearch
-                    [diagnosisListForm]="diagnosis"
-                    [previousSelected]="
-                      generalDiagnosisForm.value.provisionalDiagnosisList
-                    "
-                    >search</mat-icon
-                  >
                 </mat-form-field>
+
+                <mat-autocomplete
+                  #autoDiagnosis="matAutocomplete"
+                  appAutocompleteScroller
+                  [threshold]="0.6"
+                  (nearEnd)="onAutoNearEnd('provisional', i)"
+                  (panelReady)="onPanelReady('provisional', i, $event)"
+                  [displayWith]="displayDiagnosis"
+                  (optionSelected)="
+                    onDiagnosisSelected('provisional', $event.option.value, i)
+                  "
+                >
+                  <mat-option
+                    *ngFor="let diag of state.provisional.suggested[i]"
+                    [value]="diag"
+                  >
+                    {{ diag.term }}
+                  </mat-option>
+                  <mat-option *ngIf="state.provisional.loadingMore[i]" disabled
+                    >Loading…</mat-option
+                  >
+                  <mat-option *ngIf="state.provisional.noMore[i]" disabled
+                    >End of results</mat-option
+                  >
+                </mat-autocomplete>
               </div>
               <div
                 class="col-xs-12 col-sm-3 box pull-right"
-                style="padding: 0px"
+                style="
+                  display: flex;
+                  justify-content: center;
+                  align-items: center;
+                "
               >
                 <button
                   mat-mini-fab
@@ -91,6 +110,7 @@ <h4>{{ current_language_set?.common?.confirmDiagnosis }}</h4>
         </header>
         <ng-container formArrayName="confirmatoryDiagnosisList">
           <div
+            class="row"
             *ngFor="
               let confirmatoryDiagnosis of getConfirmatoryDiagnosisList();
               let i = index;
@@ -98,46 +118,65 @@ <h4>{{ current_language_set?.common?.confirmDiagnosis }}</h4>
             "
           >
             <ng-container [formGroupName]="i">
-              <div class="col-xs-12 col-sm-9 box">
+              <div class="col-xs-12 col-sm-8 col-md-9">
                 <mat-form-field class="input-full-width">
                   <input
+                    #confirmatoryDiagnosisInput
                     matInput
-                    appConfirmatoryDiagnosis
-                    [diagnosisListForm]="confirmatoryDiagnosis"
-                    name="viewConfirmatoryDiagnosisProvided"
+                    type="text"
                     formControlName="viewConfirmatoryDiagnosisProvided"
-                    maxlength="100"
                     minlength="3"
-                    [previousSelected]="
-                      generalDiagnosisForm.value.confirmatoryDiagnosisList
+                    maxlength="100"
+                    [matAutocomplete]="autoConfirmDiagnosis"
+                    (keyup)="
+                      onDiagnosisInputKeyup(
+                        'confirmatory',
+                        confirmatoryDiagnosisInput.value,
+                        i
+                      )
                     "
                   />
-                  <mat-icon
-                    class="search-btn"
-                    *ngIf="
-                      !confirmatoryDiagnosis.get(
-                        'viewProvisionalDiagnosisProvided'
-                      )?.disabled
-                    "
-                    matSuffix
-                    appConfirmatoryDiagnosis
-                    [diagnosisListForm]="confirmatoryDiagnosis"
-                    [previousSelected]="
-                      generalDiagnosisForm.value.confirmatoryDiagnosisList
-                    "
-                    >search</mat-icon
-                  >
                 </mat-form-field>
+
+                <mat-autocomplete
+                  #autoConfirmDiagnosis="matAutocomplete"
+                  appAutocompleteScroller
+                  [threshold]="0.6"
+                  (nearEnd)="onAutoNearEnd('confirmatory', i)"
+                  (panelReady)="onPanelReady('confirmatory', i, $event)"
+                  [displayWith]="displayDiagnosis"
+                  (optionSelected)="
+                    onDiagnosisSelected('confirmatory', $event.option.value, i)
+                  "
+                >
+                  <mat-option
+                    *ngFor="let diag of state.confirmatory.suggested[i]"
+                    [value]="diag"
+                  >
+                    {{ diag.term }}
+                  </mat-option>
+                  <mat-option *ngIf="state.confirmatory.loadingMore[i]" disabled
+                    >Loading…</mat-option
+                  >
+                  <mat-option *ngIf="state.confirmatory.noMore[i]" disabled
+                    >End of results</mat-option
+                  >
+                </mat-autocomplete>
               </div>
               <div
                 class="col-xs-12 col-sm-3 box pull-right"
-                style="padding: 0px"
+                style="
+                  display: flex;
+                  justify-content: center;
+                  align-items: center;
+                "
               >
                 <button
                   mat-mini-fab
                   type="button"
                   color="warn"
                   class="mat_warn_circle"
+                  style="margin-right: 5px"
                   *ngIf="
                     i !== 0 ||
                     (i === 0 &&
diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/pnc-diagnosis/pnc-diagnosis.component.ts b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/pnc-diagnosis/pnc-diagnosis.component.ts
index 21f5199f..7e40f254 100644
--- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/pnc-diagnosis/pnc-diagnosis.component.ts
+++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/pnc-diagnosis/pnc-diagnosis.component.ts
@@ -34,7 +34,7 @@ import {
   FormArray,
   AbstractControl,
 } from '@angular/forms';
-import { DoctorService } from '../../../../shared/services';
+import { DoctorService, MasterdataService } from '../../../../shared/services';
 import { GeneralUtils } from '../../../../shared/utility';
 import { ConfirmationService } from './../../../../../core/services/confirmation.service';
 import { HttpServiceService } from 'src/app/app-modules/core/services/http-service.service';
@@ -101,6 +101,7 @@ export class PncDiagnosisComponent
     private doctorService: DoctorService,
     public httpServiceService: HttpServiceService,
     readonly sessionstorage: SessionStorageService,
+    private masterdataService: MasterdataService,
   ) {}
 
   beneficiaryAge: any;
@@ -429,4 +430,170 @@ export class PncDiagnosisComponent
       return true;
     }
   }
+
+  displayDiagnosis(diagnosis: any): string {
+    return typeof diagnosis === 'string' ? diagnosis : diagnosis?.term || '';
+  }
+
+  private readonly PAGE_BASE = 0;
+  private readonly BOOTSTRAP_MAX_PAGES = 3;
+
+  state: any = {
+    provisional: {
+      suggested: [] as any[][],
+      lastQueryByIndex: [] as string[],
+      pageByIndex: [] as number[],
+      loadingMore: [] as boolean[],
+      noMore: [] as boolean[],
+      wantMore: [] as boolean[],
+    },
+    confirmatory: {
+      suggested: [] as any[][],
+      lastQueryByIndex: [] as string[],
+      pageByIndex: [] as number[],
+      loadingMore: [] as boolean[],
+      noMore: [] as boolean[],
+      wantMore: [] as boolean[],
+    },
+  };
+
+  onDiagnosisInputKeyup(
+    type: 'provisional' | 'confirmatory',
+    value: string,
+    index: number,
+  ) {
+    const term = (value || '').trim();
+    const s = this.state[type];
+
+    if (term.length >= 3) {
+      if (s.lastQueryByIndex[index] !== term) {
+        s.lastQueryByIndex[index] = term;
+        s.pageByIndex[index] = 0;
+        s.noMore[index] = false;
+        s.wantMore[index] = false;
+        s.suggested[index] = [];
+      }
+      this.fetchPage(type, index, false);
+    } else {
+      s.lastQueryByIndex[index] = '';
+      s.pageByIndex[index] = 0;
+      s.noMore[index] = false;
+      s.wantMore[index] = false;
+      s.suggested[index] = [];
+    }
+  }
+
+  onDiagnosisSelected(
+    type: 'provisional' | 'confirmatory',
+    selected: any,
+    index: number,
+  ) {
+    const controlName =
+      type === 'provisional'
+        ? 'provisionalDiagnosisList'
+        : 'confirmatoryDiagnosisList';
+    const formArray = this.generalDiagnosisForm.get(controlName) as FormArray;
+    const fg = formArray.at(index) as FormGroup;
+
+    fg.patchValue({
+      [type === 'provisional'
+        ? 'viewProvisionalDiagnosisProvided'
+        : 'viewConfirmatoryDiagnosisProvided']: selected,
+      conceptID: selected?.conceptID ?? null,
+      term: selected?.term ?? null,
+    });
+  }
+
+  onPanelReady(
+    type: 'provisional' | 'confirmatory',
+    index: number,
+    panelEl: HTMLElement,
+  ) {
+    const s = this.state[type];
+    if (panelEl.scrollHeight <= panelEl.clientHeight && !s.noMore[index]) {
+      this.bootstrapUntilScrollable(type, index, panelEl);
+    }
+  }
+
+  onAutoNearEnd(type: 'provisional' | 'confirmatory', index: number) {
+    const s = this.state[type];
+    if (!s.loadingMore[index] && !s.noMore[index]) {
+      this.fetchPage(type, index, true);
+    } else if (s.loadingMore[index]) {
+      s.wantMore[index] = true;
+    }
+  }
+
+  private bootstrapUntilScrollable(
+    type: 'provisional' | 'confirmatory',
+    rowIndex: number,
+    panelEl: HTMLElement,
+  ) {
+    const s = this.state[type];
+    let fetched = 0;
+    const tryFill = () => {
+      const scrollable = panelEl.scrollHeight > panelEl.clientHeight;
+      if (
+        scrollable ||
+        s.noMore[rowIndex] ||
+        fetched >= this.BOOTSTRAP_MAX_PAGES
+      )
+        return;
+      if (s.loadingMore[rowIndex]) {
+        requestAnimationFrame(tryFill);
+        return;
+      }
+      fetched++;
+      this.fetchPage(type, rowIndex, true);
+      requestAnimationFrame(tryFill);
+    };
+    if (s.lastQueryByIndex[rowIndex]?.length >= 3) tryFill();
+  }
+
+  private fetchPage(
+    type: 'provisional' | 'confirmatory',
+    index: number,
+    append = false,
+  ) {
+    const s = this.state[type];
+    const term = s.lastQueryByIndex[index];
+    if (!term) return;
+
+    const nextLogical = (s.pageByIndex[index] ?? 0) + (append ? 1 : 0);
+    const pageAtReq = nextLogical + this.PAGE_BASE;
+    if (s.loadingMore[index]) return;
+    s.loadingMore[index] = true;
+
+    this.masterdataService
+      .searchDiagnosisBasedOnPageNo(term, pageAtReq)
+      .subscribe({
+        next: (results: any) => {
+          if (s.lastQueryByIndex[index] !== term) return;
+          const list = results?.data?.sctMaster ?? [];
+          if (append) {
+            const existing = new Set(
+              (s.suggested[index] ?? []).map(
+                (d: any) => d.id ?? d.code ?? d.term,
+              ),
+            );
+            s.suggested[index] = [
+              ...(s.suggested[index] ?? []),
+              ...list.filter(
+                (d: any) => !existing.has(d.id ?? d.code ?? d.term),
+              ),
+            ];
+          } else {
+            s.suggested[index] = list;
+          }
+          s.pageByIndex[index] = nextLogical;
+          if (!list.length) s.noMore[index] = true;
+        },
+        complete: () => {
+          const wantChain = s.wantMore[index] && !s.noMore[index];
+          s.loadingMore[index] = false;
+          s.wantMore[index] = false;
+          if (wantChain) this.fetchPage(type, index, true);
+        },
+      });
+  }
 }
diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/findings/findings.component.html b/src/app/app-modules/nurse-doctor/case-record/general-case-record/findings/findings.component.html
index f795bf4f..f8348a9f 100644
--- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/findings/findings.component.html
+++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/findings/findings.component.html
@@ -11,6 +11,7 @@
       mat-table
       [dataSource]="dataSource"
       aria-describedby="chiefComplaintDetails"
+      (click)="trackFieldInteraction('View Chief Complaints Table')"
     >
       <ng-container matColumnDef="chiefComplaintsDetails">
         <th
@@ -18,6 +19,7 @@
           style="border-bottom: none"
           *matHeaderCellDef
           mat-sort-header
+          (click)="trackFieldInteraction('Sort Chief Complaints')"
         >
           {{
             current_language_set?.nurseData?.chiefComplaintsDetails
@@ -35,6 +37,7 @@
           style="border-bottom: none"
           *matHeaderCellDef
           mat-sort-header
+          (click)="trackFieldInteraction('Sort Duration')"
         >
           {{
             current_language_set?.nurseData?.chiefComplaintsDetails?.duration
@@ -51,6 +54,7 @@
           style="border-bottom: none"
           *matHeaderCellDef
           mat-sort-header
+          (click)="trackFieldInteraction('Sort Unit of Duration')"
         >
           {{
             current_language_set?.nurseData?.chiefComplaintsDetails
@@ -80,6 +84,7 @@
           style="border-bottom: none"
           *matHeaderCellDef
           mat-sort-header
+          (click)="trackFieldInteraction('Sort Description')"
         >
           {{
             current_language_set?.nurseData?.chiefComplaintsDetails?.description
@@ -135,6 +140,7 @@
                 #complaintType
                 (keyup)="suggestChiefComplaintList(complaint, i)"
                 [matAutocomplete]="auto"
+                (focus)="trackFieldInteraction('Chief Complaint Input')"
               />
             </mat-form-field>
 
@@ -142,7 +148,9 @@
               #auto="matAutocomplete"
               [displayWith]="displayChiefComplaint"
               (optionSelected)="
-                filterComplaints($event, i); getSCTid($event, i)
+                filterComplaints($event, i);
+                getSCTid($event, i);
+                trackFieldInteraction('Chief Complaint Selection')
               "
             >
               <mat-option
@@ -169,6 +177,7 @@
                 formControlName="duration"
                 [disabled]="!complaint.value.chiefComplaint"
                 (change)="validateDuration(complaint)"
+                (focus)="trackFieldInteraction('Duration Input')"
               />
             </mat-form-field>
           </div>
@@ -184,6 +193,9 @@
                 formControlName="unitOfDuration"
                 [disabled]="!complaint.value.duration"
                 (change)="validateDuration(complaint)"
+                (selectionChange)="
+                  trackFieldInteraction('Unit of Duration Selection')
+                "
               >
                 <mat-option value="Hours">Hour(s)</mat-option>
                 <mat-option value="Days">Day(s)</mat-option>
@@ -207,6 +219,7 @@
                 name="description"
                 [disabled]="!complaint.value.chiefComplaint"
                 formControlName="description"
+                (focus)="trackFieldInteraction('Chief Complaint Description')"
               ></textarea>
             </mat-form-field>
           </div>
@@ -219,7 +232,10 @@
               [id]="'addBtn' + i"
               *ngIf="isLast"
               [disabled]="checkComplaintFormValidity(complaint)"
-              (click)="addChiefComplaint()"
+              (click)="
+                addChiefComplaint();
+                trackFieldInteraction('Add Chief Complaint')
+              "
               color="primary"
               class="mat-add-btn"
             >
@@ -229,7 +245,10 @@
               mat-mini-fab
               [id]="'removeBtn' + i"
               *ngIf="i !== 0 || (i === 0 && complaint.touched)"
-              (click)="removeChiefComplaint(i, complaint)"
+              (click)="
+                removeChiefComplaint(i, complaint);
+                trackFieldInteraction('Remove Chief Complaint')
+              "
               color="warn"
               style="margin-right: 15px; margin-top: 25px !important"
               class="mat-remove-btn"
@@ -270,6 +289,7 @@
                   [previousSelected]="
                     generalFindingsForm.value.clinicalObservationsList
                   "
+                  (focus)="trackFieldInteraction('Clinical Observations Input')"
                 />
                 <mat-icon
                   class="search-btn cursorPointer"
@@ -279,6 +299,9 @@
                   [previousSelected]="
                     generalFindingsForm.value.clinicalObservationsList
                   "
+                  (click)="
+                    trackFieldInteraction('Search Clinical Observations')
+                  "
                   >search</mat-icon
                 >
               </mat-form-field>
@@ -291,7 +314,10 @@
                 color="primary"
                 *ngIf="isLast"
                 [disabled]="validateAddedObservations(observations)"
-                (click)="addObservations()"
+                (click)="
+                  addObservations();
+                  trackFieldInteraction('Add Clinical Observation')
+                "
                 class="mat-add-btn"
               >
                 {{ current_language_set?.common?.add }}
@@ -310,7 +336,10 @@
                     generalFindingsForm.get('clinicalObservationsList')?.value
                       .clinicalObservationsProvided !== '')
                 "
-                (click)="removeObservationsFromList(i, observations)"
+                (click)="
+                  removeObservationsFromList(i, observations);
+                  trackFieldInteraction('Remove Clinical Observation')
+                "
               >
                 {{ current_language_set?.common?.remove }}
               </button>
@@ -354,6 +383,7 @@
                         .significantFindingsProvided
                     )
                   "
+                  (focus)="trackFieldInteraction('Significant Findings Input')"
                 />
 
                 <mat-icon
@@ -364,6 +394,7 @@
                   [previousSelected]="
                     generalFindingsForm.value.significantFindingsList
                   "
+                  (click)="trackFieldInteraction('Search Significant Findings')"
                   >search</mat-icon
                 >
               </mat-form-field>
@@ -376,7 +407,10 @@
                 color="primary"
                 *ngIf="isLast"
                 [disabled]="validateAddedFindings(findings)"
-                (click)="addFindings()"
+                (click)="
+                  addFindings();
+                  trackFieldInteraction('Add Significant Finding')
+                "
                 class="mat-add-btn"
               >
                 {{ current_language_set?.common?.add }}
@@ -395,7 +429,10 @@
                     generalFindingsForm.get('significantFindingsList')?.value
                       .significantFindingsProvided !== '')
                 "
-                (click)="removeFindingsFromList(i, findings)"
+                (click)="
+                  removeFindingsFromList(i, findings);
+                  trackFieldInteraction('Remove Significant Finding')
+                "
               >
                 {{ current_language_set?.common?.remove }}
               </button>
@@ -419,6 +456,7 @@
           maxlength="300"
           name="otherSymptoms"
           formControlName="otherSymptoms"
+          (focus)="trackFieldInteraction('Other Symptoms')"
         >
         </textarea>
       </mat-form-field>
@@ -432,6 +470,7 @@
         checked="checked"
         formControlName="isForHistory"
         [value]="'true'"
+        (change)="trackFieldInteraction('Show Findings on Next Visit')"
         >{{
           current_language_set?.Find?.showThisFindingsOnNextVisit
         }}</mat-checkbox
diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/findings/findings.component.ts b/src/app/app-modules/nurse-doctor/case-record/general-case-record/findings/findings.component.ts
index 78a99715..094b8a87 100644
--- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/findings/findings.component.ts
+++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/findings/findings.component.ts
@@ -52,6 +52,7 @@ import { Subscription } from 'rxjs';
 import { MatPaginator } from '@angular/material/paginator';
 import { MatTableDataSource } from '@angular/material/table';
 import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service';
+import { AmritTrackingService } from 'Common-UI/src/tracking';
 
 @Component({
   selector: 'app-findings',
@@ -101,6 +102,7 @@ export class FindingsComponent implements OnInit, DoCheck, OnDestroy {
     public httpServiceService: HttpServiceService,
     private nurseService: NurseService,
     readonly sessionstorage: SessionStorageService,
+    private trackingService: AmritTrackingService,
   ) {
     this.formUtils = new GeneralUtils(this.fb, this.sessionstorage);
   }
@@ -122,6 +124,10 @@ export class FindingsComponent implements OnInit, DoCheck, OnDestroy {
     this.current_language_set = getLanguageJson.currentLanguageObject;
   }
 
+  trackFieldInteraction(fieldName: string) {
+    this.trackingService.trackFieldInteraction(fieldName, 'Findings');
+  }
+
   getComplaints(): AbstractControl[] | null {
     const complaintsControl = this.generalFindingsForm.get('complaints');
     return complaintsControl instanceof FormArray
diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/prescription/prescription.component.html b/src/app/app-modules/nurse-doctor/case-record/general-case-record/prescription/prescription.component.html
index e0b19ea1..fe8657ef 100644
--- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/prescription/prescription.component.html
+++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/prescription/prescription.component.html
@@ -13,7 +13,10 @@
           mat-raised-button
           color="primary"
           class="pull-right"
-          (click)="loadMMUPrescription()"
+          (click)="
+            loadMMUPrescription();
+            trackFieldInteraction('Load MMU Prescription')
+          "
         >
           {{ current_language_set?.loadMMUPrescription }}
         </button>
@@ -63,7 +66,10 @@
           class="input-full-width"
           name="form"
           [(ngModel)]="currentPrescription.formName"
-          (selectionChange)="getFormValueChanged()"
+          (selectionChange)="
+            getFormValueChanged();
+            trackFieldInteraction('Medicine Form Selection')
+          "
           required
         >
           <mat-option
@@ -91,6 +97,7 @@
           [(ngModel)]="tempDrugName"
           (keyup)="filterMedicine(tempDrugName)"
           (blur)="reEnterMedicine()"
+          (focus)="trackFieldInteraction('Medicine Name Input')"
           required
           [matAutocomplete]="autoGroup"
         />
@@ -101,7 +108,10 @@
           <mat-option
             *ngFor="let item of subFilteredDrugMaster"
             [value]="item"
-            (onSelectionChange)="selectMedicineObject($event)"
+            (onSelectionChange)="
+              selectMedicineObject($event);
+              trackFieldInteraction('Medicine Selection')
+            "
           >
             {{ item.itemName }} {{ item.strength }}{{ item.unitOfMeasurement }}
             {{ item.quantityInHand ? "(" + item.quantityInHand + ")" : "" }}
@@ -118,6 +128,7 @@
           name="dose"
           [(ngModel)]="currentPrescription.dose"
           [disabled]="!currentPrescription.drugID"
+          (selectionChange)="trackFieldInteraction('Dosage Selection')"
           required
         >
           <mat-option
@@ -140,6 +151,7 @@
           name="frequency"
           [(ngModel)]="currentPrescription.frequency"
           [disabled]="!currentPrescription.drugID"
+          (selectionChange)="trackFieldInteraction('Frequency Selection')"
           required
         >
           <mat-option
@@ -164,6 +176,7 @@
           name="duration"
           [(ngModel)]="currentPrescription.duration"
           [disabled]="!currentPrescription.drugID"
+          (selectionChange)="trackFieldInteraction('Duration Selection')"
           [required]="prescriptionForm.value.frequency !== 'SOS'"
         >
           <mat-option *ngFor="let item of drugDurationMaster" [value]="item">
@@ -181,6 +194,7 @@
           name="unit"
           [(ngModel)]="currentPrescription.unit"
           [disabled]="!currentPrescription.drugID"
+          (selectionChange)="trackFieldInteraction('Unit Selection')"
           [required]="prescriptionForm.value.frequency !== 'SOS'"
         >
           <mat-option
@@ -210,6 +224,7 @@
           name="quantity"
           [(ngModel)]="currentPrescription.qtyPrescribed"
           [disabled]="!currentPrescription.drugID"
+          (selectionChange)="trackFieldInteraction('Quantity Selection')"
           required
         >
           <mat-option
@@ -239,6 +254,7 @@
           name="route"
           [(ngModel)]="currentPrescription.route"
           [disabled]="!currentPrescription.drugID"
+          (selectionChange)="trackFieldInteraction('Route Selection')"
         >
           <mat-option
             *ngFor="let item of drugRouteMaster"
@@ -270,6 +286,7 @@
           name="instructions"
           [disabled]="!currentPrescription.drugID"
           [(ngModel)]="currentPrescription.instructions"
+          (focus)="trackFieldInteraction('Instructions Input')"
         >
         </textarea>
       </mat-form-field>
@@ -282,7 +299,7 @@
         class="mat_green"
         color="primary"
         type="button"
-        (click)="submitForUpload()"
+        (click)="submitForUpload(); trackFieldInteraction('Add Medicine')"
       >
         {{ current_language_set?.common?.add }}
       </button>
@@ -400,7 +417,10 @@
                 <button
                   mat-mini-fab
                   id="editMedicine"
-                  (click)="editMedicine(j, drug.value.id)"
+                  (click)="
+                    editMedicine(j, drug.value.id);
+                    trackFieldInteraction('Edit Medicine')
+                  "
                   color="primary"
                   class="mat-add-btn"
                 >
@@ -410,7 +430,10 @@
                   style="margin-left: 10px; margin-top: 25px"
                   mat-mini-fab
                   id="deleteMedicine"
-                  (click)="deleteMedicine(j, drug.value.id)"
+                  (click)="
+                    deleteMedicine(j, drug.value.id);
+                    trackFieldInteraction('Remove Medicine')
+                  "
                   color="warn"
                   class="mat-remove-btn"
                 >
@@ -428,7 +451,10 @@
     [pageSizeOptions]="[5, 10, 20]"
     [pageSize]="pageSize"
     hidePageSize="true"
-    (page)="setLimits($event.pageIndex)"
+    (page)="
+      setLimits($event.pageIndex);
+      trackFieldInteraction('Navigate Prescription Pages')
+    "
     showFirstLastButtons
     aria-label="Select patient in prescriptionWorklist"
   >
@@ -454,7 +480,8 @@
           id="prescriptionAndCounselling"
           name="prescriptionAndCounselling"
           (selectionChange)="
-            counsellingProvidedoneOptionValidation(prescriptionAndCounselling)
+            counsellingProvidedoneOptionValidation(prescriptionAndCounselling);
+            trackFieldInteraction('Counselling Provided Selection')
           "
         >
           <mat-option
@@ -493,6 +520,7 @@
         formControlName="counsellingProvidedList"
         id="prescriptionAndCounselling"
         name="prescriptionAndCounselling"
+        (focus)="trackFieldInteraction('Counselling Text Input')"
       ></textarea>
     </mat-form-field>
   </div>
diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/prescription/prescription.component.ts b/src/app/app-modules/nurse-doctor/case-record/general-case-record/prescription/prescription.component.ts
index 407b46b9..88ffbeeb 100644
--- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/prescription/prescription.component.ts
+++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/prescription/prescription.component.ts
@@ -45,6 +45,7 @@ import { Subscription } from 'rxjs';
 import { PreviousDetailsComponent } from 'src/app/app-modules/core/components/previous-details/previous-details.component';
 import { SetLanguageComponent } from 'src/app/app-modules/core/components/set-language.component';
 import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service';
+import { AmritTrackingService } from 'Common-UI/src/tracking';
 
 interface prescribe {
   id: any;
@@ -145,6 +146,7 @@ export class PrescriptionComponent implements OnInit, DoCheck, OnDestroy {
     public httpServiceService: HttpServiceService,
     private dialog: MatDialog,
     readonly sessionstorage: SessionStorageService,
+    private trackingService: AmritTrackingService,
   ) {}
 
   ngOnInit() {
@@ -661,4 +663,8 @@ export class PrescriptionComponent implements OnInit, DoCheck, OnDestroy {
     return this.prescriptionCounsellingForm.controls['counsellingProvidedList']
       .value;
   }
+
+  trackFieldInteraction(fieldName: string) {
+    this.trackingService.trackFieldInteraction(fieldName, 'Prescription');
+  }
 }
diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/previous-significiant-findings/previous-significiant-findings.component.html b/src/app/app-modules/nurse-doctor/case-record/general-case-record/previous-significiant-findings/previous-significiant-findings.component.html
index 78d671f5..b818fb8e 100644
--- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/previous-significiant-findings/previous-significiant-findings.component.html
+++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/previous-significiant-findings/previous-significiant-findings.component.html
@@ -8,6 +8,7 @@
           placeholder="{{ current_language_set?.common?.inTableSearch }}"
           #filterTerm
           (keyup)="filterPreviousSignificiantFindingsList(filterTerm.value)"
+          (focus)="trackFieldInteraction('Search Previous Findings')"
         />
         <mat-icon matSuffix>search</mat-icon>
       </mat-form-field>
@@ -26,6 +27,7 @@
             style="border-bottom: none"
             *matHeaderCellDef
             mat-sort-header
+            (click)="trackFieldInteraction('Sort Serial Number')"
           >
             {{ current_language_set?.coreComponents?.sno }}
           </th>
@@ -40,6 +42,7 @@
             style="border-bottom: none"
             *matHeaderCellDef
             mat-sort-header
+            (click)="trackFieldInteraction('Sort Significant Findings')"
           >
             {{
               current_language_set?.Significantfindingsdetails
@@ -57,6 +60,7 @@
             style="border-bottom: none"
             *matHeaderCellDef
             mat-sort-header
+            (click)="trackFieldInteraction('Sort Captured Date')"
           >
             {{ current_language_set?.Significantfindingsdetails?.captureddate }}
           </th>
@@ -65,7 +69,11 @@
           </td>
         </ng-container>
         <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
-        <tr mat-row *matRowDef="let row; columns: displayedColumns"></tr>
+        <tr
+          mat-row
+          *matRowDef="let row; columns: displayedColumns"
+          (click)="trackFieldInteraction('View Previous Finding Row')"
+        ></tr>
       </table>
       <div
         *ngIf="dataSource.data.length === 0"
@@ -83,6 +91,7 @@
         [pageSize]="5"
         showFirstLastButtons
         aria-label="Select patient in previousSignificantWorklist"
+        (page)="trackFieldInteraction('Navigate Previous Findings Pages')"
       >
       </mat-paginator>
     </section>
diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/previous-significiant-findings/previous-significiant-findings.component.ts b/src/app/app-modules/nurse-doctor/case-record/general-case-record/previous-significiant-findings/previous-significiant-findings.component.ts
index 85d2dafa..cb8d63e9 100644
--- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/previous-significiant-findings/previous-significiant-findings.component.ts
+++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/previous-significiant-findings/previous-significiant-findings.component.ts
@@ -32,6 +32,7 @@ import { SetLanguageComponent } from 'src/app/app-modules/core/components/set-la
 import { MatPaginator } from '@angular/material/paginator';
 import { MatTableDataSource } from '@angular/material/table';
 import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service';
+import { AmritTrackingService } from 'Common-UI/src/tracking';
 
 @Component({
   selector: 'app-previous-significiant-findings',
@@ -45,6 +46,7 @@ export class PreviousSignificiantFindingsComponent
     private doctorService: DoctorService,
     public httpServiceService: HttpServiceService,
     readonly sessionstorage: SessionStorageService,
+    private trackingService: AmritTrackingService,
   ) {}
   rowsPerPage = 5;
   activePage = 1;
@@ -137,4 +139,11 @@ export class PreviousSignificiantFindingsComponent
       });
     }
   }
+
+  trackFieldInteraction(fieldName: string) {
+    this.trackingService.trackFieldInteraction(
+      fieldName,
+      'Previous Significant Findings',
+    );
+  }
 }
diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/previous-visit-details/previous-visit-details.component.html b/src/app/app-modules/nurse-doctor/case-record/general-case-record/previous-visit-details/previous-visit-details.component.html
index 65e1ee3a..aa3cfc9b 100644
--- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/previous-visit-details/previous-visit-details.component.html
+++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/previous-visit-details/previous-visit-details.component.html
@@ -6,6 +6,7 @@ <h4>{{ current_language_set?.previousvisit?.currentvitals }}</h4>
     <table
       class="table table-bordered table-responsive vitals-table"
       aria-describedby="visitTable"
+(click)="trackFieldInteraction('View Current Vitals Table')"
     >
       <tr>
         <td>
@@ -122,7 +123,7 @@ <h5>{{ current_language_set?.previousvisit?.bodyweighttrends }}</h5>
         [options]="lineChartOptions"
         [legend]="weightChartLegend"
         [type]="'line'"
-        (chartClick)="chartClicked('bw')"
+        (chartClick)="chartClicked('bw'); trackFieldInteraction('Body Weight Chart Click')"
       ></canvas>
     </div>
     <div class="no_records" *ngIf="!weightChartData.length">
@@ -147,7 +148,7 @@ <h5>{{ current_language_set?.previousvisit?.bloodPressureTrends }}</h5>
         [options]="lineChartOptions"
         [legend]="weightChartLegend"
         [type]="'line'"
-        (chartClick)="chartClicked('bp')"
+        (chartClick)="chartClicked('bp'); trackFieldInteraction('Blood Pressure Chart Click')"
       ></canvas>
     </div>
     <div class="no_records" *ngIf="!bpChartData.length">
@@ -173,7 +174,7 @@ <h5>{{ current_language_set?.previousvisit?.bloodGlucoseTrends }}</h5>
         [options]="lineChartOptions"
         [legend]="weightChartLegend"
         [type]="'line'"
-        (chartClick)="chartClicked('bg')"
+        (chartClick)="chartClicked('bg'); trackFieldInteraction('Blood Glucose Chart Click')"
       ></canvas>
     </div>
     <div class="no_records" *ngIf="!bgChartData.length">
diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/previous-visit-details/previous-visit-details.component.ts b/src/app/app-modules/nurse-doctor/case-record/general-case-record/previous-visit-details/previous-visit-details.component.ts
index d6a0560a..b3bfd722 100644
--- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/previous-visit-details/previous-visit-details.component.ts
+++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/previous-visit-details/previous-visit-details.component.ts
@@ -35,6 +35,7 @@ import { Subscription } from 'rxjs';
 import { HttpServiceService } from 'src/app/app-modules/core/services/http-service.service';
 import { SetLanguageComponent } from 'src/app/app-modules/core/components/set-language.component';
 import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service';
+import { AmritTrackingService } from 'Common-UI/src/tracking';
 
 @Component({
   selector: 'app-previous-visit-details',
@@ -145,6 +146,7 @@ export class PreviousVisitDetailsComponent
     private router: Router,
     public httpServiceService: HttpServiceService,
     readonly sessionstorage: SessionStorageService,
+    private trackingService: AmritTrackingService,
   ) {}
 
   ngOnInit() {
@@ -354,4 +356,11 @@ export class PreviousVisitDetailsComponent
       this.previousVisitDetailsSubscription.unsubscribe();
     }
   }
+
+  trackFieldInteraction(fieldName: string) {
+    this.trackingService.trackFieldInteraction(
+      fieldName,
+      'Previous Visit Details',
+    );
+  }
 }
diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/test-and-radiology/test-and-radiology.component.html b/src/app/app-modules/nurse-doctor/case-record/general-case-record/test-and-radiology/test-and-radiology.component.html
index 044232b9..e196b70b 100644
--- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/test-and-radiology/test-and-radiology.component.html
+++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/test-and-radiology/test-and-radiology.component.html
@@ -70,9 +70,9 @@
               vertical-align: middle;
             "
           >
-            <ng-container *ngFor="let component of element.componentList">
+            <div *ngFor="let component of element.componentList">
               {{ component?.componentName }}
-            </ng-container>
+            </div>
           </td>
         </ng-container>
         <ng-container matColumnDef="result">
@@ -84,9 +84,9 @@
             *matCellDef="let element"
             style="width: 110px; word-break: normal; vertical-align: middle"
           >
-            <ng-container *ngFor="let component of element.componentList">
+            <div *ngFor="let component of element.componentList">
               {{ component?.testResultValue }}
-            </ng-container>
+            </div>
           </td>
         </ng-container>
         <ng-container matColumnDef="measurementUnit">
@@ -98,9 +98,9 @@
             *matCellDef="let element"
             style="width: 150px; word-break: normal; vertical-align: middle"
           >
-            <ng-container *ngFor="let component of element.componentList">
+            <div *ngFor="let component of element.componentList">
               {{ component?.testResultUnit }}
-            </ng-container>
+            </div>
           </td>
         </ng-container>
         <ng-container matColumnDef="remarks">
@@ -112,9 +112,9 @@
             *matCellDef="let element"
             style="max-width: 150px; word-break: normal; vertical-align: middle"
           >
-            <ng-container *ngFor="let component of element.componentList">
+            <div *ngFor="let component of element.componentList">
               {{ component?.remarks }}
-            </ng-container>
+            </div>
           </td>
         </ng-container>
         <td colspan="2">
diff --git a/src/app/app-modules/nurse-doctor/case-sheet/general-case-sheet/doctor-diagnosis-case-sheet/doctor-diagnosis-case-sheet.component.ts b/src/app/app-modules/nurse-doctor/case-sheet/general-case-sheet/doctor-diagnosis-case-sheet/doctor-diagnosis-case-sheet.component.ts
index efcede90..7c73f544 100644
--- a/src/app/app-modules/nurse-doctor/case-sheet/general-case-sheet/doctor-diagnosis-case-sheet/doctor-diagnosis-case-sheet.component.ts
+++ b/src/app/app-modules/nurse-doctor/case-sheet/general-case-sheet/doctor-diagnosis-case-sheet/doctor-diagnosis-case-sheet.component.ts
@@ -29,6 +29,7 @@ import { DoctorService, MasterdataService } from '../../../shared/services';
 import { CDSSService } from '../../../shared/services/cdss-service';
 import * as moment from 'moment';
 import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service';
+import { map, Observable } from 'rxjs';
 
 @Component({
   selector: 'app-doctor-diagnosis-case-sheet',
@@ -132,6 +133,7 @@ export class DoctorDiagnosisCaseSheetComponent
   serviceList = '';
   referralReasonList = '';
   isCovidVaccinationStatusVisible = false;
+  userName: any;
 
   constructor(
     private doctorService: DoctorService,
@@ -168,6 +170,7 @@ export class DoctorDiagnosisCaseSheetComponent
   }
 
   ngOnChanges() {
+    this.userName = this.casesheetData?.doctorData?.diagnosis?.createdBy;
     this.assignSelectedLanguage();
     this.ncdScreeningCondition = null;
     if (this.casesheetData !== undefined && this.casesheetData) {
@@ -223,6 +226,7 @@ export class DoctorDiagnosisCaseSheetComponent
         this.doctorDiagnosis =
           this.casesheetData.doctorData.diagnosis.doctorDiagnonsis;
         this.diagnosisFlag = true;
+        this.userName = this.casesheetData?.doctorData?.diagnosis?.createdBy;
       }
       if (temp2 !== undefined) {
         if (temp2['symptom'] !== undefined) {
@@ -577,20 +581,25 @@ export class DoctorDiagnosisCaseSheetComponent
     return len > 0 ? new Array(len).join('0') + this : this;
   }
   downloadSign() {
-    if (this.beneficiaryDetails && this.beneficiaryDetails.tCSpecialistUserID) {
-      const tCSpecialistUserID = this.beneficiaryDetails.tCSpecialistUserID;
-      this.doctorService.downloadSign(tCSpecialistUserID).subscribe(
+    this.getUserId().subscribe((userId) => {
+      const tcSpecId = this.beneficiaryDetails?.tCSpecialistUserID;
+      const userIdToUse = tcSpecId && tcSpecId !== 0 ? tcSpecId : userId;
+      this.doctorService.downloadSign(userIdToUse).subscribe(
         (response: any) => {
           const blob = new Blob([response], { type: response.type });
           this.showSign(blob);
         },
         (err: any) => {
-          console.log('error');
+          console.error('Error downloading signature:', err);
         },
       );
-    } else {
-      console.log('No tCSpecialistUserID found');
-    }
+    });
+  }
+
+  getUserId(): Observable<any> {
+    return this.doctorService
+      .getUserId(this.userName)
+      .pipe(map((res: any) => res?.userId || null));
   }
   showSign(blob: any) {
     const reader = new FileReader();
diff --git a/src/app/app-modules/nurse-doctor/doctor-worklist/doctor-worklist.component.css b/src/app/app-modules/nurse-doctor/doctor-worklist/doctor-worklist.component.css
index 60fe44a1..5d015dd8 100644
--- a/src/app/app-modules/nurse-doctor/doctor-worklist/doctor-worklist.component.css
+++ b/src/app/app-modules/nurse-doctor/doctor-worklist/doctor-worklist.component.css
@@ -96,6 +96,11 @@ ul li div {
 
 }
 
+::ng-deep .marker-h-r-c,
+::ng-deep .marker-h-r-c td {
+  color: #FF0000 !important;
+}
+
 .color-rows>td {
   padding: 0;
   border: 0;
diff --git a/src/app/app-modules/nurse-doctor/doctor-worklist/doctor-worklist.component.html b/src/app/app-modules/nurse-doctor/doctor-worklist/doctor-worklist.component.html
index 5b6694cc..1289372b 100644
--- a/src/app/app-modules/nurse-doctor/doctor-worklist/doctor-worklist.component.html
+++ b/src/app/app-modules/nurse-doctor/doctor-worklist/doctor-worklist.component.html
@@ -17,6 +17,16 @@
       </div>
     </div>
     <div class="col-xs-4 col-sm-6 col-md-8 fit_to_content">
+      <button
+        *ngIf="enableCHOReportBtn"
+        mat-raised-button
+        color="primary"
+        class="mat_blue pull-right"
+        style="margin-left: 8px"
+        (click)="redirectToCHOReport()"
+      >
+        {{ currentLanguageSet.Reports.choReport }}
+      </button>
       <button
         mat-raised-button
         id="caseSheetButton"
@@ -365,7 +375,8 @@
                 </ul>
               </td>
               <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
-              <tr mat-row *matRowDef="let row; columns: displayedColumns"></tr>
+              <tr mat-row *matRowDef="let row; columns: displayedColumns"
+              [ngClass]="{ 'marker-h-r-c': row.is_high_risk }"></tr>
             </table>
           </div>
           <div
diff --git a/src/app/app-modules/nurse-doctor/doctor-worklist/doctor-worklist.component.ts b/src/app/app-modules/nurse-doctor/doctor-worklist/doctor-worklist.component.ts
index 7cd4eb6d..d9df39dd 100644
--- a/src/app/app-modules/nurse-doctor/doctor-worklist/doctor-worklist.component.ts
+++ b/src/app/app-modules/nurse-doctor/doctor-worklist/doctor-worklist.component.ts
@@ -39,6 +39,7 @@ import { MatPaginator } from '@angular/material/paginator';
 import { DoctorService, MasterdataService } from '../shared/services';
 import { SchedulerComponent } from '../scheduler/scheduler.component';
 import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service';
+import { environment } from 'src/environments/environment';
 
 @Component({
   selector: 'app-doctor-worklist',
@@ -59,6 +60,7 @@ export class DoctorWorklistComponent implements OnInit, DoCheck, OnDestroy {
   beneficiaryMetaData: any;
   currentPage: number | undefined;
   teleConsultationFlag: any;
+  enableCHOReportBtn = environment.enableCHOReportBtn;
 
   @ViewChild(MatPaginator) paginator: MatPaginator | null = null;
   dataSource = new MatTableDataSource<any>();
@@ -114,6 +116,10 @@ export class DoctorWorklistComponent implements OnInit, DoCheck, OnDestroy {
     this.sessionstorage.removeItem('currentRole');
   }
 
+  redirectToCHOReport() {
+    window.location.href = `${environment.dhisURL}${JSON.parse(this.sessionstorage.getItem('loginDataResponse'))?.dhistoken}`;
+  }
+
   setDisplayedColumns() {
     if (
       this.teleConsultationFlag === 'ESanjeevani' ||
@@ -189,9 +195,18 @@ export class DoctorWorklistComponent implements OnInit, DoCheck, OnDestroy {
             sectionCount.sno = index + 1;
           });
           this.filterTerm = null;
-        } else this.confirmationService.alert(data.errorMessage, 'error');
+        } else {
+          console.log('Error in else part', data.errorMessage);
+
+          this.confirmationService.alert(data.errorMessage, 'error');
+        }
       },
       (err) => {
+        if (err?.handled) {
+          console.log('error handled');
+
+          return;
+        }
         this.confirmationService.alert(err, 'error');
       },
     );
diff --git a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/general-examination/general-examination.component.html b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/general-examination/general-examination.component.html
index f59582b0..b46b69cd 100644
--- a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/general-examination/general-examination.component.html
+++ b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/general-examination/general-examination.component.html
@@ -11,6 +11,7 @@
           id="consciousness"
           name="consciousness"
           formControlName="consciousness"
+          (selectionChange)="trackFieldInteraction('Consciousness')"
         >
           <mat-option
             *ngFor="let consciousness of selectConsciousness"
@@ -35,6 +36,7 @@
           id="cooperation"
           name="cooperation"
           formControlName="cooperation"
+          (selectionChange)="trackFieldInteraction('Cooperation')"
         >
           <mat-option
             *ngFor="let cooperation of selectCooperation"
@@ -59,6 +61,7 @@
           id="builtAndAppearance"
           name="builtAndAppearance"
           formControlName="builtAndAppearance"
+          (selectionChange)="trackFieldInteraction('Built and Appearance')"
         >
           <mat-option *ngFor="let built of selectBuilt" [value]="built.name">
             {{ built.name }}
@@ -80,6 +83,7 @@
         id="coherence"
         name="coherence"
         formControlName="coherence"
+        (change)="trackFieldInteraction('Coherence')"
       >
         <mat-radio-button color="primary" class="radio-btn" value="Coherent">{{
           current_language_set?.common?.yes
@@ -104,6 +108,7 @@
         id="comfortness"
         name="comfortness"
         formControlName="comfortness"
+        (change)="trackFieldInteraction('Comfortness')"
       >
         <mat-radio-button
           color="primary"
@@ -128,7 +133,12 @@
           ?.genExamination?.gait
       }}</label>
       <div class="clearfix"></div>
-      <mat-radio-group id="gait" name="gait" formControlName="gait">
+      <mat-radio-group
+        id="gait"
+        name="gait"
+        formControlName="gait"
+        (change)="trackFieldInteraction('Gait')"
+      >
         <mat-radio-button color="primary" class="radio-btn" value="Normal">{{
           current_language_set?.common?.normal
         }}</mat-radio-button>
@@ -153,7 +163,7 @@
         id="dangerSigns"
         name="dangerSigns"
         formControlName="dangerSigns"
-        (change)="checkWithDangerSign()"
+        (change)="checkWithDangerSign(); trackFieldInteraction('Danger Signs')"
       >
         <mat-radio-button color="primary" class="radio-btn" value="Yes">{{
           current_language_set?.common?.yes
@@ -182,6 +192,7 @@
           name="typeOfDangerSigns"
           formControlName="typeOfDangerSigns"
           [required]="dangerSigns === 'Yes'"
+          (selectionChange)="trackFieldInteraction('Type of Danger Signs')"
         >
           <mat-option
             *ngFor="let signs of selectDangerSigns"
@@ -204,7 +215,12 @@
           ?.genExamination?.pallor
       }}</label>
       <div class="clearfix"></div>
-      <mat-radio-group id="pallor" name="pallor" formControlName="pallor">
+      <mat-radio-group
+        id="pallor"
+        name="pallor"
+        formControlName="pallor"
+        (change)="trackFieldInteraction('Pallor')"
+      >
         <mat-radio-button color="primary" class="radio-btn" value="Present">{{
           current_language_set?.common?.present
         }}</mat-radio-button>
@@ -225,7 +241,12 @@
           ?.genExamination?.jaundice
       }}</label>
       <div class="clearfix"></div>
-      <mat-radio-group id="jaundice" name="jaundice" formControlName="jaundice">
+      <mat-radio-group
+        id="jaundice"
+        name="jaundice"
+        formControlName="jaundice"
+        (change)="trackFieldInteraction('Jaundice')"
+      >
         <mat-radio-button color="primary" class="radio-btn" value="Present">{{
           current_language_set?.common?.present
         }}</mat-radio-button>
@@ -246,7 +267,12 @@
           ?.genExamination?.cyanosis
       }}</label>
       <div class="clearfix"></div>
-      <mat-radio-group id="cyanosis" name="cyanosis" formControlName="cyanosis">
+      <mat-radio-group
+        id="cyanosis"
+        name="cyanosis"
+        formControlName="cyanosis"
+        (change)="trackFieldInteraction('Cyanosis')"
+      >
         <mat-radio-button color="primary" class="radio-btn" value="Present">{{
           current_language_set?.common?.present
         }}</mat-radio-button>
@@ -267,7 +293,12 @@
           ?.genExamination?.clubbing
       }}</label>
       <div class="clearfix"></div>
-      <mat-radio-group id="clubbing" name="clubbing" formControlName="clubbing">
+      <mat-radio-group
+        id="clubbing"
+        name="clubbing"
+        formControlName="clubbing"
+        (change)="trackFieldInteraction('Clubbing')"
+      >
         <mat-radio-button color="primary" class="radio-btn" value="Present">{{
           current_language_set?.common?.present
         }}</mat-radio-button>
@@ -292,7 +323,9 @@
         id="lymphadenopathy"
         name="lymphadenopathy"
         formControlName="lymphadenopathy"
-        (change)="checkWithLymphadenopathy()"
+        (change)="
+          checkWithLymphadenopathy(); trackFieldInteraction('Lymphadenopathy')
+        "
       >
         <mat-radio-button color="primary" class="radio-btn" value="Present">{{
           current_language_set?.common?.present
@@ -321,6 +354,7 @@
           name="lymphnodesInvolved"
           formControlName="lymphnodesInvolved"
           [required]="lymphadenopathy === 'Present'"
+          (selectionChange)="trackFieldInteraction('Lymph Nodes Involved')"
         >
           <mat-option
             *ngFor="let lymphNodes of selectLymphNodes"
@@ -350,6 +384,7 @@
           name="typeOfLymphadenopathy"
           formControlName="typeOfLymphadenopathy"
           [required]="lymphadenopathy === 'Present'"
+          (selectionChange)="trackFieldInteraction('Type of Lymphadenopathy')"
         >
           <mat-option
             *ngFor="let typeOfLymphadenopathy of selectTypeOfLymphadenopathy"
@@ -376,7 +411,7 @@
         id="edema"
         name="edema"
         formControlName="edema"
-        (change)="checkWithEdema()"
+        (change)="checkWithEdema(); trackFieldInteraction('Edema')"
       >
         <mat-radio-button color="primary" class="radio-btn" value="Present">{{
           current_language_set?.common?.present
@@ -404,6 +439,7 @@
           name="extentOfEdema"
           formControlName="extentOfEdema"
           [required]="edema === 'Present'"
+          (selectionChange)="trackFieldInteraction('Extent of Edema')"
         >
           <mat-option
             *ngFor="let extentOfEdema of selectExtentOfEdema"
@@ -432,6 +468,7 @@
         name="edemaType"
         formControlName="edemaType"
         [required]="edema === 'Present'"
+        (change)="trackFieldInteraction('Type of Edema')"
       >
         <mat-radio-button color="primary" class="radio-btn" value="Pitting">{{
           current_language_set?.ExaminationData?.ANC_OPD_PNCExamination
@@ -464,6 +501,7 @@
         id="quickening"
         name="quickening"
         formControlName="quickening"
+        (change)="trackFieldInteraction('Quickening')"
       >
         <mat-radio-button color="primary" class="radio-btn" value="Present">{{
           current_language_set?.common?.present
@@ -490,6 +528,7 @@
         id="foetalMovements"
         name="foetalMovements"
         formControlName="foetalMovements"
+        (change)="trackFieldInteraction('Foetal Movements')"
       >
         <mat-radio-button color="primary" class="radio-btn" value="Present">{{
           current_language_set?.common?.present
diff --git a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/general-examination/general-examination.component.ts b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/general-examination/general-examination.component.ts
index 4f5141c5..d5cccf13 100644
--- a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/general-examination/general-examination.component.ts
+++ b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/general-examination/general-examination.component.ts
@@ -24,6 +24,7 @@ import { FormGroup, FormBuilder } from '@angular/forms';
 import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service';
 import { SetLanguageComponent } from 'src/app/app-modules/core/components/set-language.component';
 import { HttpServiceService } from 'src/app/app-modules/core/services/http-service.service';
+import { AmritTrackingService } from 'Common-UI/src/tracking';
 
 @Component({
   selector: 'app-nurse-general-examination',
@@ -209,6 +210,7 @@ export class GeneralExaminationComponent implements OnInit, DoCheck, OnChanges {
   constructor(
     public httpServiceService: HttpServiceService,
     readonly sessionstorage: SessionStorageService,
+    private trackingService: AmritTrackingService,
   ) {}
   hideForANCAndQC = false;
   ngOnInit() {
@@ -284,4 +286,11 @@ export class GeneralExaminationComponent implements OnInit, DoCheck, OnChanges {
   get FoetalMovements() {
     return this.generalExaminationForm.controls['foetalMovements'].value;
   }
+
+  trackFieldInteraction(fieldName: string) {
+    this.trackingService.trackFieldInteraction(
+      fieldName,
+      'General Examination',
+    );
+  }
 }
diff --git a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/head-to-toe-examination/head-to-toe-examination.component.html b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/head-to-toe-examination/head-to-toe-examination.component.html
index fd90760b..7e887852 100644
--- a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/head-to-toe-examination/head-to-toe-examination.component.html
+++ b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/head-to-toe-examination/head-to-toe-examination.component.html
@@ -15,7 +15,9 @@
         id="headtoToeExam"
         name="headtoToeExam"
         formControlName="headtoToeExam"
-        (change)="checkWithHeadToToe()"
+        (change)="
+          checkWithHeadToToe(); trackFieldInteraction('Head to Toe Examination')
+        "
       >
         <mat-radio-button color="primary" value="Normal">{{
           current_language_set?.common?.normal
@@ -48,6 +50,7 @@
               name="head"
               formControlName="head"
               maxlength="50"
+              (focus)="trackFieldInteraction('Head Examination')"
             />
           </mat-form-field>
         </div>
@@ -72,6 +75,7 @@
               name="eyes"
               formControlName="eyes"
               maxlength="50"
+              (focus)="trackFieldInteraction('Eyes Examination')"
             />
           </mat-form-field>
         </div>
@@ -97,6 +101,7 @@
               name="ears"
               formControlName="ears"
               maxlength="50"
+              (focus)="trackFieldInteraction('Ears Examination')"
             />
           </mat-form-field>
         </div>
@@ -122,6 +127,7 @@
               name="nose"
               formControlName="nose"
               maxlength="50"
+              (focus)="trackFieldInteraction('Nose Examination')"
             />
           </mat-form-field>
         </div>
@@ -147,6 +153,7 @@
               name="oralCavity"
               formControlName="oralCavity"
               maxlength="50"
+              (focus)="trackFieldInteraction('Oral Cavity Examination')"
             />
           </mat-form-field>
         </div>
@@ -172,6 +179,7 @@
               name="throat"
               formControlName="throat"
               maxlength="50"
+              (focus)="trackFieldInteraction('Throat Examination')"
             />
           </mat-form-field>
         </div>
@@ -196,6 +204,7 @@
               name="breastAndNipples"
               formControlName="breastAndNipples"
               maxlength="50"
+              (focus)="trackFieldInteraction('Breast Examination')"
             />
           </mat-form-field>
         </div>
@@ -218,6 +227,7 @@
               name="nipples"
               formControlName="nipples"
               maxlength="300"
+              (focus)="trackFieldInteraction('Nipples Examination')"
             />
           </mat-form-field>
         </div>
@@ -243,6 +253,7 @@
               name="trunk"
               formControlName="trunk"
               maxlength="50"
+              (focus)="trackFieldInteraction('Trunk Examination')"
             />
           </mat-form-field>
         </div>
@@ -268,6 +279,7 @@
               name="upperLimbs"
               formControlName="upperLimbs"
               maxlength="50"
+              (focus)="trackFieldInteraction('Upper Limbs Examination')"
             />
           </mat-form-field>
         </div>
@@ -293,6 +305,7 @@
               name="lowerLimbs"
               formControlName="lowerLimbs"
               maxlength="50"
+              (focus)="trackFieldInteraction('Lower Limbs Examination')"
             />
           </mat-form-field>
         </div>
@@ -318,6 +331,7 @@
               name="skin"
               formControlName="skin"
               maxlength="50"
+              (focus)="trackFieldInteraction('Skin Examination')"
             />
           </mat-form-field>
         </div>
@@ -343,6 +357,7 @@
               name="hair"
               formControlName="hair"
               maxlength="50"
+              (focus)="trackFieldInteraction('Hair Examination')"
             />
           </mat-form-field>
         </div>
@@ -368,6 +383,7 @@
               name="nails"
               formControlName="nails"
               maxlength="50"
+              (focus)="trackFieldInteraction('Nails Examination')"
             />
           </mat-form-field>
         </div>
diff --git a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/head-to-toe-examination/head-to-toe-examination.component.ts b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/head-to-toe-examination/head-to-toe-examination.component.ts
index 7803850d..79d0747a 100644
--- a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/head-to-toe-examination/head-to-toe-examination.component.ts
+++ b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/head-to-toe-examination/head-to-toe-examination.component.ts
@@ -23,6 +23,7 @@ import { Component, OnInit, Input, DoCheck } from '@angular/core';
 import { FormBuilder, FormGroup } from '@angular/forms';
 import { SetLanguageComponent } from 'src/app/app-modules/core/components/set-language.component';
 import { HttpServiceService } from 'src/app/app-modules/core/services/http-service.service';
+import { AmritTrackingService } from 'Common-UI/src/tracking';
 
 @Component({
   selector: 'app-nurse-head-to-toe-examination',
@@ -40,6 +41,7 @@ export class HeadToToeExaminationComponent implements OnInit, DoCheck {
   constructor(
     private fb: FormBuilder,
     public httpServiceService: HttpServiceService,
+    private trackingService: AmritTrackingService,
   ) {}
 
   ngOnInit() {
@@ -119,4 +121,11 @@ export class HeadToToeExaminationComponent implements OnInit, DoCheck {
   get nipples() {
     return this.headToToeExaminationForm.controls['nipples'].value;
   }
+
+  trackFieldInteraction(fieldName: string) {
+    this.trackingService.trackFieldInteraction(
+      fieldName,
+      'Head to Toe Examination',
+    );
+  }
 }
diff --git a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/cardio-vascular-system/cardio-vascular-system.component.html b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/cardio-vascular-system/cardio-vascular-system.component.html
index d4bff7c3..e2baf95f 100644
--- a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/cardio-vascular-system/cardio-vascular-system.component.html
+++ b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/cardio-vascular-system/cardio-vascular-system.component.html
@@ -8,6 +8,7 @@
     <mat-radio-group
       name="jugularVenousPulse_JVP"
       formControlName="jugularVenousPulse_JVP"
+      (change)="trackFieldInteraction('Jugular Venous Pressure')"
     >
       <mat-radio-button color="primary" value="Normal">{{
         current_language_set?.common?.normal
@@ -32,6 +33,7 @@
         name="apexbeatLocation"
         formControlName="apexbeatLocation"
         maxlength="300"
+        (focus)="trackFieldInteraction('Apex Beat Location')"
       ></textarea>
     </mat-form-field>
   </div>
@@ -50,6 +52,7 @@
         name="apexbeatType"
         formControlName="apexbeatType"
         maxlength="300"
+        (focus)="trackFieldInteraction('Apex Beat Type')"
       ></textarea>
     </mat-form-field>
   </div>
@@ -68,6 +71,7 @@
         name="firstHeartSound_S1"
         formControlName="firstHeartSound_S1"
         maxlength="300"
+        (focus)="trackFieldInteraction('First Heart Sound')"
       ></textarea>
     </mat-form-field>
   </div>
@@ -86,6 +90,7 @@
         name="secondHeartSound_S2"
         formControlName="secondHeartSound_S2"
         maxlength="300"
+        (focus)="trackFieldInteraction('Second Heart Sound')"
       ></textarea>
     </mat-form-field>
   </div>
@@ -104,6 +109,7 @@
         name="additionalHeartSounds"
         formControlName="additionalHeartSounds"
         maxlength="300"
+        (focus)="trackFieldInteraction('Additional Heart Sounds')"
       ></textarea>
     </mat-form-field>
   </div>
@@ -114,7 +120,11 @@
         ?.cardioForANC_OPD_PNC?.murmurs
     }}</label>
     <div class="clearfix"></div>
-    <mat-radio-group name="murmurs" formControlName="murmurs">
+    <mat-radio-group
+      name="murmurs"
+      formControlName="murmurs"
+      (change)="trackFieldInteraction('Murmurs')"
+    >
       <mat-radio-button color="primary" value="Present">{{
         current_language_set?.common?.present
       }}</mat-radio-button>
@@ -130,7 +140,11 @@
         ?.cardioForANC_OPD_PNC?.pericardialrub
     }}</label>
     <div class="clearfix"></div>
-    <mat-radio-group name="pericardialRub" formControlName="pericardialRub">
+    <mat-radio-group
+      name="pericardialRub"
+      formControlName="pericardialRub"
+      (change)="trackFieldInteraction('Pericardial Rub')"
+    >
       <mat-radio-button color="primary" value="Present">{{
         current_language_set?.common?.present
       }}</mat-radio-button>
diff --git a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/cardio-vascular-system/cardio-vascular-system.component.ts b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/cardio-vascular-system/cardio-vascular-system.component.ts
index debda105..7c6053e2 100644
--- a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/cardio-vascular-system/cardio-vascular-system.component.ts
+++ b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/cardio-vascular-system/cardio-vascular-system.component.ts
@@ -23,7 +23,7 @@ import { Component, OnInit, Input, DoCheck } from '@angular/core';
 import { FormGroup } from '@angular/forms';
 import { SetLanguageComponent } from 'src/app/app-modules/core/components/set-language.component';
 import { HttpServiceService } from 'src/app/app-modules/core/services/http-service.service';
-
+import { AmritTrackingService } from 'Common-UI/src/tracking';
 @Component({
   selector: 'app-nurse-cardio-vascular-system',
   templateUrl: './cardio-vascular-system.component.html',
@@ -34,7 +34,10 @@ export class CardioVascularSystemComponent implements OnInit, DoCheck {
   cardioVascularSystemForm!: FormGroup;
   current_language_set: any;
 
-  constructor(public httpServiceService: HttpServiceService) {}
+  constructor(
+    public httpServiceService: HttpServiceService,
+    private trackingService: AmritTrackingService,
+  ) {}
 
   ngOnInit() {
     this.assignSelectedLanguage();
@@ -48,4 +51,11 @@ export class CardioVascularSystemComponent implements OnInit, DoCheck {
     getLanguageJson.setLanguage();
     this.current_language_set = getLanguageJson.currentLanguageObject;
   }
+
+  trackFieldInteraction(fieldName: string) {
+    this.trackingService.trackFieldInteraction(
+      fieldName,
+      'Cardiovascular System',
+    );
+  }
 }
diff --git a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/central-nervous-system/central-nervous-system.component.html b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/central-nervous-system/central-nervous-system.component.html
index b04a7ab0..c7cd7dbd 100644
--- a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/central-nervous-system/central-nervous-system.component.html
+++ b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/central-nervous-system/central-nervous-system.component.html
@@ -9,6 +9,7 @@
         class="select-full-width"
         name="handedness"
         formControlName="handedness"
+        (selectionChange)="trackFieldInteraction('Handedness')"
       >
         <mat-option
           *ngFor="let handedness of selectHandedness"
@@ -34,6 +35,7 @@
         name="cranialNervesExamination"
         formControlName="cranialNervesExamination"
         maxlength="300"
+        (focus)="trackFieldInteraction('Cranial Nerves Examination')"
       ></textarea>
     </mat-form-field>
   </div>
@@ -52,6 +54,7 @@
         name="motorSystem"
         formControlName="motorSystem"
         maxlength="300"
+        (focus)="trackFieldInteraction('Motor System')"
       ></textarea>
     </mat-form-field>
   </div>
@@ -70,6 +73,7 @@
         name="sensorySystem"
         formControlName="sensorySystem"
         maxlength="300"
+        (focus)="trackFieldInteraction('Sensory System')"
       ></textarea>
     </mat-form-field>
   </div>
@@ -88,6 +92,7 @@
         name="autonomicSystem"
         formControlName="autonomicSystem"
         maxlength="300"
+        (focus)="trackFieldInteraction('Autonomic System')"
       ></textarea>
     </mat-form-field>
   </div>
@@ -106,6 +111,7 @@
         name="cerebellarSigns"
         formControlName="cerebellarSigns"
         maxlength="300"
+        (focus)="trackFieldInteraction('Cerebellar Signs')"
       ></textarea>
     </mat-form-field>
   </div>
@@ -119,6 +125,7 @@
     <mat-radio-group
       name="signsOfMeningealIrritation"
       formControlName="signsOfMeningealIrritation"
+      (change)="trackFieldInteraction('Signs of Meningeal Irritation')"
     >
       <mat-radio-button color="primary" value="Present">{{
         current_language_set?.common?.present
@@ -143,6 +150,7 @@
         name="skull"
         formControlName="skull"
         maxlength="300"
+        (focus)="trackFieldInteraction('Skull')"
       ></textarea>
     </mat-form-field>
   </div>
diff --git a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/central-nervous-system/central-nervous-system.component.ts b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/central-nervous-system/central-nervous-system.component.ts
index 855a93bd..e0c5c134 100644
--- a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/central-nervous-system/central-nervous-system.component.ts
+++ b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/central-nervous-system/central-nervous-system.component.ts
@@ -23,6 +23,7 @@ import { Component, OnInit, Input, DoCheck } from '@angular/core';
 import { FormGroup } from '@angular/forms';
 import { SetLanguageComponent } from 'src/app/app-modules/core/components/set-language.component';
 import { HttpServiceService } from 'src/app/app-modules/core/services/http-service.service';
+import { AmritTrackingService } from 'Common-UI/src/tracking';
 
 @Component({
   selector: 'app-nurse-central-nervous-system',
@@ -49,7 +50,10 @@ export class CentralNervousSystemComponent implements OnInit, DoCheck {
     },
   ];
 
-  constructor(public httpServiceService: HttpServiceService) {}
+  constructor(
+    public httpServiceService: HttpServiceService,
+    private trackingService: AmritTrackingService,
+  ) {}
 
   ngOnInit() {
     this.assignSelectedLanguage();
@@ -63,4 +67,11 @@ export class CentralNervousSystemComponent implements OnInit, DoCheck {
     getLanguageJson.setLanguage();
     this.current_language_set = getLanguageJson.currentLanguageObject;
   }
+
+  trackFieldInteraction(fieldName: string) {
+    this.trackingService.trackFieldInteraction(
+      fieldName,
+      'Central Nervous System',
+    );
+  }
 }
diff --git a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/genito-urinary-system/genito-urinary-system.component.html b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/genito-urinary-system/genito-urinary-system.component.html
index ccf477fc..65c2c617 100644
--- a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/genito-urinary-system/genito-urinary-system.component.html
+++ b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/genito-urinary-system/genito-urinary-system.component.html
@@ -13,6 +13,7 @@
         name="renalAngle"
         formControlName="renalAngle"
         maxlength="300"
+        (focus)="trackFieldInteraction('Renal Angle')"
       ></textarea>
     </mat-form-field>
   </div>
@@ -31,6 +32,7 @@
         name="suprapubicRegion"
         formControlName="suprapubicRegion"
         maxlength="300"
+        (focus)="trackFieldInteraction('Suprapubic Region')"
       ></textarea>
     </mat-form-field>
   </div>
@@ -49,6 +51,7 @@
         name="externalGenitalia"
         formControlName="externalGenitalia"
         maxlength="300"
+        (focus)="trackFieldInteraction('External Genitalia')"
       ></textarea>
     </mat-form-field>
   </div>
diff --git a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/genito-urinary-system/genito-urinary-system.component.ts b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/genito-urinary-system/genito-urinary-system.component.ts
index 5039be56..4a825216 100644
--- a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/genito-urinary-system/genito-urinary-system.component.ts
+++ b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/genito-urinary-system/genito-urinary-system.component.ts
@@ -23,6 +23,7 @@ import { Component, OnInit, Input, DoCheck } from '@angular/core';
 import { FormGroup } from '@angular/forms';
 import { SetLanguageComponent } from 'src/app/app-modules/core/components/set-language.component';
 import { HttpServiceService } from 'src/app/app-modules/core/services/http-service.service';
+import { AmritTrackingService } from 'Common-UI/src/tracking';
 
 @Component({
   selector: 'app-nurse-genito-urinary-system',
@@ -34,7 +35,10 @@ export class GenitoUrinarySystemComponent implements OnInit, DoCheck {
   genitoUrinarySystemForm!: FormGroup;
   current_language_set: any;
 
-  constructor(public httpServiceService: HttpServiceService) {}
+  constructor(
+    public httpServiceService: HttpServiceService,
+    private trackingService: AmritTrackingService,
+  ) {}
 
   ngOnInit() {
     this.assignSelectedLanguage();
@@ -48,4 +52,11 @@ export class GenitoUrinarySystemComponent implements OnInit, DoCheck {
     getLanguageJson.setLanguage();
     this.current_language_set = getLanguageJson.currentLanguageObject;
   }
+
+  trackFieldInteraction(fieldName: string) {
+    this.trackingService.trackFieldInteraction(
+      fieldName,
+      'Genitourinary System',
+    );
+  }
 }
diff --git a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/musculoskeletal-system/musculoskeletal-system.component.html b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/musculoskeletal-system/musculoskeletal-system.component.html
index ca2ba269..33b6f090 100644
--- a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/musculoskeletal-system/musculoskeletal-system.component.html
+++ b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/musculoskeletal-system/musculoskeletal-system.component.html
@@ -18,6 +18,7 @@ <h5>
               class="select-full-width"
               name="joint_TypeOfJoint"
               formControlName="joint_TypeOfJoint"
+              (selectionChange)="trackFieldInteraction('Joint Type')"
             >
               <mat-option
                 *ngFor="let typeOfJoint of selectTypeOfJoint"
@@ -39,6 +40,7 @@ <h5>
               class="select-full-width"
               name="joint_Laterality"
               formControlName="joint_Laterality"
+              (selectionChange)="trackFieldInteraction('Joint Laterality')"
             >
               <mat-option
                 *ngFor="let jointLaterality of selectJointLaterality"
@@ -60,6 +62,7 @@ <h5>
               class="select-full-width"
               name="joint_Abnormality"
               formControlName="joint_Abnormality"
+              (selectionChange)="trackFieldInteraction('Joint Abnormality')"
             >
               <mat-option
                 *ngFor="let jointAbnormality of selectJointAbnormality"
@@ -93,6 +96,7 @@ <h5>
               class="select-full-width"
               name="upperLimb_Laterality"
               formControlName="upperLimb_Laterality"
+              (selectionChange)="trackFieldInteraction('Upper Limb Laterality')"
             >
               <mat-option
                 *ngFor="let upperLimbsLaterality of selectUpperLimbsLaterality"
@@ -114,6 +118,9 @@ <h5>
               class="select-full-width"
               name="upperLimb_Abnormality"
               formControlName="upperLimb_Abnormality"
+              (selectionChange)="
+                trackFieldInteraction('Upper Limb Abnormality')
+              "
             >
               <mat-option
                 *ngFor="
@@ -149,6 +156,7 @@ <h5>
               class="select-full-width"
               name="lowerLimb_Laterality"
               formControlName="lowerLimb_Laterality"
+              (selectionChange)="trackFieldInteraction('Lower Limb Laterality')"
             >
               <mat-option
                 *ngFor="let lowerLimbsLaterality of selectLowerLimbsLaterality"
@@ -170,6 +178,9 @@ <h5>
               class="select-full-width"
               name="lowerLimb_Abnormality"
               formControlName="lowerLimb_Abnormality"
+              (selectionChange)="
+                trackFieldInteraction('Lower Limb Abnormality')
+              "
             >
               <mat-option
                 *ngFor="
@@ -209,6 +220,7 @@ <h5>
               name="chestWall"
               formControlName="chestWall"
               maxlength="300"
+              (focus)="trackFieldInteraction('Chest Wall')"
             ></textarea>
           </mat-form-field>
         </div>
@@ -227,6 +239,7 @@ <h5>
               name="spine"
               formControlName="spine"
               maxlength="300"
+              (focus)="trackFieldInteraction('Spine')"
             ></textarea>
           </mat-form-field>
         </div>
diff --git a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/musculoskeletal-system/musculoskeletal-system.component.ts b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/musculoskeletal-system/musculoskeletal-system.component.ts
index f480bcc9..4186f42a 100644
--- a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/musculoskeletal-system/musculoskeletal-system.component.ts
+++ b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/musculoskeletal-system/musculoskeletal-system.component.ts
@@ -24,6 +24,7 @@ import { MasterdataService } from '../../../../shared/services';
 import { FormGroup } from '@angular/forms';
 import { SetLanguageComponent } from 'src/app/app-modules/core/components/set-language.component';
 import { HttpServiceService } from 'src/app/app-modules/core/services/http-service.service';
+import { AmritTrackingService } from 'Common-UI/src/tracking';
 
 @Component({
   selector: 'app-nurse-musculoskeletal-system',
@@ -144,6 +145,7 @@ export class MusculoskeletalSystemComponent
   constructor(
     private masterdataService: MasterdataService,
     public httpServiceService: HttpServiceService,
+    private trackingService: AmritTrackingService,
   ) {}
 
   ngOnInit() {
@@ -172,4 +174,11 @@ export class MusculoskeletalSystemComponent
         if (masterData) this.selectTypeOfJoint = masterData.jointTypes;
       });
   }
+
+  trackFieldInteraction(fieldName: string) {
+    this.trackingService.trackFieldInteraction(
+      fieldName,
+      'Musculoskeletal System',
+    );
+  }
 }
diff --git a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/obstetric-examination/obstetric-examination.component.html b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/obstetric-examination/obstetric-examination.component.html
index c3a66351..7fd65675 100644
--- a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/obstetric-examination/obstetric-examination.component.html
+++ b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/obstetric-examination/obstetric-examination.component.html
@@ -9,6 +9,7 @@
         class="select-full-width"
         name="fundalHeight"
         formControlName="fundalHeight"
+        (selectionChange)="trackFieldInteraction('Fundal Height')"
       >
         <mat-option
           *ngFor="let fundalHeight of selectFundalHeight"
@@ -30,6 +31,7 @@
         class="select-full-width"
         name="fHAndPOA_Status"
         formControlName="fHAndPOA_Status"
+        (selectionChange)="trackFieldInteraction('FH and POA Status')"
       >
         <mat-option
           *ngFor="let FHPOAStatus of selectFHPOAStatus"
@@ -50,6 +52,7 @@
         class="select-full-width"
         name="fHAndPOA_Interpretation"
         formControlName="fHAndPOA_Interpretation"
+        (selectionChange)="trackFieldInteraction('FH and POA Interpretation')"
       >
         <mat-option
           *ngFor="let interpretationFHAndPOA of selectInterpretationFHAndPOA"
@@ -71,6 +74,7 @@
       name="fetalMovements"
       formControlName="fetalMovements"
       required
+      (change)="trackFieldInteraction('Fetal Movements')"
     >
       <mat-radio-button color="primary" class="radio-btn" value="Present">{{
         current_language_set?.common?.present
@@ -90,7 +94,9 @@
     <mat-radio-group
       name="fetalHeartSounds"
       formControlName="fetalHeartSounds"
-      (selectionChange)="resetFetalHeartRate($event)"
+      (selectionChange)="
+        resetFetalHeartRate($event); trackFieldInteraction('Fetal Heart Sounds')
+      "
     >
       <mat-radio-button color="primary" class="radio-btn" value="Audible">{{
         current_language_set?.common?.audible
@@ -114,6 +120,7 @@
         class="select-full-width"
         name="fetalHeartRate_BeatsPerMinute"
         formControlName="fetalHeartRate_BeatsPerMinute"
+        (selectionChange)="trackFieldInteraction('Fetal Heart Rate')"
       >
         <mat-option
           *ngFor="let fetalHeartRate of selectFetalHeartRate"
@@ -135,6 +142,7 @@
         class="select-full-width"
         name="fetalPositionOrLie"
         formControlName="fetalPositionOrLie"
+        (selectionChange)="trackFieldInteraction('Fetal Position')"
       >
         <mat-option
           *ngFor="let fetalPositionOrLie of selectFetalPositionOrLie"
@@ -156,6 +164,7 @@
         class="select-full-width"
         name="fetalPresentation"
         formControlName="fetalPresentation"
+        (selectionChange)="trackFieldInteraction('Fetal Presentation')"
       >
         <mat-option
           *ngFor="let fetalPresentation of selectFetalPresentation"
@@ -177,6 +186,7 @@
         class="select-full-width"
         name="abdominalScars"
         formControlName="abdominalScars"
+        (selectionChange)="trackFieldInteraction('Abdominal Scars')"
       >
         <mat-option
           *ngFor="let abdominalScars of selectAbdominalScars"
@@ -201,6 +211,7 @@
         formControlName="sfh"
         allowText="decimal"
         allowMax="100.0"
+        (focus)="trackFieldInteraction('SFH')"
       ></textarea>
     </mat-form-field>
   </div>
@@ -213,7 +224,9 @@
     <mat-radio-group
       name="malPresentation"
       formControlName="malPresentation"
-      (selectionChange)="checkForHRP()"
+      (selectionChange)="
+        checkForHRP(); trackFieldInteraction('Mal Presentation')
+      "
       required
     >
       <mat-radio-button color="primary" class="radio-btn" value="true"
@@ -233,7 +246,9 @@
     <mat-radio-group
       name="lowLyingPlacenta"
       formControlName="lowLyingPlacenta"
-      (selectionChange)="checkForHRP()"
+      (selectionChange)="
+        checkForHRP(); trackFieldInteraction('Low Lying Placenta')
+      "
       required
     >
       <mat-radio-button color="primary" class="radio-btn" value="true"
@@ -253,7 +268,9 @@
     <mat-radio-group
       name="vertebralDeformity"
       formControlName="vertebralDeformity"
-      (selectionChange)="checkForHRP()"
+      (selectionChange)="
+        checkForHRP(); trackFieldInteraction('Vertebral Deformity')
+      "
       required
     >
       <mat-radio-button color="primary" class="radio-btn" value="true"
@@ -271,7 +288,7 @@
         mat-raised-button
         color="primary"
         class="mat_blue"
-        (click)="getHRPStatus()"
+        (click)="getHRPStatus(); trackFieldInteraction('Check HRP Status')"
       >
         {{ current_language_set?.checkHrpStatus }}
       </button>
@@ -282,7 +299,10 @@
           [id]="value.foetalMonitorTestId"
           class="button-overall-disabled mat_blue"
           [disabled]="checkTestPrescribed(value.foetalMonitorTestId)"
-          (click)="sendTestDetails(value.foetalMonitorTestId, value.testName)"
+          (click)="
+            sendTestDetails(value.foetalMonitorTestId, value.testName);
+            trackFieldInteraction('Fetosense Test')
+          "
         >
           {{ value.testName }}
         </button>
diff --git a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/obstetric-examination/obstetric-examination.component.ts b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/obstetric-examination/obstetric-examination.component.ts
index 57a4a6a6..58200d7d 100644
--- a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/obstetric-examination/obstetric-examination.component.ts
+++ b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/obstetric-examination/obstetric-examination.component.ts
@@ -35,6 +35,7 @@ import {
 } from 'src/app/app-modules/nurse-doctor/shared/services';
 import { HrpService } from 'src/app/app-modules/nurse-doctor/shared/services/hrp.service';
 import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service';
+import { AmritTrackingService } from 'Common-UI/src/tracking';
 @Component({
   selector: 'app-nurse-anc-obstetric-examination',
   templateUrl: './obstetric-examination.component.html',
@@ -217,6 +218,7 @@ export class ObstetricExaminationComponent
     private datePipe: DatePipe,
     readonly sessionstorage: SessionStorageService,
     private doctorService: DoctorService,
+    private trackingService: AmritTrackingService,
   ) {}
 
   ngOnDestroy() {
@@ -502,4 +504,11 @@ export class ObstetricExaminationComponent
   }
 
   /*END*/
+
+  trackFieldInteraction(fieldName: string) {
+    this.trackingService.trackFieldInteraction(
+      fieldName,
+      'Obstetric Examination',
+    );
+  }
 }
diff --git a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/respiratory-system/respiratory-system.component.html b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/respiratory-system/respiratory-system.component.html
index f5ee7c2e..8b53f1df 100644
--- a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/respiratory-system/respiratory-system.component.html
+++ b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/respiratory-system/respiratory-system.component.html
@@ -9,6 +9,7 @@
         class="select-full-width"
         name="trachea"
         formControlName="trachea"
+        (selectionChange)="trackFieldInteraction('Trachea')"
       >
         <mat-option
           *ngFor="let trachea of selectTrachea"
@@ -34,6 +35,7 @@
         name="inspection"
         formControlName="inspection"
         maxlength="300"
+        (focus)="trackFieldInteraction('Inspection')"
       ></textarea>
     </mat-form-field>
   </div>
@@ -47,6 +49,7 @@
     <mat-radio-group
       name="signsOfRespiratoryDistress"
       formControlName="signsOfRespiratoryDistress"
+      (change)="trackFieldInteraction('Signs of Respiratory Distress')"
     >
       <mat-radio-button color="primary" value="Present">{{
         current_language_set?.common?.present
@@ -71,6 +74,7 @@
         name="palpation"
         formControlName="palpation"
         maxlength="300"
+        (focus)="trackFieldInteraction('Palpation')"
       ></textarea>
     </mat-form-field>
   </div>
@@ -85,6 +89,7 @@
         class="select-full-width"
         name="auscultation_BreathSounds"
         formControlName="auscultation_BreathSounds"
+        (selectionChange)="trackFieldInteraction('Breath Sounds')"
       >
         <mat-option
           *ngFor="let breathSound of selectBreathSounds"
@@ -105,6 +110,7 @@
     <mat-radio-group
       name="auscultation_Stridor"
       formControlName="auscultation_Stridor"
+      (change)="trackFieldInteraction('Stridor')"
     >
       <mat-radio-button color="primary" value="Present">{{
         current_language_set?.common?.present
@@ -124,6 +130,7 @@
     <mat-radio-group
       name="auscultation_Crepitations"
       formControlName="auscultation_Crepitations"
+      (change)="trackFieldInteraction('Crepitations')"
     >
       <mat-radio-button color="primary" value="Present">{{
         current_language_set?.common?.present
@@ -143,6 +150,7 @@
     <mat-radio-group
       name="auscultation_Wheezing"
       formControlName="auscultation_Wheezing"
+      (change)="trackFieldInteraction('Wheezing')"
     >
       <mat-radio-button color="primary" value="Present">{{
         current_language_set?.common?.present
@@ -162,6 +170,7 @@
     <mat-radio-group
       name="auscultation_PleuralRub"
       formControlName="auscultation_PleuralRub"
+      (change)="trackFieldInteraction('Pleural Rub')"
     >
       <mat-radio-button color="primary" value="Present">{{
         current_language_set?.common?.present
@@ -181,6 +190,7 @@
     <mat-radio-group
       name="auscultation_ConductedSounds"
       formControlName="auscultation_ConductedSounds"
+      (change)="trackFieldInteraction('Conducted Sounds')"
     >
       <mat-radio-button color="primary" value="Present">{{
         current_language_set?.common?.present
@@ -201,6 +211,7 @@
         class="select-full-width"
         name="percussion"
         formControlName="percussion"
+        (selectionChange)="trackFieldInteraction('Percussion')"
       >
         <mat-option
           *ngFor="let percussion of selectPercussion"
diff --git a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/respiratory-system/respiratory-system.component.ts b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/respiratory-system/respiratory-system.component.ts
index f17c5fa7..b3c56c08 100644
--- a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/respiratory-system/respiratory-system.component.ts
+++ b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/respiratory-system/respiratory-system.component.ts
@@ -23,6 +23,7 @@ import { Component, OnInit, Input, DoCheck } from '@angular/core';
 import { FormBuilder, FormGroup } from '@angular/forms';
 import { SetLanguageComponent } from 'src/app/app-modules/core/components/set-language.component';
 import { HttpServiceService } from 'src/app/app-modules/core/services/http-service.service';
+import { AmritTrackingService } from 'Common-UI/src/tracking';
 
 @Component({
   selector: 'app-nurse-respiratory-system',
@@ -86,6 +87,7 @@ export class RespiratorySystemComponent implements OnInit, DoCheck {
   constructor(
     private fb: FormBuilder,
     public httpServiceService: HttpServiceService,
+    private trackingService: AmritTrackingService,
   ) {}
 
   ngOnInit() {
@@ -100,4 +102,8 @@ export class RespiratorySystemComponent implements OnInit, DoCheck {
     getLanguageJson.setLanguage();
     this.current_language_set = getLanguageJson.currentLanguageObject;
   }
+
+  trackFieldInteraction(fieldName: string) {
+    this.trackingService.trackFieldInteraction(fieldName, 'Respiratory System');
+  }
 }
diff --git a/src/app/app-modules/nurse-doctor/history/general-opd-history/comorbidity-concurrent-conditions/comorbidity-concurrent-conditions.component.html b/src/app/app-modules/nurse-doctor/history/general-opd-history/comorbidity-concurrent-conditions/comorbidity-concurrent-conditions.component.html
index accbecf7..53cf432f 100644
--- a/src/app/app-modules/nurse-doctor/history/general-opd-history/comorbidity-concurrent-conditions/comorbidity-concurrent-conditions.component.html
+++ b/src/app/app-modules/nurse-doctor/history/general-opd-history/comorbidity-concurrent-conditions/comorbidity-concurrent-conditions.component.html
@@ -6,7 +6,7 @@
       id="previousANCComorbidityHistory"
       color="primary"
       matTooltip="{{ currentLanguageSet?.DurationData?.previousDetails }}"
-      (click)="getPreviousComorbidityHistory()"
+      (click)="getPreviousComorbidityHistory(); trackFieldInteraction('Previous Comorbidity History')"
       (keydown.enter)="getPreviousComorbidityHistory()"
       (keydown.space)="getPreviousComorbidityHistory()"
     >
@@ -53,7 +53,7 @@
                   $event.value,
                   i,
                   comorbidityConcurrentConditions
-                )
+                ); trackFieldInteraction('Comorbid Conditions')
               "
               required="{{ ComorbidStatus }}"
             >
@@ -86,6 +86,7 @@
               allowText="alphaspace"
               name="otherComorbidCondition"
               formControlName="otherComorbidCondition"
+              (focus)="trackFieldInteraction('Other Comorbid Condition')"
             />
           </mat-form-field>
         </div>
@@ -103,6 +104,7 @@
               allowText="number"
               name="timePeriodAgo"
               formControlName="timePeriodAgo"
+              (focus)="trackFieldInteraction('Comorbidity Duration')"
               (change)="validateDuration(comorbidityConcurrentConditions)"
             />
           </mat-form-field>
@@ -118,6 +120,7 @@
               name="timePeriodUnit"
               formControlName="timePeriodUnit"
               (change)="validateDuration(comorbidityConcurrentConditions)"
+              (selectionChange)="trackFieldInteraction('Comorbidity Duration Unit')"
             >
               <mat-option value="Days">Day(s)</mat-option>
               <mat-option value="Weeks">Week(s)</mat-option>
@@ -138,6 +141,7 @@
             class="checkbox"
             checked="checked"
             formControlName="isForHistory"
+            (change)="trackFieldInteraction('Inactive for Future Visits')"
           >
             {{ currentLanguageSet?.inactiveForFutureVisits }}
           </mat-checkbox>
@@ -150,10 +154,11 @@
             class="mat-add-btn"
             [disabled]="checkValidity(comorbidityConcurrentConditions)"
             id="addComorbidityConcurrentConditions"
-            (click)="addComorbidityConcurrentConditions()"
+            (click)="addComorbidityConcurrentConditions(); trackFieldInteraction('Add Comorbidity')"
           >
             {{ currentLanguageSet?.common?.add }}
           </button>
+
           <button
             mat-mini-fab
             color="warn"
@@ -170,7 +175,7 @@
               removeComorbidityConcurrentConditions(
                 i,
                 comorbidityConcurrentConditions
-              )
+              ); trackFieldInteraction('Remove Comorbidity')
             "
           >
             {{ currentLanguageSet?.common?.remove }}
diff --git a/src/app/app-modules/nurse-doctor/history/general-opd-history/comorbidity-concurrent-conditions/comorbidity-concurrent-conditions.component.ts b/src/app/app-modules/nurse-doctor/history/general-opd-history/comorbidity-concurrent-conditions/comorbidity-concurrent-conditions.component.ts
index fd736436..d8f92aa7 100644
--- a/src/app/app-modules/nurse-doctor/history/general-opd-history/comorbidity-concurrent-conditions/comorbidity-concurrent-conditions.component.ts
+++ b/src/app/app-modules/nurse-doctor/history/general-opd-history/comorbidity-concurrent-conditions/comorbidity-concurrent-conditions.component.ts
@@ -47,6 +47,7 @@ import { HrpService } from '../../../shared/services/hrp.service';
 import { PreviousDetailsComponent } from 'src/app/app-modules/core/components/previous-details/previous-details.component';
 import { SetLanguageComponent } from 'src/app/app-modules/core/components/set-language.component';
 import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service';
+import { AmritTrackingService } from 'Common-UI/src/tracking';
 
 @Component({
   selector: 'app-general-comorbidity-concurrent-conditions',
@@ -85,6 +86,7 @@ export class ComorbidityConcurrentConditionsComponent
     public httpServiceService: HttpServiceService,
     private masterdataService: MasterdataService,
     readonly sessionstorage: SessionStorageService,
+    private trackingService: AmritTrackingService,
   ) {
     this.nurseService.listen().subscribe((m: any) => {
       console.log(m);
@@ -562,4 +564,8 @@ export class ComorbidityConcurrentConditionsComponent
     // } else {
     // }
   }
+
+  trackFieldInteraction(fieldName: string) {
+    this.trackingService.trackFieldInteraction(fieldName, 'Comorbidity');
+  }
 }
diff --git a/src/app/app-modules/nurse-doctor/history/general-opd-history/family-history/family-history.component.html b/src/app/app-modules/nurse-doctor/history/general-opd-history/family-history/family-history.component.html
index 706f3ddb..48fbf74a 100644
--- a/src/app/app-modules/nurse-doctor/history/general-opd-history/family-history/family-history.component.html
+++ b/src/app/app-modules/nurse-doctor/history/general-opd-history/family-history/family-history.component.html
@@ -6,7 +6,7 @@
       id="previousANCFamilyHistory"
       color="primary"
       matTooltip="{{ currentLanguageSet?.DurationData?.previousDetails }}"
-      (click)="getPreviousFamilyHistory()"
+      (click)="getPreviousFamilyHistory(); trackFieldInteraction('Previous Family History')"
       (keydown.enter)="getPreviousFamilyHistory()"
       (keydown.space)="getPreviousFamilyHistory()"
     >
@@ -40,7 +40,7 @@
               name="diseaseType"
               formControlName="diseaseType"
               (selectionChange)="
-                filterFamilyDiseaseList($event.value, i, familyDisease)
+                filterFamilyDiseaseList($event.value, i, familyDisease); trackFieldInteraction('Family Disease Type')
               "
             >
               <mat-option
@@ -69,6 +69,7 @@
               allowText="alphaspace"
               name="otherDiseaseType"
               formControlName="otherDiseaseType"
+              (focus)="trackFieldInteraction('Other Family Disease Type')"
             />
           </mat-form-field>
         </div>
@@ -101,6 +102,8 @@
               multiple
               name="familyMembers"
               formControlName="familyMembers"
+              (selectionChange)="trackFieldInteraction('Family Member')"
+              
             >
               <mat-option
                 *ngFor="let member of familyMemeberMasterData"
@@ -120,7 +123,7 @@
             *ngIf="isLast"
             [disabled]="checkValidity(familyDisease)"
             id="addFamilyDisease"
-            (click)="addFamilyDisease()"
+            (click)="addFamilyDisease(); trackFieldInteraction('Add Family History')"
           >
             {{ currentLanguageSet?.common?.add }}
           </button>
@@ -134,7 +137,7 @@
               i !== 0 ||
               (i === 0 && (familyDisease.touched || familyDisease.dirty))
             "
-            (click)="removeFamilyDisease(i, familyDisease)"
+            (click)="removeFamilyDisease(i, familyDisease); trackFieldInteraction('Remove Family History')"
           >
             {{ currentLanguageSet?.common?.remove }}
           </button>
@@ -179,6 +182,7 @@
             maxlength="50"
             name="geneticDisorder"
             formControlName="geneticDisorder"
+            (selectionChange)="trackFieldInteraction('Genetic Disorder Type')"
           />
         </mat-form-field>
       </div>
diff --git a/src/app/app-modules/nurse-doctor/history/general-opd-history/family-history/family-history.component.ts b/src/app/app-modules/nurse-doctor/history/general-opd-history/family-history/family-history.component.ts
index ed8d835b..e1a629c6 100644
--- a/src/app/app-modules/nurse-doctor/history/general-opd-history/family-history/family-history.component.ts
+++ b/src/app/app-modules/nurse-doctor/history/general-opd-history/family-history/family-history.component.ts
@@ -39,6 +39,7 @@ import { HttpServiceService } from 'src/app/app-modules/core/services/http-servi
 import { PreviousDetailsComponent } from 'src/app/app-modules/core/components/previous-details/previous-details.component';
 import { SetLanguageComponent } from 'src/app/app-modules/core/components/set-language.component';
 import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service';
+import { AmritTrackingService } from 'Common-UI/src/tracking';
 
 @Component({
   selector: 'app-general-family-history',
@@ -75,6 +76,7 @@ export class FamilyHistoryComponent implements OnInit, DoCheck, OnDestroy {
     public httpServiceService: HttpServiceService,
     private masterdataService: MasterdataService,
     readonly sessionstorage: SessionStorageService,
+    private trackingService: AmritTrackingService,
   ) {}
 
   ngOnInit() {
@@ -412,4 +414,8 @@ export class FamilyHistoryComponent implements OnInit, DoCheck, OnDestroy {
     getLanguageJson.setLanguage();
     this.currentLanguageSet = getLanguageJson.currentLanguageObject;
   }
+
+  trackFieldInteraction(fieldName: string) {
+    this.trackingService.trackFieldInteraction(fieldName, 'Family History');
+  }
 }
diff --git a/src/app/app-modules/nurse-doctor/history/general-opd-history/medication-history/medication-history.component.html b/src/app/app-modules/nurse-doctor/history/general-opd-history/medication-history/medication-history.component.html
index 0620c808..0a73940d 100644
--- a/src/app/app-modules/nurse-doctor/history/general-opd-history/medication-history/medication-history.component.html
+++ b/src/app/app-modules/nurse-doctor/history/general-opd-history/medication-history/medication-history.component.html
@@ -6,7 +6,7 @@
       id="previousANCMedicationHistory"
       color="primary"
       matTooltip="{{ currentLanguageSet?.DurationData?.previousDetails }}"
-      (click)="getPreviousMedicationHistory()"
+      (click)="getPreviousMedicationHistory(); trackFieldInteraction('Previous Medication History')"
       (keydown.enter)="getPreviousMedicationHistory()"
       (keydown.space)="getPreviousMedicationHistory()"
     >
@@ -44,6 +44,7 @@
               maxlength="50"
               formControlName="currentMedication"
               (input)="enableDuration(medicationHistory)"
+              (focus)="trackFieldInteraction('Current Medication')"
               name="currentMedication"
             />
           </mat-form-field>
@@ -63,6 +64,7 @@
               formControlName="timePeriodAgo"
               name="timePeriodAgo"
               (change)="validateDuration(medicationHistory)"
+              (focus)="trackFieldInteraction('Medication Duration')"
             />
           </mat-form-field>
         </div>
@@ -76,7 +78,7 @@
               class="select-full-width"
               formControlName="timePeriodUnit"
               name="timePeriodAgoUnit"
-              (selectionChange)="validateDuration(medicationHistory)"
+              (selectionChange)="validateDuration(medicationHistory); trackFieldInteraction('Medication Duration Unit')"
             >
               <mat-option value="Days">Day(s)</mat-option>
               <mat-option value="Weeks">Week(s)</mat-option>
@@ -93,10 +95,11 @@
             class="mat-add-btn"
             *ngIf="isLast"
             [disabled]="checkValidity(medicationHistory)"
-            (click)="addMedicationHistory()"
+            (click)="addMedicationHistory(); trackFieldInteraction('Add Medication')"
           >
             {{ currentLanguageSet?.common?.add }}
           </button>
+
           <button
             mat-mini-fab
             color="warn"
@@ -107,7 +110,7 @@
               (i === 0 &&
                 (medicationHistory.touched || medicationHistory.dirty))
             "
-            (click)="removeMedicationHistory(i, medicationHistory)"
+            (click)="removeMedicationHistory(i, medicationHistory); trackFieldInteraction('Remove Medication')"
           >
             {{ currentLanguageSet?.common?.remove }}
           </button>
diff --git a/src/app/app-modules/nurse-doctor/history/general-opd-history/medication-history/medication-history.component.ts b/src/app/app-modules/nurse-doctor/history/general-opd-history/medication-history/medication-history.component.ts
index 073722f1..7e423f85 100644
--- a/src/app/app-modules/nurse-doctor/history/general-opd-history/medication-history/medication-history.component.ts
+++ b/src/app/app-modules/nurse-doctor/history/general-opd-history/medication-history/medication-history.component.ts
@@ -46,6 +46,7 @@ import { HttpServiceService } from 'src/app/app-modules/core/services/http-servi
 import { PreviousDetailsComponent } from 'src/app/app-modules/core/components/previous-details/previous-details.component';
 import { SetLanguageComponent } from 'src/app/app-modules/core/components/set-language.component';
 import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service';
+import { AmritTrackingService } from 'Common-UI/src/tracking';
 
 @Component({
   selector: 'app-general-medication-history',
@@ -75,6 +76,7 @@ export class MedicationHistoryComponent implements OnInit, DoCheck, OnDestroy {
     public httpServiceService: HttpServiceService,
     private beneficiaryDetailsService: BeneficiaryDetailsService,
     readonly sessionstorage: SessionStorageService,
+    private trackingService: AmritTrackingService,
   ) {}
 
   ngOnInit() {
@@ -329,4 +331,8 @@ export class MedicationHistoryComponent implements OnInit, DoCheck, OnDestroy {
       medicationHistory?.get('timePeriodUnit')?.reset();
     }
   }
+
+  trackFieldInteraction(fieldName: string) {
+    this.trackingService.trackFieldInteraction(fieldName, 'Medication History');
+  }
 }
diff --git a/src/app/app-modules/nurse-doctor/history/general-opd-history/menstrual-history/menstrual-history.component.html b/src/app/app-modules/nurse-doctor/history/general-opd-history/menstrual-history/menstrual-history.component.html
index 06c0658b..7040bc01 100644
--- a/src/app/app-modules/nurse-doctor/history/general-opd-history/menstrual-history/menstrual-history.component.html
+++ b/src/app/app-modules/nurse-doctor/history/general-opd-history/menstrual-history/menstrual-history.component.html
@@ -4,7 +4,7 @@
   id="previousANCMenstrualHistory"
   color="primary"
   matTooltip="{{ currentLanguageSet?.DurationData?.previousDetails }}"
-  (click)="getPreviousMenstrualHistory()"
+  (click)="getPreviousMenstrualHistory(); trackFieldInteraction('Previous Menstrual History')"
   (keydown.enter)="getPreviousMenstrualHistory()"
   (keydown.space)="getPreviousMenstrualHistory()"
 >
@@ -27,7 +27,7 @@
         class="select-full-width"
         name="menstrualCycleStatus"
         formControlName="menstrualCycleStatus"
-        (selectionChange)="checkMenstrualCycleStatus()"
+        (selectionChange)="checkMenstrualCycleStatus(); trackFieldInteraction('Menstrual Cycle Status')"
       >
         <mat-option
           *ngFor="let status of masterData?.menstrualCycleStatus"
@@ -45,7 +45,11 @@
           ?.regularityofMenstrualCycles
       }}</label>
       <div class="clearfix"></div>
-      <mat-radio-group name="regularity" formControlName="regularity">
+      <mat-radio-group
+        name="regularity"
+        formControlName="regularity"
+        (change)="trackFieldInteraction('Menstrual Regularity')"
+      >
         <mat-radio-button color="primary" value="Regular">{{
           currentLanguageSet?.common?.regular
         }}</mat-radio-button>
@@ -65,6 +69,7 @@
           class="select-full-width"
           name="cycleLength"
           formControlName="cycleLength"
+          (selectionChange)="trackFieldInteraction('Menstrual Cycle Length')"
         >
           <mat-option
             *ngFor="let cycleLength of masterData?.menstrualCycleLengths"
@@ -85,6 +90,7 @@
           class="select-full-width"
           name="bloodFlowDuration"
           formControlName="bloodFlowDuration"
+          (selectionChange)="trackFieldInteraction('Menstrual Flow Duration')"
         >
           <mat-option
             *ngFor="
@@ -115,7 +121,7 @@
           class="select-full-width"
           name="problemName"
           formControlName="menstrualProblemList"
-          (selectionChange)="resetOtherMenstrualProblems()"
+          (selectionChange)="resetOtherMenstrualProblems(); trackFieldInteraction('Menstrual Problems')"
         >
           <mat-option
             [disabled]="
@@ -149,10 +155,12 @@
         [min]="minimumLMPDate"
         [max]="today"
         [matDatepicker]="lmpPicker"
+        (focus)="trackFieldInteraction('Last Menstrual Period Date')"
       />
       <mat-datepicker-toggle
         matSuffix
         [for]="lmpPicker"
+        (click)="trackFieldInteraction('LMP Date Picker')"
       ></mat-datepicker-toggle>
       <mat-datepicker #lmpPicker></mat-datepicker>
     </mat-form-field>
diff --git a/src/app/app-modules/nurse-doctor/history/general-opd-history/menstrual-history/menstrual-history.component.ts b/src/app/app-modules/nurse-doctor/history/general-opd-history/menstrual-history/menstrual-history.component.ts
index 0f1fe5a4..0dea3dfb 100644
--- a/src/app/app-modules/nurse-doctor/history/general-opd-history/menstrual-history/menstrual-history.component.ts
+++ b/src/app/app-modules/nurse-doctor/history/general-opd-history/menstrual-history/menstrual-history.component.ts
@@ -41,6 +41,7 @@ import {
   MAT_MOMENT_DATE_ADAPTER_OPTIONS,
 } from '@angular/material-moment-adapter';
 import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service';
+import { AmritTrackingService } from 'Common-UI/src/tracking';
 
 @Component({
   selector: 'app-general-menstrual-history',
@@ -97,6 +98,7 @@ export class MenstrualHistoryComponent implements OnInit, DoCheck, OnDestroy {
     private confirmationService: ConfirmationService,
     private masterdataService: MasterdataService,
     readonly sessionstorage: SessionStorageService,
+    private trackingService: AmritTrackingService,
   ) {}
 
   ngOnInit() {
@@ -316,4 +318,8 @@ export class MenstrualHistoryComponent implements OnInit, DoCheck, OnDestroy {
 
     this.disableNoneMenstrualProblem = flag;
   }
+
+  trackFieldInteraction(fieldName: string) {
+    this.trackingService.trackFieldInteraction(fieldName, 'Menstrual History');
+  }
 }
diff --git a/src/app/app-modules/nurse-doctor/history/general-opd-history/past-history/past-history.component.html b/src/app/app-modules/nurse-doctor/history/general-opd-history/past-history/past-history.component.html
index 9e8a04c2..2bbbb449 100644
--- a/src/app/app-modules/nurse-doctor/history/general-opd-history/past-history/past-history.component.html
+++ b/src/app/app-modules/nurse-doctor/history/general-opd-history/past-history/past-history.component.html
@@ -48,7 +48,7 @@ <h4>
                 name="pastAcuteIllness"
                 formControlName="illnessType"
                 (selectionChange)="
-                  filterPastIllnessType($event.value, i, pastIllness)
+                  filterPastIllnessType($event.value, i, pastIllness); trackFieldInteraction('Past Illness')
                 "
               >
                 <mat-option
@@ -78,6 +78,7 @@ <h4>
                 allowText="alphaspace"
                 name="otherIllnessType"
                 formControlName="otherIllnessType"
+                (focus)="trackFieldInteraction('Other Past Illness')"
                 (blur)="otherIlnessForHrp()"
               />
             </mat-form-field>
@@ -97,6 +98,7 @@ <h4>
                 name="timePeriodAgo"
                 formControlName="timePeriodAgo"
                 (change)="validateDuration(pastIllness)"
+                (focus)="trackFieldInteraction('Illness Duration')"
               />
             </mat-form-field>
           </div>
@@ -109,7 +111,7 @@ <h4>
               <mat-select
                 name="timePeriodUnit"
                 formControlName="timePeriodUnit"
-                (selectionChange)="validateDuration(pastIllness)"
+                (selectionChange)="validateDuration(pastIllness); trackFieldInteraction('Illness Time Period')"
               >
                 <mat-option value="Days">Day(s)</mat-option>
                 <mat-option value="Weeks">Week(s)</mat-option>
@@ -181,7 +183,7 @@ <h4 style="margin-top: 10px">
               formControlName="surgeryType"
               name="surgeryType"
               (selectionChange)="
-                filterPastSurgeryType($event.value, i, pastSurgery)
+                filterPastSurgeryType($event.value, i, pastSurgery); trackFieldInteraction('Past Surgery Type')
               "
             >
               <mat-option
@@ -210,6 +212,7 @@ <h4 style="margin-top: 10px">
               allowText="alphaspace"
               name="otherSurgeryType"
               formControlName="otherSurgeryType"
+              (focus)="trackFieldInteraction('Other Past Surgery')"
             />
           </mat-form-field>
         </div>
@@ -228,6 +231,7 @@ <h4 style="margin-top: 10px">
               name="timePeriodAgo"
               formControlName="timePeriodAgo"
               (change)="validateDuration(pastSurgery)"
+              (focus)="trackFieldInteraction('Surgery Duration')"
             />
           </mat-form-field>
         </div>
@@ -241,6 +245,7 @@ <h4 style="margin-top: 10px">
               formControlName="timePeriodUnit"
               name="timePeriodUnit"
               (change)="validateDuration(pastSurgery)"
+              (selectionChange)="trackFieldInteraction('Surgery Time Period')"
             >
               <mat-option value="Days">Day(s)</mat-option>
               <mat-option value="Weeks">Week(s)</mat-option>
diff --git a/src/app/app-modules/nurse-doctor/history/general-opd-history/past-history/past-history.component.ts b/src/app/app-modules/nurse-doctor/history/general-opd-history/past-history/past-history.component.ts
index 7125b3db..b9271b8b 100644
--- a/src/app/app-modules/nurse-doctor/history/general-opd-history/past-history/past-history.component.ts
+++ b/src/app/app-modules/nurse-doctor/history/general-opd-history/past-history/past-history.component.ts
@@ -48,6 +48,7 @@ import { HrpService } from '../../../shared/services/hrp.service';
 import { SetLanguageComponent } from 'src/app/app-modules/core/components/set-language.component';
 import { PreviousDetailsComponent } from 'src/app/app-modules/core/components/previous-details/previous-details.component';
 import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service';
+import { AmritTrackingService } from 'Common-UI/src/tracking';
 
 @Component({
   selector: 'app-general-past-history',
@@ -91,6 +92,7 @@ export class PastHistoryComponent
     private masterdataService: MasterdataService,
     private hrpService: HrpService,
     readonly sessionstorage: SessionStorageService,
+    private trackingService: AmritTrackingService,
   ) {}
 
   ngOnInit() {
@@ -754,4 +756,8 @@ export class PastHistoryComponent
     getLanguageJson.setLanguage();
     this.currentLanguageSet = getLanguageJson.currentLanguageObject;
   }
+
+  trackFieldInteraction(fieldName: string) {
+    this.trackingService.trackFieldInteraction(fieldName, 'Past History');
+  }
 }
diff --git a/src/app/app-modules/nurse-doctor/history/general-opd-history/past-obsteric-history/past-obsteric-history.component.html b/src/app/app-modules/nurse-doctor/history/general-opd-history/past-obsteric-history/past-obsteric-history.component.html
index fb6136c7..bcdfa834 100644
--- a/src/app/app-modules/nurse-doctor/history/general-opd-history/past-obsteric-history/past-obsteric-history.component.html
+++ b/src/app/app-modules/nurse-doctor/history/general-opd-history/past-obsteric-history/past-obsteric-history.component.html
@@ -4,7 +4,7 @@
   id="previousANCPastObstetricHistory"
   color="primary"
   matTooltip="{{ currentLanguageSet?.DurationData?.previousDetails }}"
-  (click)="getPreviousObstetricHistory()"
+  (click)="getPreviousObstetricHistory(); trackFieldInteraction('Previous Past Obstetric History')"
   (keydown.enter)="getPreviousObstetricHistory()"
   (keydown.space)="getPreviousObstetricHistory()"
 >
@@ -33,6 +33,7 @@
         [readonly]="visitCategory === 'ANC' ? true : false"
         formControlName="totalNoOfPreg"
         (blur)="checkTotalPregnancy(totalNoOfPreg)"
+        (focus)="trackFieldInteraction('Total Number of Pregnancies')"
       />
     </mat-form-field>
   </div>
@@ -58,7 +59,7 @@
           formControlName="value"
           class="checkbox"
           color="primary"
-          (change)="togglePastObstericHistory($event, i + 1)"
+          (change)="togglePastObstericHistory($event, i + 1); trackFieldInteraction('Pregnancy Order ' + (i + 1))"
         >
           {{ i + 1 }}
         </mat-checkbox>
@@ -109,7 +110,7 @@
                       pastObstericHistory,
                       i,
                       true
-                    )
+                    ); trackFieldInteraction('Pregnancy Complications')
                   "
                   multiple
                 >
@@ -157,6 +158,7 @@
                   maxlength="50"
                   name="others"
                   formControlName="otherPregComplication"
+                  (focus)="trackFieldInteraction('Other Pregnancy Complication')"
                 />
               </mat-form-field>
             </div>
@@ -171,7 +173,7 @@
                   class="select-full-width"
                   name="outcomeOfPregnancy"
                   formControlName="pregOutcome"
-                  (selectionChange)="checkPregnancyOutcome(pastObstericHistory)"
+                  (selectionChange)="checkPregnancyOutcome(pastObstericHistory); trackFieldInteraction('Pregnancy Outcome')"
                 >
                   <mat-option
                     *ngFor="let outcome of masterData?.pregOutcomes"
@@ -203,6 +205,7 @@
                       pastObstericHistory.value.pregOutcome?.pregOutcome ===
                       'Abortion'
                     "
+                    (selectionChange)="trackFieldInteraction('Type of Abortion')"
                   >
                     <mat-option
                       *ngFor="let abortion of masterData?.typeOfAbortion"
@@ -235,6 +238,7 @@
                     class="select-full-width"
                     name="typeofFacility"
                     formControlName="typeofFacility"
+                    (selectionChange)="trackFieldInteraction('Type of Facility')"
                     [required]="
                       pastObstericHistory.value.pregOutcome?.pregOutcome ===
                         'Abortion' &&
@@ -264,6 +268,7 @@
                     name="durationOfType"
                     allowText="number"
                     formControlName="pregDuration"
+                    (focus)="trackFieldInteraction('Pregnancy Duration')"
                     [required]="
                       pastObstericHistory.value.pregOutcome?.pregOutcome ===
                       'Abortion'
@@ -282,7 +287,7 @@
                     name="complicationPostAbortion"
                     formControlName="postAbortionComplication"
                     (selectionChange)="
-                      resetPostComplicationType(pastObstericHistory, i)
+                      resetPostComplicationType(pastObstericHistory, i); trackFieldInteraction('Post Abortion Complication')
                     "
                     multiple
                     [required]="
@@ -329,7 +334,7 @@
                   class="select-full-width"
                   name="durationOfPregnancy"
                   formControlName="durationType"
-                  (selectionChange)="hrpPastObstetricDetails(true)"
+                  (selectionChange)="hrpPastObstetricDetails(true); trackFieldInteraction('Duration of Pregnancy')"
                 >
                   <mat-option
                     *ngFor="let duration of masterData?.pregDuration"
@@ -358,7 +363,7 @@
                     name="placeOfDelivery"
                     formControlName="deliveryPlace"
                     (selectionChange)="
-                      resetOtherDeliveryPlace(pastObstericHistory)
+                      resetOtherDeliveryPlace(pastObstericHistory); trackFieldInteraction('Place of Delivery')
                     "
                   >
                     <mat-option
@@ -391,6 +396,7 @@
                     allowText="alphaspace"
                     name="otherPlaceOfDelivery"
                     formControlName="otherDeliveryPlace"
+                    (focus)="trackFieldInteraction('Other Place of Delivery')"
                   />
                 </mat-form-field>
               </div>
@@ -413,7 +419,7 @@
                   name="typeOfDelivery"
                   formControlName="deliveryType"
                   [disabled]="!pastObstericHistory.value.deliveryPlace"
-                  (selectionChange)="hrpPastObstetricDetails(true)"
+                  (selectionChange)="hrpPastObstetricDetails(true); trackFieldInteraction('Type of Delivery')"
                 >
                   <ng-container *ngFor="let type of selectDeliveryTypes">
                     <mat-option [value]="type">
@@ -445,7 +451,7 @@
                         pastObstericHistory,
                         i,
                         true
-                      )
+                      ); trackFieldInteraction('Delivery Complications')
                     "
                     multiple
                   >
@@ -496,6 +502,7 @@
                     allowText="alphaspace"
                     name="othersDeliveryComplication"
                     formControlName="otherDeliveryComplication"
+                    (focus)="trackFieldInteraction('Other Delivery Complication')"
                   />
                 </mat-form-field>
               </div>
@@ -512,7 +519,7 @@
                   name="postpartumComplication"
                   formControlName="postpartumComplicationList"
                   (selectionChange)="
-                    resetOtherPostpartumComplicationType(pastObstericHistory, i)
+                    resetOtherPostpartumComplicationType(pastObstericHistory, i); trackFieldInteraction('Postpartum Complications')
                   "
                   multiple
                 >
@@ -563,6 +570,7 @@
                   allowText="alphaspace"
                   name="otherPostpartumComplication"
                   formControlName="otherPostpartumCompType"
+                  (focus)="trackFieldInteraction('Other Postpartum Complication')"
                 />
               </mat-form-field>
             </div>
@@ -584,7 +592,7 @@
                   name="newBornComplications"
                   formControlName="newBornComplication"
                   (selectionChange)="
-                    resetOtherNewBornComplications(pastObstericHistory)
+                    resetOtherNewBornComplications(pastObstericHistory); trackFieldInteraction('Newborn Complications')
                   "
                 >
                   <mat-option
@@ -619,6 +627,7 @@
                   allowText="alphaspace"
                   name="otherNewBornComplication"
                   formControlName="otherNewBornComplication"
+                  (focus)="trackFieldInteraction('Other Newborn Complication')"
                 />
               </mat-form-field>
             </div>
@@ -644,6 +653,7 @@
                   name="congenitalAnomalies"
                   formControlName="congenitalAnomalies"
                   (change)="setCongenitalAnomalies()"
+                  (focus)="trackFieldInteraction('Congenital Anomalies')"
                 />
               </mat-form-field>
             </div>
diff --git a/src/app/app-modules/nurse-doctor/history/general-opd-history/past-obsteric-history/past-obsteric-history.component.ts b/src/app/app-modules/nurse-doctor/history/general-opd-history/past-obsteric-history/past-obsteric-history.component.ts
index cb53b015..478ea142 100644
--- a/src/app/app-modules/nurse-doctor/history/general-opd-history/past-obsteric-history/past-obsteric-history.component.ts
+++ b/src/app/app-modules/nurse-doctor/history/general-opd-history/past-obsteric-history/past-obsteric-history.component.ts
@@ -48,6 +48,7 @@ import { HttpServiceService } from 'src/app/app-modules/core/services/http-servi
 import { PreviousDetailsComponent } from 'src/app/app-modules/core/components/previous-details/previous-details.component';
 import { SetLanguageComponent } from 'src/app/app-modules/core/components/set-language.component';
 import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service';
+import { AmritTrackingService } from 'Common-UI/src/tracking';
 
 @Component({
   selector: 'app-general-past-obsteric-history',
@@ -86,6 +87,7 @@ export class PastObstericHistoryComponent
     private masterdataService: MasterdataService,
     private beneficiaryDetailsService: BeneficiaryDetailsService,
     readonly sessionstorage: SessionStorageService,
+    private trackingService: AmritTrackingService,
   ) {
     this.formUtility = new GeneralUtils(this.fb, this.sessionstorage);
   }
@@ -817,4 +819,11 @@ export class PastObstericHistoryComponent
     getLanguageJson.setLanguage();
     this.currentLanguageSet = getLanguageJson.currentLanguageObject;
   }
+
+  trackFieldInteraction(fieldName: string) {
+    this.trackingService.trackFieldInteraction(
+      fieldName,
+      'Past Obstetric History',
+    );
+  }
 }
diff --git a/src/app/app-modules/nurse-doctor/history/general-opd-history/personal-history/personal-history.component.html b/src/app/app-modules/nurse-doctor/history/general-opd-history/personal-history/personal-history.component.html
index 6ccd323d..97e61e1b 100644
--- a/src/app/app-modules/nurse-doctor/history/general-opd-history/personal-history/personal-history.component.html
+++ b/src/app/app-modules/nurse-doctor/history/general-opd-history/personal-history/personal-history.component.html
@@ -7,7 +7,7 @@
         id="previousTobaccoHistory"
         color="primary"
         matTooltip="{{ currentLanguageSet?.DurationData?.previousDetails }}"
-        (click)="getPreviousTobaccoHistory()"
+        (click)="getPreviousTobaccoHistory(); trackFieldInteraction('Previous Tobacco History')"
         (keydown.enter)="getPreviousTobaccoHistory()"
         (keydown.space)="getPreviousTobaccoHistory()"
       >
@@ -26,7 +26,7 @@
         id="previousAlcoholHistory"
         color="primary"
         matTooltip="{{ currentLanguageSet?.DurationData?.previousDetails }}"
-        (click)="getPreviousAlcoholHistory()"
+        (click)="getPreviousAlcoholHistory(); trackFieldInteraction('Previous Alcohol History')"
         (keydown.enter)="getPreviousAlcoholHistory()"
         (keydown.space)="getPreviousAlcoholHistory()"
       >
@@ -45,7 +45,7 @@
         id="previousAllergyHistory"
         color="primary"
         matTooltip="{{ currentLanguageSet?.DurationData?.previousDetails }}"
-        (click)="getPreviousAllergyHistory()"
+        (click)="getPreviousAllergyHistory(); trackFieldInteraction('Previous Allergy History')"
         (keydown.enter)="getPreviousAllergyHistory()"
         (keydown.space)="getPreviousAllergyHistory()"
       >
@@ -66,7 +66,7 @@
           ?.personalHistoryANC_OPD_NCD_PNC?.dietaryType
       }}</label>
       <div class="clearfix"></div>
-      <mat-radio-group formControlName="dietaryType">
+      <mat-radio-group formControlName="dietaryType" (change)="trackFieldInteraction('Dietary Type')">
         <mat-radio-button color="primary" value="Vegetarian">{{
           currentLanguageSet?.historyData?.ancHistory
             ?.personalHistoryANC_OPD_NCD_PNC?.vegetarian
@@ -89,7 +89,7 @@
           ?.personalHistoryANC_OPD_NCD_PNC?.physicalActivityType
       }}</label>
       <div class="clearfix"></div>
-      <mat-radio-group formControlName="physicalActivityType">
+      <mat-radio-group formControlName="physicalActivityType" (change)="trackFieldInteraction('Physical Activity Type')">
         <mat-radio-button color="primary" value="Sedentary">{{
           currentLanguageSet?.historyData?.ancHistory
             ?.personalHistoryANC_OPD_NCD_PNC?.sedentary
@@ -110,7 +110,7 @@
           ?.personalHistoryANC_OPD_NCD_PNC?.riskySexualPracticesStatus
       }}</label>
       <div class="clearfix"></div>
-      <mat-radio-group formControlName="riskySexualPracticesStatus">
+      <mat-radio-group formControlName="riskySexualPracticesStatus" (change)="trackFieldInteraction('Risky Sexual Practices Status')">
         <mat-radio-button color="primary" value="true">
           {{ currentLanguageSet?.common?.yes }}
         </mat-radio-button>
@@ -133,7 +133,7 @@
         <mat-select
           class="select-full-width"
           formControlName="tobaccoUseStatus"
-          (selectionChange)="checkTobaccoStatus()"
+          (selectionChange)="checkTobaccoStatus(); trackFieldInteraction('Tobacco Use Status')"
         >
           <mat-option value="Yes">Yes</mat-option>
           <mat-option value="No">No</mat-option>
@@ -155,7 +155,7 @@
         <mat-select
           class="select-full-width"
           formControlName="alcoholIntakeStatus"
-          (selectionChange)="checkAlcoholStatus()"
+          (selectionChange)="checkAlcoholStatus(); trackFieldInteraction('Alcohol Use Status')"
         >
           <mat-option value="Yes">Yes</mat-option>
           <mat-option value="No">No</mat-option>
@@ -176,7 +176,7 @@
         <mat-select
           class="select-full-width"
           formControlName="allergyStatus"
-          (selectionChange)="checkAllergicStatus()"
+          (selectionChange)="checkAllergicStatus(); trackFieldInteraction('Allergic Status')"
         >
           <mat-option value="Yes">Yes</mat-option>
           <mat-option value="No">No</mat-option>
@@ -225,7 +225,7 @@ <h4>
               <mat-select
                 class="select-full-width"
                 formControlName="tobaccoUseType"
-                (selectionChange)="filterTobaccoList($event, i, tobacco)"
+                (selectionChange)="filterTobaccoList($event, i, tobacco); trackFieldInteraction('Tobacco Type')"
               >
                 <mat-option
                   *ngFor="let tobacco of tobaccoSelectList[i]"
@@ -253,6 +253,7 @@ <h4>
                 maxlength="50"
                 allowText="alphabet"
                 formControlName="otherTobaccoUseType"
+                (focus)="trackFieldInteraction('Other Tobacco Type')"
               />
             </mat-form-field>
           </div>
@@ -272,12 +273,13 @@ <h4>
                 formControlName="number"
                 (blur)="perDayChange()"
                 (input)="enableFields(tobacco)"
+                (focus)="trackFieldInteraction('Tobacco Number')"
               />
             </mat-form-field>
           </div>
 
           <div class="col-xs-8 col-sm-4 col-md-2 box">
-            <mat-radio-group formControlName="perDay" (change)="perDayChange()">
+            <mat-radio-group formControlName="perDay" (change)="perDayChange(); trackFieldInteraction('Tobacco Frequency')">
               <mat-radio-button
                 color="primary"
                 class="radio-button"
@@ -308,6 +310,7 @@ <h4>
                 allowText="number"
                 formControlName="duration"
                 (change)="validateDuration(tobacco)"
+                (focus)="trackFieldInteraction('Tobacco Duration')"
               />
             </mat-form-field>
           </div>
@@ -320,7 +323,7 @@ <h4>
               <mat-select
                 class="select-full-width lineheight"
                 formControlName="durationUnit"
-                (selectionChange)="validateDuration(tobacco)"
+                (selectionChange)="validateDuration(tobacco); trackFieldInteraction('Tobacco Duration Unit')"
               >
                 <mat-option value="Days">Day(s)</mat-option>
                 <mat-option value="Weeks">Week(s)</mat-option>
@@ -340,7 +343,7 @@ <h4>
               *ngIf="isLast"
               class="mat-add-btn"
               [disabled]="checkTobaccoValidity(tobacco)"
-              (click)="addTobacco()"
+              (click)="addTobacco(); trackFieldInteraction('Add Tobacco')"
             >
               {{ currentLanguageSet?.common?.add }}
             </button>
@@ -350,7 +353,7 @@ <h4>
               class="mat-remove-btn"
               style="margin-left: 3px"
               *ngIf="i !== 0 || (i === 0 && (tobacco.touched || tobacco.dirty))"
-              (click)="removeTobacco(i, tobacco)"
+              (click)="removeTobacco(i, tobacco); trackFieldInteraction('Remove Tobacco')"
             >
               {{ currentLanguageSet?.common?.remove }}
             </button>
@@ -395,7 +398,7 @@ <h4>
               <mat-select
                 class="select-full-width"
                 formControlName="typeOfAlcohol"
-                (selectionChange)="filterAlcoholList($event, i, alcohol)"
+                (selectionChange)="filterAlcoholList($event, i, alcohol); trackFieldInteraction('Alcohol Type')"
               >
                 <mat-option
                   *ngFor="let alcohol of alcoholSelectList[i]"
@@ -422,6 +425,7 @@ <h4>
                 maxlength="50"
                 allowText="alphabet"
                 formControlName="otherAlcoholType"
+                (focus)="trackFieldInteraction('Other Alcohol Type')"
               />
             </mat-form-field>
           </div>
@@ -436,7 +440,7 @@ <h4>
                 id="frequencyIntake"
                 class="select-full-width lineheight"
                 formControlName="alcoholIntakeFrequency"
-                (selectionChange)="onChangeAlcIntakFreq(alcohol)"
+                (selectionChange)="onChangeAlcIntakFreq(alcohol); trackFieldInteraction('Alcohol Frequency')"
               >
                 <mat-option
                   *ngFor="let frequency of masterData?.frequencyOfAlcoholIntake"
@@ -458,7 +462,7 @@ <h4>
               <mat-select
                 class="select-full-width lineheight"
                 formControlName="avgAlcoholConsumption"
-                (selectionChange)="onChangeAvgAlcoholConsumption(alcohol)"
+                (selectionChange)="onChangeAvgAlcoholConsumption(alcohol); trackFieldInteraction('Average Alcohol Consumption')"
               >
                 <mat-option
                   *ngFor="let quantity of masterData?.quantityOfAlcoholIntake"
@@ -483,6 +487,7 @@ <h4>
                 allowText="number"
                 formControlName="duration"
                 (change)="validateDuration(alcohol)"
+                (focus)="trackFieldInteraction('Alcohol Duration')"
               />
             </mat-form-field>
           </div>
@@ -495,7 +500,7 @@ <h4>
               <mat-select
                 class="select-full-width"
                 formControlName="durationUnit"
-                (selectionChange)="validateDuration(alcohol)"
+                (selectionChange)="validateDuration(alcohol); trackFieldInteraction('Alcohol Duration Unit')"
               >
                 <mat-option value="Days">Day(s)</mat-option>
                 <mat-option value="Weeks">Week(s)</mat-option>
@@ -515,7 +520,7 @@ <h4>
               class="mat-add-btn"
               *ngIf="isLast"
               [disabled]="checkAlcoholValidity(alcohol)"
-              (click)="addAlcohol()"
+              (click)="addAlcohol(); trackFieldInteraction('Add Alcohol')"
             >
               {{ currentLanguageSet?.common?.add }}
             </button>
@@ -525,7 +530,7 @@ <h4>
               class="mat-remove-btn"
               style="margin-left: 3px"
               *ngIf="i !== 0 || (i === 0 && (alcohol.touched || alcohol.dirty))"
-              (click)="removeAlcohol(i, alcohol)"
+              (click)="removeAlcohol(i, alcohol); trackFieldInteraction('Remove Alcohol')"
             >
               {{ currentLanguageSet?.common?.remove }}
             </button>
@@ -567,7 +572,7 @@ <h4>
               <mat-select
                 class="select-full-width"
                 formControlName="allergyType"
-                (selectionChange)="filterAlleryList($event, i, allergy)"
+                (selectionChange)="filterAlleryList($event, i, allergy); trackFieldInteraction('Allergy Type')"
               >
                 <mat-option
                   *ngFor="let allergy of allerySelectList[i]"
@@ -592,14 +597,13 @@ <h4>
                 maxlength="50"
                 formControlName="snomedTerm"
                 (change)="removeSnomedCode(allergy, i)"
-                (keyup.enter)="
-                  searchComponents(allergy.value.snomedTerm, i, allergy)
-                "
+                (keyup.enter)="searchComponents(allergy.value.snomedTerm, i, allergy)"
+                (focus)="trackFieldInteraction('Allergen Name')"
               />
               <mat-icon
                 class="search-btn cursorPointer"
                 matSuffix
-                (click)="searchComponents(allergy.value.snomedTerm, i, allergy)"
+                (click)="searchComponents(allergy.value.snomedTerm, i, allergy); trackFieldInteraction('Search Allergen')"
                 [class.toolbar-icon-disabled]="componentFlag"
                 >search</mat-icon
               >
@@ -632,7 +636,7 @@ <h4>
                 class="select-full-width lineheight"
                 multiple
                 formControlName="typeOfAllergicReactions"
-                (change)="canEnableOtherAllergy(allergy)"
+                (change)="canEnableOtherAllergy(allergy); trackFieldInteraction('Type of Allergic Reactions')"
               >
                 <mat-option
                   *ngFor="
@@ -659,6 +663,7 @@ <h4>
                 maxlength="50"
                 allowText="alphaspace"
                 formControlName="otherAllergicReaction"
+                (focus)="trackFieldInteraction('Other Allergic Reaction')"
               />
             </mat-form-field>
           </div>
@@ -677,7 +682,7 @@ <h4>
                   allergyMasterData.length
               "
               [disabled]="checkAllergyValidity(allergy)"
-              (click)="addAllergy()"
+              (click)="addAllergy(); trackFieldInteraction('Add Allergy')"
             >
               {{ currentLanguageSet?.common?.add }}
             </button>
@@ -687,7 +692,7 @@ <h4>
               class="mat-remove-btn"
               style="margin-left: 3px; margin-right: 3px"
               *ngIf="i !== 0 || (i === 0 && (allergy.touched || allergy.dirty))"
-              (click)="removeAllergy(i, allergy)"
+              (click)="removeAllergy(i, allergy); trackFieldInteraction('Remove Allergy')"
             >
               {{ currentLanguageSet?.common?.remove }}
             </button>
diff --git a/src/app/app-modules/nurse-doctor/history/general-opd-history/personal-history/personal-history.component.ts b/src/app/app-modules/nurse-doctor/history/general-opd-history/personal-history/personal-history.component.ts
index ebe9975b..0d425be9 100644
--- a/src/app/app-modules/nurse-doctor/history/general-opd-history/personal-history/personal-history.component.ts
+++ b/src/app/app-modules/nurse-doctor/history/general-opd-history/personal-history/personal-history.component.ts
@@ -51,6 +51,7 @@ import { PreviousDetailsComponent } from 'src/app/app-modules/core/components/pr
 import { AllergenSearchComponent } from 'src/app/app-modules/core/components/allergen-search/allergen-search.component';
 import { SetLanguageComponent } from 'src/app/app-modules/core/components/set-language.component';
 import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service';
+import { AmritTrackingService } from 'Common-UI/src/tracking';
 
 @Component({
   selector: 'app-general-personal-history',
@@ -115,6 +116,7 @@ export class GeneralPersonalHistoryComponent
     private masterdataService: MasterdataService,
     private ncdScreeningService: NcdScreeningService,
     readonly sessionstorage: SessionStorageService,
+    private trackingService: AmritTrackingService,
   ) {}
 
   ngOnInit() {
@@ -1201,4 +1203,7 @@ export class GeneralPersonalHistoryComponent
       alcoholForm?.get('durationUnit')?.reset();
     }
   }
+  trackFieldInteraction(fieldName: string) {
+    this.trackingService.trackFieldInteraction(fieldName, 'Personal History');
+  }
 }
diff --git a/src/app/app-modules/nurse-doctor/nurse-doctor.module.ts b/src/app/app-modules/nurse-doctor/nurse-doctor.module.ts
index d0a37617..fc9aafe1 100644
--- a/src/app/app-modules/nurse-doctor/nurse-doctor.module.ts
+++ b/src/app/app-modules/nurse-doctor/nurse-doctor.module.ts
@@ -173,6 +173,7 @@ import { Cdss104FormComponent } from './cdss/cdss-form-104/cdss-form.component';
 import { Referred104CdssDetailsComponent } from './cdss/referred-104-cdss-details/referred-104-cdss-details.component';
 import { Referred104DetailsPopupComponent } from './cdss/referred-104-details-popup/referred-104-details-popup.component';
 import { SharedModule } from '../core/components/shared/shared.module';
+import { AutocompleteScrollerDirective } from './shared/utility/autocomplete-scroller.directive';
 
 @NgModule({
   imports: [
@@ -322,6 +323,7 @@ import { SharedModule } from '../core/components/shared/shared.module';
     ViewDiseaseSummaryDetailsComponent,
     CdssFormResultPopupComponent,
     Referred104BeneficiaryDetailsComponent,
+    AutocompleteScrollerDirective,
   ],
 
   providers: [
diff --git a/src/app/app-modules/nurse-doctor/nurse-worklist-wrapper/nurse-worklist/nurse-worklist.component.css b/src/app/app-modules/nurse-doctor/nurse-worklist-wrapper/nurse-worklist/nurse-worklist.component.css
index 216cea83..601d6ac8 100644
--- a/src/app/app-modules/nurse-doctor/nurse-worklist-wrapper/nurse-worklist/nurse-worklist.component.css
+++ b/src/app/app-modules/nurse-doctor/nurse-worklist-wrapper/nurse-worklist/nurse-worklist.component.css
@@ -33,6 +33,16 @@ md-input-container {
   text-align: center;
 }
 
+.visitStatus.high-risk::before {
+  content: "";
+  position: absolute;
+  left: 0;
+  top: 0;
+  bottom: 1px;
+  width: 4px;
+  background: #FF0000 !important;
+}
+
 .visitStatus.first-visit::before {
   content: "";
   position: absolute;
@@ -84,6 +94,11 @@ ul li div {
 
 }
 
+.high-risk-marker {
+  background: #FF0000;
+  margin-right: 5px !important;
+}
+
 .totalCount,
 .description {
   padding-top: 15px;
diff --git a/src/app/app-modules/nurse-doctor/nurse-worklist-wrapper/nurse-worklist/nurse-worklist.component.html b/src/app/app-modules/nurse-doctor/nurse-worklist-wrapper/nurse-worklist/nurse-worklist.component.html
index 8ee6187b..c5ae47d5 100644
--- a/src/app/app-modules/nurse-doctor/nurse-worklist-wrapper/nurse-worklist/nurse-worklist.component.html
+++ b/src/app/app-modules/nurse-doctor/nurse-worklist-wrapper/nurse-worklist/nurse-worklist.component.html
@@ -62,9 +62,10 @@
                   mat-cell
                   *matCellDef="let element"
                   [ngClass]="{
-                    visitStatus: true,
-                    'first-visit': element?.benVisitNo === 1,
-                    revisit: element?.benVisitNo !== 1
+                    'visitStatus': true,
+                    'high-risk': element?.is_high_risk === true,
+                    'first-visit': !element?.is_high_risk && element?.benVisitNo === 1,
+                    'revisit': !element?.is_high_risk && element?.benVisitNo !== 1
                   }"
                 >
                   {{ element.sno }}
@@ -256,6 +257,10 @@
                   <div class="revisit-marker"></div>
                   <p>{{ currentLanguageSet?.common?.reVisit }}</p>
                 </li>
+                  <li>
+                  <div class="high-risk-marker"></div>
+                  <p>{{ currentLanguageSet?.highRiskPregnancy }}</p>
+                </li>
               </ul>
             </div>
             <div class="col-6">
diff --git a/src/app/app-modules/nurse-doctor/nurse-worklist-wrapper/nurse-worklist/nurse-worklist.component.ts b/src/app/app-modules/nurse-doctor/nurse-worklist-wrapper/nurse-worklist/nurse-worklist.component.ts
index 3db39f97..2c36c372 100644
--- a/src/app/app-modules/nurse-doctor/nurse-worklist-wrapper/nurse-worklist/nurse-worklist.component.ts
+++ b/src/app/app-modules/nurse-doctor/nurse-worklist-wrapper/nurse-worklist/nurse-worklist.component.ts
@@ -123,6 +123,9 @@ export class NurseWorklistComponent implements OnInit, DoCheck, OnDestroy {
         } else this.confirmationService.alert(res.errorMessage, 'error');
       },
       (err) => {
+        if (err?.handled) {
+          return;
+        }
         this.confirmationService.alert(err, 'error');
       },
     );
diff --git a/src/app/app-modules/nurse-doctor/quick-consult/quick-consult.component.html b/src/app/app-modules/nurse-doctor/quick-consult/quick-consult.component.html
index 19d59fd9..b85450f3 100644
--- a/src/app/app-modules/nurse-doctor/quick-consult/quick-consult.component.html
+++ b/src/app/app-modules/nurse-doctor/quick-consult/quick-consult.component.html
@@ -619,12 +619,31 @@ <h4>
                         #diagnosisInput [matAutocomplete]="autoDiagnosis"
                         (keyup)="onDiagnosisInputKeyup(diagnosisInput.value, i)" />
                     </mat-form-field>
-        
-                    <mat-autocomplete #autoDiagnosis="matAutocomplete" autoActiveFirstOption [displayWith]="displayDiagnosis"
-                      (optionSelected)="onDiagnosisSelected($event.option.value, i)">
-                      <mat-option *ngFor="let diag of suggestedDiagnosisList[i]" [value]="diag">
+
+                    <mat-autocomplete
+                      #autoDiagnosis="matAutocomplete"
+                      appAutocompleteScroller
+                      [threshold]="0.6"
+                      (nearEnd)="onAutoNearEnd(i)"
+                      (panelReady)="onPanelReady(i, $event)"
+                      autoActiveFirstOption
+                      [displayWith]="displayDiagnosis"
+                      (optionSelected)="
+                        onDiagnosisSelected($event.option.value, i)
+                      "
+                    >
+                      <mat-option
+                        *ngFor="let diag of suggestedDiagnosisList[i]"
+                        [value]="diag"
+                      >
                         {{ diag.term }}
                       </mat-option>
+                      <mat-option *ngIf="loadingMore[i]" disabled
+                        >Loading…</mat-option
+                      >
+                      <mat-option *ngIf="noMore[i]" disabled
+                        >End of results</mat-option
+                      >
                     </mat-autocomplete>
                   </div>
         
diff --git a/src/app/app-modules/nurse-doctor/quick-consult/quick-consult.component.ts b/src/app/app-modules/nurse-doctor/quick-consult/quick-consult.component.ts
index 79de333d..e798bc28 100644
--- a/src/app/app-modules/nurse-doctor/quick-consult/quick-consult.component.ts
+++ b/src/app/app-modules/nurse-doctor/quick-consult/quick-consult.component.ts
@@ -169,6 +169,15 @@ export class QuickConsultComponent
 
   dataSource = new MatTableDataSource<any>();
   suggestedDiagnosisList: any = [];
+  private readonly PAGE_BASE = 0;
+
+  private readonly BOOTSTRAP_MAX_PAGES = 3; // when first page can't scroll, prefill up to this many extra pages
+
+  loadingMore: boolean[] = [];
+  noMore: boolean[] = [];
+  wantMore: boolean[] = [];
+  pageByIndex: number[] = [];
+  lastQueryByIndex: string[] = [];
 
   constructor(
     private fb: FormBuilder,
@@ -1359,13 +1368,22 @@ export class QuickConsultComponent
   }
 
   onDiagnosisInputKeyup(value: string, index: number) {
-    if (value.length >= 3) {
-      this.masterdataService
-        .searchDiagnosisBasedOnPageNo(value, index)
-        .subscribe((results: any) => {
-          this.suggestedDiagnosisList[index] = results?.data?.sctMaster;
-        });
+    const term = (value || '').trim();
+
+    if (term.length >= 3) {
+      if (this.lastQueryByIndex[index] !== term) {
+        this.lastQueryByIndex[index] = term;
+        this.pageByIndex[index] = 0; // logical 0th page
+        this.noMore[index] = false;
+        this.wantMore[index] = false;
+        this.suggestedDiagnosisList[index] = [];
+      }
+      this.fetchPage(index, false);
     } else {
+      this.lastQueryByIndex[index] = '';
+      this.pageByIndex[index] = 0;
+      this.noMore[index] = false;
+      this.wantMore[index] = false;
       this.suggestedDiagnosisList[index] = [];
     }
   }
@@ -1387,4 +1405,100 @@ export class QuickConsultComponent
       term: selected?.term || null,
     });
   }
+
+  onPanelReady(index: number, panelEl: HTMLElement) {
+    if (panelEl.scrollHeight <= panelEl.clientHeight && !this.noMore[index]) {
+      this.bootstrapUntilScrollable(index, panelEl);
+    }
+  }
+
+  onAutoNearEnd(index: number) {
+    if (!this.loadingMore[index] && !this.noMore[index]) {
+      this.fetchPage(index, true);
+    } else if (this.loadingMore[index]) {
+      this.wantMore[index] = true;
+    }
+  }
+
+  private bootstrapUntilScrollable(rowIndex: number, panelEl: HTMLElement) {
+    let fetched = 0;
+
+    const tryFill = () => {
+      const scrollable = panelEl.scrollHeight > panelEl.clientHeight;
+      if (
+        scrollable ||
+        this.noMore[rowIndex] ||
+        fetched >= this.BOOTSTRAP_MAX_PAGES
+      )
+        return;
+
+      if (this.loadingMore[rowIndex]) {
+        requestAnimationFrame(tryFill);
+        return;
+      }
+
+      fetched++;
+      this.fetchPage(rowIndex, true);
+
+      requestAnimationFrame(tryFill);
+    };
+
+    if (this.lastQueryByIndex[rowIndex]?.length >= 3) {
+      tryFill();
+    }
+  }
+
+  private fetchPage(index: number, append = false) {
+    const term = this.lastQueryByIndex[index];
+    if (!term) return;
+
+    const nextLogical = (this.pageByIndex[index] ?? 0) + (append ? 1 : 0);
+    const pageAtReq = nextLogical + this.PAGE_BASE;
+
+    if (this.loadingMore[index]) return;
+    this.loadingMore[index] = true;
+
+    const termAtReq = term;
+
+    this.masterdataService
+      .searchDiagnosisBasedOnPageNo(termAtReq, pageAtReq)
+      .subscribe({
+        next: (results: any) => {
+          if (this.lastQueryByIndex[index] !== termAtReq) return;
+
+          const list = results?.data?.sctMaster ?? [];
+
+          if (append) {
+            const existing = new Set(
+              (this.suggestedDiagnosisList[index] ?? []).map(
+                (d: any) => d.id ?? d.code ?? d.term,
+              ),
+            );
+            this.suggestedDiagnosisList[index] = [
+              ...(this.suggestedDiagnosisList[index] ?? []),
+              ...list.filter(
+                (d: any) => !existing.has(d.id ?? d.code ?? d.term),
+              ),
+            ];
+          } else {
+            this.suggestedDiagnosisList[index] = list;
+          }
+
+          this.pageByIndex[index] = nextLogical;
+          if (!list.length) {
+            this.noMore[index] = true;
+          }
+        },
+        error: () => {
+          console.error('Error fetching diagnosis data');
+        },
+        complete: () => {
+          const wantChain = this.wantMore[index] && !this.noMore[index];
+          this.loadingMore[index] = false;
+          this.wantMore[index] = false;
+
+          if (wantChain) this.fetchPage(index, true);
+        },
+      });
+  }
 }
diff --git a/src/app/app-modules/nurse-doctor/refer/general-refer/general-refer.component.html b/src/app/app-modules/nurse-doctor/refer/general-refer/general-refer.component.html
index f3e1be28..df02bf70 100644
--- a/src/app/app-modules/nurse-doctor/refer/general-refer/general-refer.component.html
+++ b/src/app/app-modules/nurse-doctor/refer/general-refer/general-refer.component.html
@@ -30,7 +30,10 @@ <h5>{{ currentLanguageSet?.Referdetails?.revisitAndRefer }}</h5>
           mat-raised-button
           color="primary"
           class="pull-right"
-          (click)="loadMMUReferDeatils()"
+          (click)="
+            loadMMUReferDeatils();
+            trackFieldInteraction('Load MMU Referral Details')
+          "
         >
           {{ currentLanguageSet?.Referdetails?.mMUReferralDetails }}
         </button>
@@ -49,7 +52,10 @@ <h5>{{ currentLanguageSet?.Referdetails?.revisitAndRefer }}</h5>
           id="PreviousReferralHistory"
           class="mat_icon_blue"
           color="primary"
-          (click)="getPreviousReferralHistory()"
+          (click)="
+            getPreviousReferralHistory();
+            trackFieldInteraction('Previous Referral History')
+          "
         >
           <mat-icon class="md-18">history</mat-icon>
         </button>
@@ -69,10 +75,18 @@ <h5>{{ currentLanguageSet?.Referdetails?.revisitAndRefer }}</h5>
           }}</mat-label>
           <mat-select
             (ngModelChange)="higherhealthcarecenter($event)"
+            (selectionChange)="
+              trackFieldInteraction('Higher Healthcare Center Selection')
+            "
             name="referredToInstituteName"
             formControlName="referredToInstituteName"
           >
-            <mat-option (click)="setInstituteNameValue()" value="select none"
+            <mat-option
+              (click)="
+                setInstituteNameValue();
+                trackFieldInteraction('Select None Healthcare Center')
+              "
+              value="select none"
               >Select None</mat-option
             >
             <mat-option
@@ -102,6 +116,7 @@ <h5>{{ currentLanguageSet?.Referdetails?.revisitAndRefer }}</h5>
             allowText="alphaspace"
             formControlName="otherReferredToInstituteName"
             name="otherReferredToInstituteName"
+            (focus)="trackFieldInteraction('Other Healthcare Center Input')"
           />
         </mat-form-field>
       </div>
@@ -138,6 +153,7 @@ <h5>{{ currentLanguageSet?.Referdetails?.revisitAndRefer }}</h5>
             formControlName="referralReason"
             name="Remarks"
             maxLength="300"
+            (focus)="trackFieldInteraction('Referral Reason Text')"
           ></textarea>
         </mat-form-field>
       </div>
@@ -152,6 +168,7 @@ <h5>{{ currentLanguageSet?.Referdetails?.revisitAndRefer }}</h5>
               formControlName="referralReason"
               name="Remarks"
               maxLength="300"
+              (focus)="trackFieldInteraction('Referral Reason Text')"
             ></textarea>
           </mat-form-field>
         </div>
@@ -193,7 +210,8 @@ <h5>{{ currentLanguageSet?.Referdetails?.revisitAndRefer }}</h5>
             (selectionChange)="
               checkForOthersOption(
                 referForm.controls['referralReasonList'].value
-              )
+              );
+              trackFieldInteraction('Referral Reason Selection')
             "
             required
           >
@@ -216,7 +234,8 @@ <h5>{{ currentLanguageSet?.Referdetails?.revisitAndRefer }}</h5>
               (selectionChange)="
                 checkForOthersOption(
                   referForm.controls['referralReasonList'].value
-                )
+                );
+                trackFieldInteraction('Referral Reason Selection')
               "
             >
               <mat-option
@@ -245,12 +264,12 @@ <h5>{{ currentLanguageSet?.Referdetails?.revisitAndRefer }}</h5>
             allowText="alphaspace"
             formControlName="otherReferralReason"
             name="otherReferralReason"
+            (focus)="trackFieldInteraction('Other Referral Reason Input')"
           />
         </mat-form-field>
       </div>
     </div>
 
-
     <div
       class="col-xs-12 col-sm-12 col-md-12 col-lg-12"
       style="display: flex"
@@ -265,7 +284,10 @@ <h5>{{ currentLanguageSet?.Referdetails?.revisitAndRefer }}</h5>
             currentLanguageSet?.Referdetails?.additionalservices
           }}</mat-label>
           <mat-select
-            (selectionChange)="additionalservices($event.value)"
+            (selectionChange)="
+              additionalservices($event.value);
+              trackFieldInteraction('Additional Services Selection')
+            "
             multiple
             name="refrredToAdditionalServiceList"
             formControlName="refrredToAdditionalServiceList"
@@ -282,7 +304,6 @@ <h5>{{ currentLanguageSet?.Referdetails?.revisitAndRefer }}</h5>
       </div>
     </div>
 
-    
     <div
       class="col-xs-12 col-sm-12 col-md-12 col-lg-12 m-t-10"
       style="display: flex"
@@ -302,10 +323,12 @@ <h5>{{ currentLanguageSet?.Referdetails?.revisitAndRefer }}</h5>
             formControlName="revisitDate"
             [min]="tomorrow"
             (dateChange)="checkdate($event.value)"
+            (focus)="trackFieldInteraction('Revisit Date')"
           />
           <mat-datepicker-toggle
             matSuffix
             [for]="picker"
+            (click)="trackFieldInteraction('Revisit Date Picker')"
           ></mat-datepicker-toggle>
           <mat-datepicker #picker></mat-datepicker>
         </mat-form-field>
diff --git a/src/app/app-modules/nurse-doctor/refer/general-refer/general-refer.component.ts b/src/app/app-modules/nurse-doctor/refer/general-refer/general-refer.component.ts
index 6ed14fc5..faf0c3ba 100644
--- a/src/app/app-modules/nurse-doctor/refer/general-refer/general-refer.component.ts
+++ b/src/app/app-modules/nurse-doctor/refer/general-refer/general-refer.component.ts
@@ -45,6 +45,7 @@ import {
   MAT_MOMENT_DATE_ADAPTER_OPTIONS,
 } from '@angular/material-moment-adapter';
 import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service';
+import { AmritTrackingService } from 'Common-UI/src/tracking';
 
 @Component({
   selector: 'app-general-refer',
@@ -125,6 +126,7 @@ export class GeneralReferComponent implements OnInit, DoCheck, OnDestroy {
     private confirmationService: ConfirmationService,
     private ncdScreeningService: NcdScreeningService,
     readonly sessionstorage: SessionStorageService,
+    private trackingService: AmritTrackingService,
   ) {}
 
   ngOnInit() {
@@ -600,4 +602,8 @@ export class GeneralReferComponent implements OnInit, DoCheck, OnDestroy {
       this.referForm.controls['otherReferralReason'].setValue(null);
     }
   }
+
+  trackFieldInteraction(fieldName: string) {
+    this.trackingService.trackFieldInteraction(fieldName, 'Refer & Revisit');
+  }
 }
diff --git a/src/app/app-modules/nurse-doctor/shared/services/doctor.service.ts b/src/app/app-modules/nurse-doctor/shared/services/doctor.service.ts
index 9281c5db..c3064f79 100644
--- a/src/app/app-modules/nurse-doctor/shared/services/doctor.service.ts
+++ b/src/app/app-modules/nurse-doctor/shared/services/doctor.service.ts
@@ -3015,10 +3015,16 @@ export class DoctorService {
   }
   /* Doctor Signature download */
   downloadSign(userID: any) {
-    return this.http
-      .get(environment.downloadSignUrl + userID, { responseType: 'blob' })
-      .pipe(map((res: any) => <Blob>res.blob()));
+    return this.http.get(environment.downloadSignUrl + userID, {
+      responseType: 'blob' as 'json',
+    });
+  }
+
+  /* Get UserID using UserName */
+  getUserId(userName: any) {
+    return this.http.get(environment.getUserId + userName);
   }
+
   getIDRSDetails(beneficiaryID: string, visitID: string): Observable<any> {
     const visitCategory = this.sessionstorage.getItem('visitCategory');
     const otherDetails = Object.assign({
diff --git a/src/app/app-modules/nurse-doctor/shared/utility/autocomplete-scroller.directive.ts b/src/app/app-modules/nurse-doctor/shared/utility/autocomplete-scroller.directive.ts
new file mode 100644
index 00000000..629a9966
--- /dev/null
+++ b/src/app/app-modules/nurse-doctor/shared/utility/autocomplete-scroller.directive.ts
@@ -0,0 +1,119 @@
+/*
+ * AMRIT – Accessible Medical Records via Integrated Technology
+ * Integrated EHR (Electronic Health Records) Solution
+ *
+ * Copyright (C) "Piramal Swasthya Management and Research Institute"
+ *
+ * This file is part of AMRIT.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see https://www.gnu.org/licenses/.
+ */
+import {
+  Directive,
+  EventEmitter,
+  NgZone,
+  OnDestroy,
+  AfterViewInit,
+  Output,
+  Input,
+} from '@angular/core';
+import { MatAutocomplete } from '@angular/material/autocomplete';
+import { Subscription } from 'rxjs';
+
+@Directive({
+  selector: '[appAutocompleteScroller]',
+})
+export class AutocompleteScrollerDirective implements AfterViewInit, OnDestroy {
+  @Input() threshold = 0.6; // 60% down
+  @Output() nearEnd = new EventEmitter<void>();
+  @Output() panelReady = new EventEmitter<HTMLElement>(); // lets component bootstrap if no overflow
+
+  private subs: Subscription[] = [];
+  private scrollListener?: (e: Event) => void;
+
+  constructor(
+    private ac: MatAutocomplete,
+    private ngZone: NgZone,
+  ) {}
+
+  ngAfterViewInit(): void {
+    // Fired when the overlay panel opens
+    const openedSub = this.ac.opened.subscribe(() => {
+      this.waitForPanel((panelEl) => {
+        this.panelReady.emit(panelEl); // tell component the panel is live (for bootstrap)
+
+        // attach scroll listener
+        this.ngZone.runOutsideAngular(() => {
+          this.scrollListener = () => {
+            if (panelEl.scrollHeight <= panelEl.clientHeight) return; // no overflow yet
+            const ratio =
+              (panelEl.scrollTop + panelEl.clientHeight) / panelEl.scrollHeight;
+            if (ratio >= this.threshold) {
+              // hop back into Angular so change detection works
+              this.ngZone.run(() => this.nearEnd.emit());
+            }
+          };
+          panelEl.addEventListener('scroll', this.scrollListener!, {
+            passive: true,
+          });
+        });
+      });
+    });
+
+    // Fired when the panel closes
+    const closedSub = this.ac.closed.subscribe(() => {
+      const panelEl = this.getPanelEl();
+      if (panelEl && this.scrollListener) {
+        panelEl.removeEventListener('scroll', this.scrollListener);
+        this.scrollListener = undefined;
+      }
+    });
+
+    this.subs.push(openedSub, closedSub);
+  }
+
+  ngOnDestroy(): void {
+    this.subs.forEach((s) => s.unsubscribe());
+    const panelEl = this.getPanelEl();
+    if (panelEl && this.scrollListener) {
+      panelEl.removeEventListener('scroll', this.scrollListener);
+      this.scrollListener = undefined;
+    }
+  }
+
+  private getPanelEl(): HTMLElement | null {
+    // Newer Material exposes panel element
+    const anyAc = this.ac as any;
+    const el = anyAc?.panel?.nativeElement as HTMLElement | null | undefined;
+    if (el) return el;
+
+    // Fallback by id
+    const id = anyAc?.id as string | undefined;
+    return id ? (document.getElementById(id) as HTMLElement | null) : null;
+  }
+
+  private waitForPanel(cb: (panelEl: HTMLElement) => void) {
+    let tries = 0;
+    const maxTries = 10;
+    const tick = () => {
+      const el = this.getPanelEl();
+      if (el) {
+        cb(el);
+        return;
+      }
+      if (tries++ < maxTries) requestAnimationFrame(tick);
+    };
+    requestAnimationFrame(tick);
+  }
+}
diff --git a/src/app/app-modules/nurse-doctor/visit-details/chief-complaints/chief-complaints.component.html b/src/app/app-modules/nurse-doctor/visit-details/chief-complaints/chief-complaints.component.html
index 4bbe2e7f..4caabbdc 100644
--- a/src/app/app-modules/nurse-doctor/visit-details/chief-complaints/chief-complaints.component.html
+++ b/src/app/app-modules/nurse-doctor/visit-details/chief-complaints/chief-complaints.component.html
@@ -32,6 +32,7 @@
                 (keyup)="suggestChiefComplaintList(complaint, i)"
                 (blur)="reEnterChiefComplaint(complaint)"
                 [matAutocomplete]="auto"
+                (focus)="trackFieldInteraction('Chief Complaints')"
               />
             </mat-form-field>
 
@@ -81,6 +82,7 @@
                 formControlName="duration"
                 (input)="onInputDuration(complaint)"
                 (selectionChange)="validateDuration(complaint)"
+                (focus)="trackFieldInteraction('Duration')"
               />
             </mat-form-field>
           </div>
@@ -97,6 +99,7 @@
                 formControlName="unitOfDuration"
                 [disabled]="!complaint.value.duration"
                 (selectionChange)="validateDuration(complaint)"
+                (click)="trackFieldInteraction('Unit of Duration')"
               >
                 <mat-option value="Hours">Hour(s)</mat-option>
                 <mat-option value="Days">Day(s)</mat-option>
@@ -125,6 +128,7 @@
                 formControlName="description"
                 maxlength="300"
                 [disabled]="!complaint.value.chiefComplaint"
+                (focus)="trackFieldInteraction('Description')"
               ></textarea>
             </mat-form-field>
           </div>
diff --git a/src/app/app-modules/nurse-doctor/visit-details/chief-complaints/chief-complaints.component.ts b/src/app/app-modules/nurse-doctor/visit-details/chief-complaints/chief-complaints.component.ts
index 477707e6..89b9a443 100644
--- a/src/app/app-modules/nurse-doctor/visit-details/chief-complaints/chief-complaints.component.ts
+++ b/src/app/app-modules/nurse-doctor/visit-details/chief-complaints/chief-complaints.component.ts
@@ -47,6 +47,7 @@ import { HttpServiceService } from 'src/app/app-modules/core/services/http-servi
 import { SetLanguageComponent } from 'src/app/app-modules/core/components/set-language.component';
 import { MatTableDataSource } from '@angular/material/table';
 import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service';
+import { AmritTrackingService } from 'Common-UI/src/tracking';
 
 @Component({
   selector: 'app-patient-chief-complaints',
@@ -94,6 +95,7 @@ export class ChiefComplaintsComponent implements OnInit, DoCheck, OnDestroy {
     private nurseService: NurseService,
     private confirmationService: ConfirmationService,
     readonly sessionstorage: SessionStorageService,
+    private trackingService: AmritTrackingService,
   ) {
     this.formUtility = new VisitDetailUtils(this.fb, this.sessionstorage);
   }
@@ -565,4 +567,8 @@ export class ChiefComplaintsComponent implements OnInit, DoCheck, OnDestroy {
       return true;
     }
   }
+
+  trackFieldInteraction(fieldName: string) {
+    this.trackingService.trackFieldInteraction(fieldName, 'Chief Complaints');
+  }
 }
diff --git a/src/app/app-modules/nurse-doctor/visit-details/investigations/investigations.component.html b/src/app/app-modules/nurse-doctor/visit-details/investigations/investigations.component.html
index dcf8766b..ab6a5a3f 100644
--- a/src/app/app-modules/nurse-doctor/visit-details/investigations/investigations.component.html
+++ b/src/app/app-modules/nurse-doctor/visit-details/investigations/investigations.component.html
@@ -9,7 +9,7 @@
         multiple
         name="laboratoryList"
         formControlName="laboratoryList"
-        (selectionChange)="checkTestName($event)"
+        (selectionChange)="checkTestName($event); trackFieldInteraction('Laboratory Tests Selection')"
       >
         <mat-option
           *ngFor="let laboratary of selectLabTest"
diff --git a/src/app/app-modules/nurse-doctor/visit-details/investigations/investigations.component.ts b/src/app/app-modules/nurse-doctor/visit-details/investigations/investigations.component.ts
index 85e14cdb..a68ecbf9 100644
--- a/src/app/app-modules/nurse-doctor/visit-details/investigations/investigations.component.ts
+++ b/src/app/app-modules/nurse-doctor/visit-details/investigations/investigations.component.ts
@@ -40,6 +40,7 @@ import { HttpServiceService } from 'src/app/app-modules/core/services/http-servi
 import { SetLanguageComponent } from 'src/app/app-modules/core/components/set-language.component';
 import { environment } from 'src/environments/environment';
 import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service';
+import { AmritTrackingService } from 'Common-UI/src/tracking';
 
 @Component({
   selector: 'app-patient-investigations',
@@ -68,6 +69,7 @@ export class InvestigationsComponent implements OnInit, DoCheck, OnDestroy {
     private doctorService: DoctorService,
     private nurseService: NurseService,
     readonly sessionstorage: SessionStorageService,
+    private trackingService: AmritTrackingService,
   ) {}
 
   ngOnInit() {
@@ -223,4 +225,8 @@ export class InvestigationsComponent implements OnInit, DoCheck, OnDestroy {
     // Update form control value
     this.patientInvestigationsForm.controls['laboratoryList'].setValue(item);
   }
+
+  trackFieldInteraction(fieldName: string) {
+    this.trackingService.trackFieldInteraction(fieldName, 'Investigations');
+  }
 }
diff --git a/src/app/app-modules/nurse-doctor/visit-details/upload-files/upload-files.component.html b/src/app/app-modules/nurse-doctor/visit-details/upload-files/upload-files.component.html
index 8f24c414..de23ead2 100644
--- a/src/app/app-modules/nurse-doctor/visit-details/upload-files/upload-files.component.html
+++ b/src/app/app-modules/nurse-doctor/visit-details/upload-files/upload-files.component.html
@@ -12,7 +12,7 @@
         color="primary"
         class="mat_blue"
         [disabled]="disableFileSelection"
-        (click)="triggerLog($event)"
+        (click)="triggerLog($event); trackFieldInteraction('Select Files')"
       >
         {{ currentLanguageSet?.nurseData?.visitDetailsForm?.selectFile }}
       </button>
@@ -30,7 +30,8 @@
         mat-raised-button
         color="primary"
         class="mat_blue pull-right"
-        (click)="checkForDuplicateUpload()"
+        [disabled]="!fileObj || fileObj.length === 0"
+        (click)="checkForDuplicateUpload(); trackFieldInteraction('Upload Files')"
         *ngIf="!disableFileSelection"
       >
         {{ currentLanguageSet?.nurseData?.visitDetailsForm?.uploadFiles }}
diff --git a/src/app/app-modules/nurse-doctor/visit-details/upload-files/upload-files.component.ts b/src/app/app-modules/nurse-doctor/visit-details/upload-files/upload-files.component.ts
index 6cca31f7..9111944d 100644
--- a/src/app/app-modules/nurse-doctor/visit-details/upload-files/upload-files.component.ts
+++ b/src/app/app-modules/nurse-doctor/visit-details/upload-files/upload-files.component.ts
@@ -39,6 +39,7 @@ import { SetLanguageComponent } from 'src/app/app-modules/core/components/set-la
 import { LabService } from 'src/app/app-modules/lab/shared/services';
 import { ViewRadiologyUploadedFilesComponent } from 'src/app/app-modules/lab/view-radiology-uploaded-files/view-radiology-uploaded-files.component';
 import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service';
+import { AmritTrackingService } from 'Common-UI/src/tracking';
 
 @Component({
   selector: 'app-patient-upload-files',
@@ -87,6 +88,7 @@ export class UploadFilesComponent implements OnChanges, OnInit, DoCheck {
     public httpServiceService: HttpServiceService,
     private doctorService: DoctorService,
     readonly sessionstorage: SessionStorageService,
+    private trackingService: AmritTrackingService,
   ) {}
 
   ngOnInit() {
@@ -363,4 +365,7 @@ export class UploadFilesComponent implements OnChanges, OnInit, DoCheck {
       x.click();
     }
   }
+  trackFieldInteraction(fieldName: string) {
+    this.trackingService.trackFieldInteraction(fieldName, 'Upload Files');
+  }
 }
diff --git a/src/app/app-modules/nurse-doctor/visit-details/visit-details/visit-details.component.html b/src/app/app-modules/nurse-doctor/visit-details/visit-details/visit-details.component.html
index 88cfabc2..21141495 100644
--- a/src/app/app-modules/nurse-doctor/visit-details/visit-details/visit-details.component.html
+++ b/src/app/app-modules/nurse-doctor/visit-details/visit-details/visit-details.component.html
@@ -36,8 +36,11 @@
         name="visitReason"
         formControlName="visitReason"
         (selectionChange)="
-          reasonSelected(patientVisitDetailsForm.controls['visitReason'].value)
+    
+      reasonSelected(patientVisitDetailsForm.controls['visitReason'].
+value)
         "
+        (click)="trackFieldInteraction('Reason for Visit')"
         required
       >
         <mat-option
@@ -68,6 +71,7 @@
             patientVisitDetailsForm.controls['visitCategory'].value
           )
         "
+        (click)="trackFieldInteraction('Visit Category')"
         required
       >
         <mat-option
@@ -94,6 +98,7 @@
         [style.width]="'100%'"
         name="subVisitCategory"
         formControlName="subVisitCategory"
+        (click)="trackFieldInteraction('Sub Visit Category')"
       >
         <mat-option
           class="dropdownValueSubVisitCategory"
@@ -127,6 +132,7 @@
         name="pregnancyStatus"
         formControlName="pregnancyStatus"
         [attr.readonly]="visitCategory === 'ANC'"
+        (click)="trackFieldInteraction('Pregnancy Status')"
       >
         <mat-option
           *ngFor="let pregnancyStatus of templatePregnancyStatus"
@@ -161,6 +167,7 @@
         maxlength="12"
         name="rCHID"
         formControlName="rCHID"
+        (focus)="trackFieldInteraction('MCTS/RCH ID')"
         class="text-field-disabled"
       />
     </mat-form-field>
@@ -188,6 +195,7 @@
             patientVisitDetailsForm.controls['followUpForFpMethod'].value
           )
         "
+        (click)="trackFieldInteraction('Follow Up FP Method')"
         multiple
         required
       >
@@ -224,6 +232,7 @@
         allowText="alphaspace"
         name="otherFollowUpForFpMethod"
         formControlName="otherFollowUpForFpMethod"
+        (focus)="trackFieldInteraction('Other Follow Up FP Method')"
       />
     </mat-form-field>
   </div>
@@ -251,6 +260,7 @@
             patientVisitDetailsForm.controls['sideEffects'].value
           )
         "
+        (click)="trackFieldInteraction('Side Effects')"
       >
         <ng-container *ngFor="let effects of sideEffectsList">
           <mat-option class="dropdownHeight" [value]="effects.name">
@@ -277,6 +287,7 @@
         allowText="alphaspace"
         name="otherSideEffects"
         formControlName="otherSideEffects"
+        (focus)="trackFieldInteraction('Other Side Effects')"
       />
     </mat-form-field>
   </div>
@@ -292,7 +303,7 @@
     <mat-radio-group
       *ngIf="isRadioGroupVisible"
       formControlName="IdrsOrCbac"
-      (selectionChange)="enableHistoryScreenOnIdrs(IdrsOrCbac)"
+      (selectionChange)="enableHistoryScreenOnIdrs(IdrsOrCbac); trackFieldInteraction('IDRS/CBAC Selection')"
       [(ngModel)]="keyType"
     >
       <mat-radio-button color="primary" class="radio-button" value="IDRS">{{
diff --git a/src/app/app-modules/nurse-doctor/visit-details/visit-details/visit-details.component.ts b/src/app/app-modules/nurse-doctor/visit-details/visit-details/visit-details.component.ts
index ff735ab7..e8cbcca6 100644
--- a/src/app/app-modules/nurse-doctor/visit-details/visit-details/visit-details.component.ts
+++ b/src/app/app-modules/nurse-doctor/visit-details/visit-details/visit-details.component.ts
@@ -40,6 +40,7 @@ import { HttpServiceService } from 'src/app/app-modules/core/services/http-servi
 import { environment } from 'src/environments/environment';
 import { SetLanguageComponent } from 'src/app/app-modules/core/components/set-language.component';
 import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service';
+import { AmritTrackingService } from 'Common-UI/src/tracking';
 
 @Component({
   selector: 'app-patient-visit-details',
@@ -94,6 +95,7 @@ export class PatientVisitDetailsComponent
     private nurseService: NurseService,
     private route: ActivatedRoute,
     readonly sessionstorage: SessionStorageService,
+    private trackingService: AmritTrackingService,
   ) {}
 
   ngOnInit() {
@@ -843,4 +845,8 @@ export class PatientVisitDetailsComponent
     this.disableAllFpOptions = false;
     this.enableOtherSideEffectTextField = false;
   }
+
+  trackFieldInteraction(fieldName: string) {
+    this.trackingService.trackFieldInteraction(fieldName, 'visit-details');
+  }
 }
diff --git a/src/app/app-modules/nurse-doctor/vitals/general-patient-vitals/general-patient-vitals.component.html b/src/app/app-modules/nurse-doctor/vitals/general-patient-vitals/general-patient-vitals.component.html
index ef5e0019..5b9f2e23 100644
--- a/src/app/app-modules/nurse-doctor/vitals/general-patient-vitals/general-patient-vitals.component.html
+++ b/src/app/app-modules/nurse-doctor/vitals/general-patient-vitals/general-patient-vitals.component.html
@@ -25,6 +25,7 @@ <h5>
               name="height_cm"
               formControlName="height_cm"
               (change)="checkHeight(height_cm)"
+              (focus)="trackFieldInteraction('Height')"
               defaultNull
               maxlength="6"
               allowMax="350"
@@ -48,6 +49,7 @@ <h5>
               defaultNull
               (change)="checkWeight(weight_Kg)"
               (blur)="calculateBMI()"
+              (focus)="trackFieldInteraction('Weight')"
               allowText="decimal"
               name="weight_Kg"
               id="weight_Kg"
@@ -65,7 +67,9 @@ <h5>
               viewBox="0 0 512 512"
               matTooltip="{{ currentLanguageSet?.common?.startTest }}"
               matSuffix
-              (click)="openIOTWeightModel()"
+              (click)="
+                openIOTWeightModel(); trackFieldInteraction('IoT Weight Test')
+              "
               onkeydown="openIOTWeightModel()"
               tabindex="{0}"
             >
@@ -341,6 +345,7 @@ <h5>
                 }"
                 (change)="checkIDRSForWaist(waistCircumference_cm)"
                 (blur)="hipWaistRatio()"
+                (focus)="trackFieldInteraction('Waist Circumference')"
                 id="waistCircumference_cm"
                 name="waistCircumference_cm"
                 formControlName="waistCircumference_cm"
@@ -372,6 +377,7 @@ <h5>
                 allowText="decimal"
                 (change)="checkHip(hipCircumference_cm)"
                 (blur)="hipWaistRatio()"
+                (focus)="trackFieldInteraction('Hip Circumference')"
                 name="hipCircumference_cm"
                 id="hipCircumference_cm"
                 formControlName="hipCircumference_cm"
@@ -512,6 +518,7 @@ <h5>
               defaultNull
               allowText="decimal"
               (change)="checkHeadCircumference(headCircumference_cm)"
+              (focus)="trackFieldInteraction('Head Circumference')"
               [ngClass]="{
                 abnormal: headCircumference_cm < 25 || headCircumference_cm > 75
               }"
@@ -546,6 +553,7 @@ <h5>
               (change)="
                 checkMidUpperArmCircumference(midUpperArmCircumference_MUAC_cm)
               "
+              (focus)="trackFieldInteraction('Mid Upper Arm Circumference')"
               [ngClass]="{
                 abnormal:
                   midUpperArmCircumference_MUAC_cm < 5 ||
@@ -628,6 +636,7 @@ <h5>
               id="temperature"
               formControlName="temperature"
               (change)="checkTemperature(temperature)"
+              (focus)="trackFieldInteraction('Temperature')"
               maxlength="5"
               allowMax="150"
               [required]="
@@ -642,7 +651,10 @@ <h5>
               viewBox="0 0 512 512"
               matTooltip="{{ currentLanguageSet?.common?.startTest }}"
               matSuffix
-              (click)="openIOTTempModel()"
+              (click)="
+                openIOTTempModel();
+                trackFieldInteraction('IoT Temperature Test')
+              "
               onkeydown="openIOTTempModel()"
               tabindex="{0}"
             >
@@ -671,6 +683,7 @@ <h5>
               id="pulseRate"
               formControlName="pulseRate"
               (change)="checkPulseRate(pulseRate)"
+              (focus)="trackFieldInteraction('Pulse Rate')"
               [required]="
                 (visitCategory !== 'NCD screening' &&
                   visitCategory !== 'ANC' &&
@@ -687,7 +700,10 @@ <h5>
               viewBox="0 0 512 512"
               matTooltip="{{ currentLanguageSet?.common?.startTest }}"
               matSuffix
-              (click)="openIOTPulseRateModel()"
+              (click)="
+                openIOTPulseRateModel();
+                trackFieldInteraction('IoT Pulse Rate Test')
+              "
               onkeydown="openIOTPulseRateModel()"
               tabindex="{0}"
             >
@@ -711,6 +727,7 @@ <h5>
               formControlName="sPO2"
               [ngClass]="{ abnormal: sPO2 < 1 || sPO2 > 100 }"
               (change)="checkSpo2()"
+              (focus)="trackFieldInteraction('SpO2')"
             />
             <svg
               class="fontawesomesvg"
@@ -718,7 +735,9 @@ <h5>
               viewBox="0 0 512 512"
               matTooltip="{{ currentLanguageSet?.common?.startTest }}"
               matSuffix
-              (click)="openIOTSPO2Model()"
+              (click)="
+                openIOTSPO2Model(); trackFieldInteraction('IoT SpO2 Test')
+              "
               onkeydown="openIOTSPO2Model()"
               tabindex="{0}"
             >
@@ -743,6 +762,7 @@ <h5>
                   systolicBP_1stReading < 110 || systolicBP_1stReading > 140
               }"
               (change)="checkSystolic(systolicBP_1stReading)"
+              (focus)="trackFieldInteraction('Systolic Blood Pressure')"
               allowText="number"
               id="systolicBP_1stReading"
               name="systolicBP_1stReading"
@@ -768,7 +788,10 @@ <h5>
               viewBox="0 0 512 512"
               matTooltip="{{ currentLanguageSet?.common?.startTest }}"
               matSuffix
-              (click)="openIOTBPModel()"
+              (click)="
+                openIOTBPModel();
+                trackFieldInteraction('IoT Blood Pressure Test')
+              "
               onkeydown="openIOTBPModel()"
               tabindex="{0}"
             >
@@ -794,6 +817,7 @@ <h5>
                   diastolicBP_1stReading < 60 || diastolicBP_1stReading > 90
               }"
               (change)="checkDiastolic(diastolicBP_1stReading)"
+              (focus)="trackFieldInteraction('Diastolic Blood Pressure')"
               allowText="number"
               id="diastolicBP_1stReading"
               name="diastolicBP_1stReading"
@@ -819,7 +843,10 @@ <h5>
               viewBox="0 0 512 512"
               matTooltip="{{ currentLanguageSet?.common?.startTest }}"
               matSuffix
-              (click)="openIOTBPModel()"
+              (click)="
+                openIOTBPModel();
+                trackFieldInteraction('IoT Blood Pressure Test')
+              "
               onkeydown="openIOTBPModel()"
               tabindex="{0}"
             >
@@ -851,6 +878,7 @@ <h5>
               id="respiratoryRate"
               formControlName="respiratoryRate"
               (change)="checkRespiratoryRate(respiratoryRate)"
+              (focus)="trackFieldInteraction('Respiratory Rate')"
               allowMax="150"
               maxlength="3"
             />
@@ -887,6 +915,7 @@ <h5>
                       bloodGlucose_Fasting < 50 || bloodGlucose_Fasting > 700
                   }"
                   (change)="checkBloodSugarFasting(bloodGlucose_Fasting)"
+                  (focus)="trackFieldInteraction('Fasting Blood Glucose')"
                 />
                 <svg
                   class="fontawesomesvg"
@@ -894,7 +923,10 @@ <h5>
                   viewBox="0 0 512 512"
                   matTooltip="{{ currentLanguageSet?.common?.startTest }}"
                   matSuffix
-                  (click)="openIOTBGFastingModel()"
+                  (click)="
+                    openIOTBGFastingModel();
+                    trackFieldInteraction('IoT Fasting Blood Glucose Test')
+                  "
                   onkeydown="openIOTBGFastingModel()"
                   tabindex="{0}"
                 >
@@ -923,6 +955,7 @@ <h5>
                   formControlName="bloodGlucose_Random"
                   [ngClass]="{ abnormal: bloodGlucose_Random < 140 }"
                   (change)="checkBloodSugarRandom(bloodGlucose_Random)"
+                  (focus)="trackFieldInteraction('Random Blood Glucose')"
                 />
                 <svg
                   class="fontawesomesvg"
@@ -930,7 +963,10 @@ <h5>
                   viewBox="0 0 512 512"
                   matTooltip="{{ currentLanguageSet?.common?.startTest }}"
                   matSuffix
-                  (click)="openIOTBGRandomModel()"
+                  (click)="
+                    openIOTBGRandomModel();
+                    trackFieldInteraction('IoT Random Blood Glucose Test')
+                  "
                   onkeydown="openIOTBGRandomModel()"
                   tabindex="{0}"
                 >
@@ -959,6 +995,9 @@ <h5>
                   maxlength="3"
                   [ngClass]="{ abnormal: bloodGlucose_2hr_PP < 140 }"
                   (change)="checkBloodSugar2HrPostPrandial(bloodGlucose_2hr_PP)"
+                  (focus)="
+                    trackFieldInteraction('2hr Post Prandial Blood Glucose')
+                  "
                 />
                 <svg
                   class="fontawesomesvg"
@@ -966,7 +1005,12 @@ <h5>
                   viewBox="0 0 512 512"
                   matTooltip="{{ currentLanguageSet?.common?.startTest }}"
                   matSuffix
-                  (click)="openIOTBGPostPrandialModel()"
+                  (click)="
+                    openIOTBGPostPrandialModel();
+                    trackFieldInteraction(
+                      'IoT Post Prandial Blood Glucose Test'
+                    )
+                  "
                   onkeydown="openIOTBGPostPrandialModel()"
                   tabindex="{0}"
                 >
@@ -992,6 +1036,7 @@ <h5>
               allowText="tempDecimal"
               [ngClass]="{ abnormal: hemoglobin < 11 || hemoglobin > 15.1 }"
               (change)="checkHemoglobin()"
+              (focus)="trackFieldInteraction('Hemoglobin')"
               name="hemoglobin"
               id="hemoglobin"
               formControlName="hemoglobin"
@@ -1023,7 +1068,9 @@ <h5>
             id="PreviousRbsHistory"
             class="pull-right"
             color="primary"
-            (click)="loadMMURBS()"
+            (click)="
+              loadMMURBS(); trackFieldInteraction('Load Previous RBS History')
+            "
           >
             <mat-icon class="md-18">history</mat-icon>
           </button>
@@ -1033,7 +1080,9 @@ <h5>
             <mat-checkbox
               color="accent"
               formControlName="rbsCheckBox"
-              (change)="onRbsCheckBox($event)"
+              (change)="
+                onRbsCheckBox($event); trackFieldInteraction('RBS Checkbox')
+              "
             >
             </mat-checkbox>
           </div>
@@ -1053,6 +1102,7 @@ <h5>
                 maxlength="4"
                 (blur)="checkForRange()"
                 (change)="rbsResultChange()"
+                (focus)="trackFieldInteraction('RBS Test Result')"
                 [ngClass]="{
                   abnormal: rbsTestResult < 0 || rbsTestResult > 1000
                 }"
@@ -1063,7 +1113,9 @@ <h5>
                 viewBox="0 0 512 512"
                 matTooltip="{{ currentLanguageSet?.common?.startTest }}"
                 matSuffix
-                (click)="openIOTRBSModel()"
+                (click)="
+                  openIOTRBSModel(); trackFieldInteraction('IoT RBS Test')
+                "
                 onkeydown="openIOTRBSModel()"
                 tabindex="{0}"
               >
@@ -1087,6 +1139,7 @@ <h5>
               formControlName="rbsTestRemarks"
               maxlength="300"
               [disabled]="rbsResultChange()"
+              (focus)="trackFieldInteraction('RBS Test Remarks')"
             />
           </mat-form-field>
         </div>
diff --git a/src/app/app-modules/nurse-doctor/vitals/general-patient-vitals/general-patient-vitals.component.ts b/src/app/app-modules/nurse-doctor/vitals/general-patient-vitals/general-patient-vitals.component.ts
index 4c467583..5c8b2310 100644
--- a/src/app/app-modules/nurse-doctor/vitals/general-patient-vitals/general-patient-vitals.component.ts
+++ b/src/app/app-modules/nurse-doctor/vitals/general-patient-vitals/general-patient-vitals.component.ts
@@ -36,6 +36,7 @@ import { HttpServiceService } from 'src/app/app-modules/core/services/http-servi
 import { MmuRbsDetailsComponent } from 'src/app/app-modules/core/components/mmu-rbs-details/mmu-rbs-details.component';
 import { IotcomponentComponent } from 'src/app/app-modules/core/components/iotcomponent/iotcomponent.component';
 import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service';
+import { AmritTrackingService } from 'Common-UI/src/tracking';
 
 @Component({
   selector: 'app-nurse-general-patient-vitals',
@@ -101,6 +102,7 @@ export class GeneralPatientVitalsComponent
     private route: ActivatedRoute,
     private ncdScreeningService: NcdScreeningService,
     readonly sessionstorage: SessionStorageService,
+    private trackingService: AmritTrackingService,
   ) {}
 
   ngOnInit() {
@@ -1183,4 +1185,8 @@ export class GeneralPatientVitalsComponent
   onCheckboxChange(symptomName: any, event: any) {
     symptomName = event.checked ? 1 : 0;
   }
+
+  trackFieldInteraction(fieldName: string) {
+    this.trackingService.trackFieldInteraction(fieldName, 'Vitals');
+  }
 }
diff --git a/src/app/app-modules/pharmacist/worklist/worklist.component.ts b/src/app/app-modules/pharmacist/worklist/worklist.component.ts
index 0246664c..0ebcb579 100644
--- a/src/app/app-modules/pharmacist/worklist/worklist.component.ts
+++ b/src/app/app-modules/pharmacist/worklist/worklist.component.ts
@@ -148,6 +148,9 @@ export class WorklistComponent implements OnInit, OnDestroy, DoCheck {
         }
       },
       (err) => {
+        if (err?.handled) {
+          return;
+        }
         this.confirmationService.alert(err, 'error');
       },
     );
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 9bc5555c..06d5041b 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -109,6 +109,13 @@ const routes: Routes = [
         (module) => module.DataSYNCModule,
       ),
   },
+  {
+    path: 'feedback',
+    loadChildren: () =>
+      import('Common-UI/src/feedback/feedback.module').then(
+        (m) => m.FeedbackModule,
+      ),
+  },
 ];
 
 @NgModule({
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index fb0915e5..5be6bce8 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -1,6 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
 import { SpinnerService } from './app-modules/core/services/spinner.service';
+import { AmritTrackingService } from 'Common-UI/src/tracking';
 
 @Component({
   selector: 'app-root',
@@ -13,6 +14,7 @@ export class AppComponent implements OnInit {
   constructor(
     private router: Router,
     private spinnerService: SpinnerService,
+    private trackingService: AmritTrackingService,
   ) {}
 
   ngOnInit() {
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index c2ec38d7..c6cd6c8e 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -56,6 +56,7 @@ import { RegistrationModule } from 'Common-UI/src/registrar/registration.module'
 import { SharedModule } from './app-modules/core/components/shared/shared.module';
 import { RegistrarModule } from './app-modules/registrar/registrar.module';
 import { CaptchaComponent } from './user-login/captcha/captcha.component';
+import { TrackingModule } from 'Common-UI/src/tracking';
 
 @NgModule({
   declarations: [
@@ -85,6 +86,7 @@ import { CaptchaComponent } from './user-login/captcha/captcha.component';
     CoreModule.forRoot(),
     SharedModule,
     RegistrationModule,
+    TrackingModule.forRoot(),
   ],
   schemas: [CUSTOM_ELEMENTS_SCHEMA],
   providers: [
diff --git a/src/app/user-login/login/login.component.ts b/src/app/user-login/login/login.component.ts
index 65536d54..ac026ed0 100644
--- a/src/app/user-login/login/login.component.ts
+++ b/src/app/user-login/login/login.component.ts
@@ -34,6 +34,7 @@ import { MasterDownloadComponent } from 'src/app/app-modules/data-sync/master-do
 import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service';
 import { CaptchaComponent } from '../captcha/captcha.component';
 import { environment } from 'src/environments/environment';
+import { AmritTrackingService } from 'Common-UI/src/tracking';
 
 @Component({
   selector: 'app-login-cmp',
@@ -66,6 +67,7 @@ export class LoginComponent implements OnInit {
     private confirmationService: ConfirmationService,
     private fb: FormBuilder,
     readonly sessionstorage: SessionStorageService,
+    private trackingService: AmritTrackingService,
   ) {
     this._keySize = 256;
     this._ivSize = 128;
@@ -219,6 +221,13 @@ export class LoginComponent implements OnInit {
                               .subscribe((userLoggedIn: any) => {
                                 if (userLoggedIn.statusCode === 200) {
                                   if (userLoggedIn?.data?.previlegeObj[0]) {
+                                    this.sessionstorage.setItem(
+                                      'loginDataResponse',
+                                      JSON.stringify(userLoggedIn.data),
+                                    );
+                                    this.trackingService.setUserId(
+                                      userLoggedIn.data.userID,
+                                    );
                                     this.authService.sessionExpiredHandled =
                                       false;
                                     this.sessionstorage.setItem(
@@ -280,6 +289,7 @@ export class LoginComponent implements OnInit {
       loginDataResponse.isAuthenticated,
     );
     this.sessionstorage.setItem('userID', loginDataResponse.userID);
+    this.trackingService.setUserId(loginDataResponse.userID);
     this.sessionstorage.setItem('userName', loginDataResponse.userName);
     this.sessionstorage.setItem('username', userName);
     this.sessionstorage.setItem('fullName', loginDataResponse.fullName);
diff --git a/src/assets/Assamese.json b/src/assets/Assamese.json
index d0c18e13..cf0f1c1e 100644
--- a/src/assets/Assamese.json
+++ b/src/assets/Assamese.json
@@ -4,6 +4,18 @@
       "spoke": "কেন্দ্ৰ",
       "continue": "অব্যাহত ৰখা"
     },
+    "platform_feedback": {
+      "feedback": "প্ৰতিক্ৰিয়া",
+      "weValueYourFeedback": "আপোনাৰ প্ৰতিক্ৰিয়া আমাক মূল্যবান",
+      "youHaveLoggedOut": "আপুনি সেশনৰ পৰা লগ আউট কৰিছে",
+      "subtitle": "আমাক আপোনাৰ অভিজ্ঞতা জনাওক (ঐচ্ছিক)",
+      "category": "শ্ৰেণী",
+      "selectCategory": "শ্ৰেণী নিৰ্বাচন কৰক",
+      "loggedInConsent": "গোপনীয়ভাৱে জমা দিয়ক (যদি আনচেক থাকে, তেন্তে ফ'ল'আপৰ বাবে আমি আপোনাৰ ইউজাৰ আইডি সংৰক্ষণ কৰিম)",
+      "anonymousInfo": "আপুনি লগ ইন কৰা নাই, এই প্ৰতিক্ৰিয়া গোপনীয়ভাৱে জমা হ'ব।",
+      "okay": "ঠিক আছে",
+      "thankYou": "ধন্যবাদ, আপোনাৰ প্ৰতিক্ৰিয়া আমাৰ বাবে মূল্যবান!"
+    },
     "role_selection": {
       "Registrar": "পঞ্জীয়ক",
       "Nurse": "নার্চ",
@@ -85,6 +97,7 @@
       "editLocation": "অৱস্থান সম্পাদনা কৰক",
       "beneficiaryID": "হিতাধিকাৰী আইডি",
       "beneficiaryName": "হিতাধিকাৰীৰ নাম",
+      "lastName": "উপাধী (চাৰন্যেম)",
       "gender": "লিঙ্গ",
       "age": "বয়স",
       "fatherName": "পিতৃৰ নাম",
@@ -1177,10 +1190,12 @@
       "labreport": "পৰীক্ষাগাৰৰ প্ৰতিবেদন",
       "radiologyreport": "ৰেডিঅ'লজী প্ৰতিবেদন",
       "testresult": "পৰীক্ষাৰ ফল",
-      "unit": "একক"
+      "unit": "একক",
+      "choReport": "সিএইচও ৰিপোৰ্ট"
     },
     "alerts": {
       "info": {
+        "beneficiaryNotFound": "লাভকাৰীৰ তথ্য পোৱা নগ’ল",
         "beneficiaryNotArrived": "হিতাধিকাৰীগৰাকী টি.এম. স্পোক/ কেন্দ্ৰত উপস্থিত হোৱা নাই",
         "scheduledForConsultation": "পৰামর্শৰ বাবে সূচী (চিডিউল ফৰ কনচালটেচন্‌)",
         "marriageAge": "বিবাহৰ বয়স অতিকমেও বছৰত হ'ব লাগিব",
diff --git a/src/assets/English.json b/src/assets/English.json
index da2c24a0..9571d11f 100644
--- a/src/assets/English.json
+++ b/src/assets/English.json
@@ -4,6 +4,18 @@
             "spoke": "Spoke",
             "continue": "Continue"
         },
+        "platform_feedback": {
+            "feedback": "Feedback",
+            "weValueYourFeedback": "We value your feedback",
+            "youHaveLoggedOut":"You have logged out of the session",
+            "subtitle": " We’d love to hear about your experience (optional)",
+            "category": "Category",
+            "selectCategory": "Select Category",
+            "loggedInConsent":"Submit anonymously (if unchecked, we will store your user id for follow-up)",
+            "anonymousInfo":"You are not logged in, this feedback will be submitted anonymously.",
+            "okay": "Okay",
+            "thankYou": "Thank you, your feedback is valuable to us!"
+        },
         "role_selection": {
             "Registrar": "Registrar",
             "Nurse": "Nurse",
@@ -87,6 +99,7 @@
             "editLocation": "Edit Location",
             "beneficiaryID": "Beneficiary ID",
             "beneficiaryName": "Beneficiary Name",
+            "lastName": "Last Name",
             "gender": "Gender",
             "age": "Age",
             "fatherName": "Father's Name",
@@ -1186,10 +1199,12 @@
             "labreport": "Lab Report",
             "radiologyreport": "Radiology Report",
             "testresult": "Test Result",
-            "unit": "Unit"
+            "unit": "Unit",
+            "choReport": "CHO Report"
         },
         "alerts": {
             "info": {
+                "beneficiaryNotFound": "Beneficiary data not found",
                 "beneficiaryNotArrived": "Beneficiary has not arrived at TM spoke/center",
                 "scheduledForConsultation": "Scheduled for consultation",
                 "marriageAge": "Marriage age has to be at least",
@@ -2114,7 +2129,10 @@
         "abhaNumberAlreadyWith": "The Abha number is already linked with beneficiary ID - ",
         "issueInFetchinglinkedBeneficiaryId": "Issue in fetching Beneficiary Id linked to ABHA ID",
         "sessionExpiredPleaseLogin": "Session expired. Please log in again to continue",
-        "continueButton": "Continue"
+        "continueButton": "Continue",
+        "accessDenied": "Access Denied",
+        "internaleServerError": "Internal Server Error",
+        "somethingWentWrong": "Something went wrong"
     }
 
     
diff --git a/src/assets/Hindi.json b/src/assets/Hindi.json
index b44ef009..834bfb7a 100644
--- a/src/assets/Hindi.json
+++ b/src/assets/Hindi.json
@@ -4,6 +4,18 @@
       "spoke": "स्पोक",
       "continue": "जारी रखें"
     },
+    "platform_feedback": {
+      "feedback": "प्रतिक्रिया",
+      "weValueYourFeedback": "हम आपकी प्रतिक्रिया को महत्व देते हैं",
+      "youHaveLoggedOut": "आप सत्र से लॉग आउट हो चुके हैं",
+      "subtitle": "हम आपके अनुभव के बारे में जानना चाहेंगे (वैकल्पिक)",
+      "category": "श्रेणी",
+      "selectCategory": "श्रेणी चुनें",
+      "loggedInConsent": "गुमनाम रूप से सबमिट करें (यदि अनचेक है, तो हम फॉलो-अप के लिए आपका यूज़र आईडी सहेजेंगे)",
+      "anonymousInfo": "आप लॉग इन नहीं हैं, यह प्रतिक्रिया गुमनाम रूप से सबमिट की जाएगी।",
+      "okay": "ठीक है",
+      "thankYou": "धन्यवाद, आपकी प्रतिक्रिया हमारे लिए मूल्यवान है!"
+    },
     "role_selection": {
       "Registrar": " रजिस्ट्रार",
       "Nurse": "नर्स",
@@ -84,6 +96,7 @@
       "editLocation": "स्थान संपादित करें",
       "beneficiaryID": "लाभार्थी आईडी",
       "beneficiaryName": "लाभार्थी का नाम",
+      "lastName": "उपनाम",
       "gender": "लिंग",
       "age": "उम्र",
       "fatherName": "पिता का नाम",
@@ -1178,10 +1191,12 @@
       "noarchivedreportsfound": "कोई भी संग्रहीत रिपोर्ट नहीं मिली",
       "labreport": "प्रयोगशाला की रिपोर्ट",
       "radiologyreport": "रेडियोलॉजी रिपोर्ट",
-      "testresult": "जाँच परिणामt"
+      "testresult": "जाँच परिणामt",
+      "choReport": "सीएचओ रिपोर्ट"
     },
     "alerts": {
       "info": {
+        "beneficiaryNotFound": "लाभार्थी डेटा नहीं मिला",
         "confirmtoProceedFurther": "आगे बढ़ने के लिए की पुष्टि करें",
         "beneficiaryNotArrived": "लाभार्थी  टी.एम स्पोक / केंद्र पर नहीं आया  है",
         "scheduledForConsultation": "परामर्श के लिए अनुसूचित किया ",
@@ -2109,6 +2124,9 @@
         "abhaNumberAlreadyWith": "The Abha number is already linked with beneficiary ID - ",
         "issueInFetchinglinkedBeneficiaryId": "Issue in fetching Beneficiary Id linked to ABHA ID",
         "sessionExpiredPleaseLogin": "Session expired. Please log in again to continue",
-        "continueButton": "जारी रखें"
+        "continueButton": "जारी रखें",
+        "accessDenied": "पहुँच अस्वीकृत",
+        "internaleServerError": "आंतरिक सर्वर त्रुटि",
+        "somethingWentWrong": "कुछ गलत हो गया"
       }
 }
diff --git a/src/assets/Kannada.json b/src/assets/Kannada.json
index a7b51eb8..526b64f8 100644
--- a/src/assets/Kannada.json
+++ b/src/assets/Kannada.json
@@ -1185,10 +1185,12 @@
             "labreport": "ಲ್ಯಾಬ್ ವರದಿ",
             "radiologyreport": "ರೇಡಿಯಾಲಜಿ ವರದಿ",
             "testresult": "ಪರೀಕ್ಷಾ ಫಲಿತಾಂಶ",
-            "unit": "ಘಟಕ"
+            "unit": "ಘಟಕ",
+            "choReport": "ಸಿಎಚ್ಒ ವರದಿ"
         },
         "alerts": {
             "info": {
+                "beneficiaryNotFound": "ಫಲಾನುಭವಿಯು ಡೇಟಾ ಕಂಡುಬಂದಿಲ್ಲ",
                 "beneficiaryNotArrived": "ಫಲಾನುಭವಿಯು ಟಿಎಂ ಸ್ಪೋಕ್/ಕೇಂದ್ರಕ್ಕೆ ಬಂದಿಲ್ಲ",
                 "scheduledForConsultation": "ಸಮಾಲೋಚನೆಗಾಗಿ ನಿಗದಿಪಡಿಸಲಾಗಿದೆ",
                 "marriageAge": "ಮದುವೆಯ ವಯಸ್ಸು ಕನಿಷ್ಠವಾಗಿರಬೇಕು",
@@ -2130,7 +2132,10 @@
         "abhaNumberAlreadyWith": "The Abha number is already linked with beneficiary ID - ",
         "issueInFetchinglinkedBeneficiaryId": "Issue in fetching Beneficiary Id linked to ABHA ID",
         "sessionExpiredPleaseLogin": "Session expired. Please log in again to continue",
-        "continueButton": "ಮುಂದುವರಿಸಿ"
+        "continueButton": "ಮುಂದುವರಿಸಿ",
+        "accessDenied": "ಪ್ರವೇಶ ನಿರಾಕರಿಸಲಾಗಿದೆ",
+        "internaleServerError": "ಆಂತರಿಕ ಸರ್ವರ್ ದೋಷ",
+        "somethingWentWrong": "ಏನೋ ತಪ್ಪಾಗಿದೆ"
 
     }  
 
diff --git a/src/environments/environment.ci.ts.template b/src/environments/environment.ci.ts.template
index 6c0a6834..85f2b1b2 100644
--- a/src/environments/environment.ci.ts.template
+++ b/src/environments/environment.ci.ts.template
@@ -48,11 +48,23 @@ const ABHA_MODE = '<%= ABHA_MODE %>';
 const siteKey = '<%= SITE_KEY %>';
 const captchaChallengeURL = '<%= CAPTCHA_CHALLENGE_URL %>';
 const enableCaptcha = <%= ENABLE_CAPTCHA %>;
+const enableCHOReportBtn = <%= ENABLE_CHO_REPORT_BUTTON %> ;
+const dhisURL = '<%= DHIS_URL %>' ;
 
 export const environment = {
   production: true,
   app: `MMU`,
   encKey: sessionStorageEncKey,
+
+  tracking: {
+    platform: 'matomo',
+    siteId: parseInt('<%= SITE_ID %>'),
+    trackerUrl: '<%= TRACKER_URL %>',
+    trackingPlatform: '<%= TRACKING_PLATFORM %>',
+    enabled: '<%= TRACKING_ENABLED %>' === 'true'
+  },
+
+
   RBSTest: `RBS Test`,
   visualAcuityTest: `Visual Acuity Test`,
   haemoglobinTest: `Hemoglobin Test`,
@@ -543,4 +555,10 @@ export const environment = {
   siteKey: siteKey,
   captchaChallengeURL: captchaChallengeURL,
   enableCaptcha: enableCaptcha,
+
+  getUserId: `${COMMON_API}user/userName/`,
+
+  enableCHOReportBtn: enableCHOReportBtn,
+  dhisURL:dhisURL
 };
+
diff --git a/src/environments/environment.dev.ts b/src/environments/environment.dev.ts
index 83998f99..ad2353e5 100644
--- a/src/environments/environment.dev.ts
+++ b/src/environments/environment.dev.ts
@@ -64,11 +64,21 @@ const sessionStorageEncKey = '';
 const siteKey = '';
 const captchaChallengeURL = '';
 const enableCaptcha = false;
+const enableCHOReportBtn = true;
+const dhisURL = '';
 
 export const environment = {
   production: false,
   encKey: sessionStorageEncKey,
 
+  tracking: {
+    platform: 'matomo',
+    siteId: 1,
+    trackerUrl: '//127.0.0.1/',
+    trackingPlatform: 'development',
+    enabled: true,
+  },
+
   app: `MMU`,
   RBSTest: `RBS Test`,
   visualAcuityTest: `Visual Acuity Test`,
@@ -558,4 +568,6 @@ export const environment = {
   siteKey: siteKey,
   captchaChallengeURL: captchaChallengeURL,
   enableCaptcha: enableCaptcha,
+  enableCHOReportBtn: enableCHOReportBtn,
+  dhisURL: dhisURL,
 };
diff --git a/src/environments/environment.development.ts b/src/environments/environment.development.ts
index f489f9e5..7fe69f6c 100644
--- a/src/environments/environment.development.ts
+++ b/src/environments/environment.development.ts
@@ -65,11 +65,21 @@ const sessionStorageEncKey = '';
 const siteKey = '';
 const captchaChallengeURL = '';
 const enableCaptcha = false;
+const enableCHOReportBtn = true;
+const dhisURL = '';
 
 export const environment = {
   production: false,
   encKey: sessionStorageEncKey,
 
+  tracking: {
+    platform: 'matomo',
+    siteId: 1,
+    trackerUrl: '//127.0.0.1/',
+    trackingPlatform: 'development',
+    enabled: true,
+  },
+
   app: `MMU`,
   RBSTest: `RBS Test`,
   visualAcuityTest: `Visual Acuity Test`,
@@ -559,4 +569,7 @@ export const environment = {
   siteKey: siteKey,
   captchaChallengeURL: captchaChallengeURL,
   enableCaptcha: enableCaptcha,
+
+  enableCHOReportBtn: enableCHOReportBtn,
+  dhisURL: dhisURL,
 };
diff --git a/src/environments/environment.local.ts b/src/environments/environment.local.ts
index bc67f400..ea23922b 100644
--- a/src/environments/environment.local.ts
+++ b/src/environments/environment.local.ts
@@ -65,11 +65,21 @@ const sessionStorageEncKey = '';
 const siteKey = '';
 const captchaChallengeURL = '';
 const enableCaptcha = false;
+const enableCHOReportBtn = true;
+const dhisURL = 'http://abc.xyz.org/dhis2-web-public/Reports.html?auth='; //sample
 
 export const environment = {
   production: false,
   encKey: sessionStorageEncKey,
 
+  tracking: {
+    platform: 'matomo',
+    siteId: 1,
+    trackerUrl: '//127.0.0.1/',
+    trackingPlatform: 'local',
+    enabled: true,
+  },
+
   app: `MMU`,
   RBSTest: `RBS Test`,
   visualAcuityTest: `Visual Acuity Test`,
@@ -558,4 +568,7 @@ export const environment = {
   siteKey: siteKey,
   captchaChallengeURL: captchaChallengeURL,
   enableCaptcha: enableCaptcha,
+
+  enableCHOReportBtn: enableCHOReportBtn,
+  dhisURL: dhisURL,
 };
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index cc914700..281f54e4 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -65,11 +65,21 @@ const sessionStorageEncKey = '';
 const siteKey = '';
 const captchaChallengeURL = '';
 const enableCaptcha = false;
+const enableCHOReportBtn = true;
+const dhisURL = '';
 
 export const environment = {
   production: true,
   encKey: sessionStorageEncKey,
 
+  tracking: {
+    platform: 'matomo',
+    siteId: 1,
+    trackerUrl: 'https://matomo.piramalswasthya.org/',
+    trackingPlatform: 'production',
+    enabled: true,
+  },
+
   app: `MMU`,
   RBSTest: `RBS Test`,
   visualAcuityTest: `Visual Acuity Test`,
@@ -559,4 +569,7 @@ export const environment = {
   siteKey: siteKey,
   captchaChallengeURL: captchaChallengeURL,
   enableCaptcha: enableCaptcha,
+
+  enableCHOReportBtn: enableCHOReportBtn,
+  dhisURL: dhisURL,
 };
diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts
index f489f9e5..ecfc00fd 100644
--- a/src/environments/environment.test.ts
+++ b/src/environments/environment.test.ts
@@ -70,6 +70,14 @@ export const environment = {
   production: false,
   encKey: sessionStorageEncKey,
 
+  tracking: {
+    platform: 'matomo',
+    siteId: 1,
+    trackerUrl: '//127.0.0.1/',
+    trackingPlatform: 'test',
+    enabled: true,
+  },
+
   app: `MMU`,
   RBSTest: `RBS Test`,
   visualAcuityTest: `Visual Acuity Test`,