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 66308f8..3f3d3d1 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
@@ -14,35 +14,22 @@ <h4>{{ current_language_set?.casesheet?.provisionalDiag }}*</h4>
           "
         >
           <ng-container [formGroupName]="i">
-            <div class="col-9">
-              <mat-form-field class="input-full-width">
-                <input
-                  matInput
-                  allowText="inputFieldValidator"
-                  appDiagnosisSearch
-                  [diagnosisListForm]="diagnosis"
-                  required
-                  name="viewDiagnosisProvided"
-                  formControlName="viewProvisionalDiagnosisProvided"
-                  maxlength="100"
-                  minlength="3"
-                  required
-                  [previousSelected]="
-                    generalDiagnosisForm.value.provisionalDiagnosisList
-                  "
-                />
-                <mat-icon
-                  class="search-btn cursorPointer"
-                  matSuffix
-                  appDiagnosisSearch
-                  [diagnosisListForm]="diagnosis"
-                  [previousSelected]="
-                    generalDiagnosisForm.value.provisionalDiagnosisList
-                  "
-                  >search</mat-icon
-                >
+            <div class="col-xs-12 col-sm-8 col-md-9">
+              <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
+                  [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>
             </div>
+            
             <div class="col-xs-12 col-sm-3 m-t-10">
               <button
                 mat-mini-fab
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 751e79d..1131bf8 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
@@ -47,6 +47,7 @@ export class GeneralOpdDiagnosisComponent
   implements OnInit, OnChanges, DoCheck
 {
   utils = new GeneralUtils(this.fb, this.sessionstorage);
+  suggestedDiagnosisList: any = [];
 
   @Input()
   generalDiagnosisForm!: FormGroup;
@@ -56,12 +57,14 @@ export class GeneralOpdDiagnosisComponent
   current_language_set: any;
   designation: any;
   specialist!: boolean;
+
   constructor(
     private fb: FormBuilder,
     public httpServiceService: HttpServiceService,
     private doctorService: DoctorService,
     private confirmationService: ConfirmationService,
     readonly sessionstorage: SessionStorageService,
+    private masterdataService: MasterdataService
   ) {}
 
   ngOnInit() {
@@ -252,4 +255,35 @@ export class GeneralOpdDiagnosisComponent
       return true;
     }
   }
+
+  onDiagnosisInputKeyup(value: string, index: number) {
+    if (value.length >= 3) {
+      this.masterdataService
+        .searchDiagnosisBasedOnPageNo(value, index)
+        .subscribe((results: any) => {
+          this.suggestedDiagnosisList[index] = results?.data?.sctMaster;
+        });
+    } else {
+      this.suggestedDiagnosisList[index] = [];
+    }
+  }
+
+  displayDiagnosis(diagnosis: any): string {
+    return diagnosis?.term || '';
+  }
+
+  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,
+    });
+  }
 }
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 be542a6..567d3e5 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
@@ -125,33 +125,22 @@ <h4>{{ current_language_set?.casesheet?.provisionalDiag }}</h4>
         >
           <ng-container [formGroupName]="i">
             <div class="row">
-              <div class="col-xs-12 col-sm-9">
-                <mat-form-field class="input-full-width">
-                  <input
-                    matInput
-                    allowText="inputFieldValidator"
-                    appDiagnosisSearch
-                    [diagnosisListForm]="diagnosis"
-                    name="viewDiagnosisProvided"
-                    formControlName="viewProvisionalDiagnosisProvided"
-                    maxlength="100"
-                    minlength="3"
-                    [previousSelected]="
-                      generalDiagnosisForm.value.provisionalDiagnosisList
-                    "
-                  />
-                  <mat-icon
-                    class="search-btn cursorPointer"
-                    matSuffix
-                    appDiagnosisSearch
-                    [diagnosisListForm]="diagnosis"
-                    [previousSelected]="
-                      generalDiagnosisForm.value?.provisionalDiagnosisList
-                    "
-                    >search</mat-icon
-                  >
-                </mat-form-field>
-              </div>
+               <div class="col-xs-12 col-sm-8 col-md-9">
+              <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
+                  [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>
+               </div>
+              
               <div class="col-xs-12 col-sm-3 m-t-10">
                 <button
                   mat-mini-fab
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 f392f4e..4b35535 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
@@ -59,6 +59,9 @@ export class NcdCareDiagnosisComponent implements OnInit, DoCheck {
   visitCategory: any;
   attendantType: any;
   enableNCDCondition = false;
+  suggestedDiagnosisList: any = [];
+
+
   constructor(
     private fb: FormBuilder,
     private masterdataService: MasterdataService,
@@ -268,4 +271,35 @@ export class NcdCareDiagnosisComponent implements OnInit, DoCheck {
       value,
     );
   }
+
+  onDiagnosisInputKeyup(value: string, index: number) {
+    if (value.length >= 3) {
+      this.masterdataService
+        .searchDiagnosisBasedOnPageNo(value, index)
+        .subscribe((results: any) => {
+          this.suggestedDiagnosisList[index] = results?.data?.sctMaster;
+        });
+    } else {
+      this.suggestedDiagnosisList[index] = [];
+    }
+  }
+
+  displayDiagnosis(diagnosis: any): string {
+    return diagnosis?.term || '';
+  }
+
+  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,
+    });
+  }
 }
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 aae40a9..e80b95c 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
@@ -18,33 +18,21 @@ <h4 *ngIf="!enableProvisionalDiag">
           "
         >
           <ng-container [formGroupName]="i">
-            <div class="col-9">
-              <mat-form-field class="input-full-width">
-                <input
-                  matInput
-                  allowText="inputFieldValidator"
-                  appDiagnosisSearch
-                  [diagnosisListForm]="diagnosis"
-                  name="viewDiagnosisProvided"
-                  formControlName="viewProvisionalDiagnosisProvided"
-                  maxlength="100"
-                  minlength="3"
-                  [previousSelected]="
-                    generalDiagnosisForm.value.provisionalDiagnosisList
-                  "
-                />
-                <mat-icon
-                  class="search-btn cursorPointer"
-                  matSuffix
-                  appDiagnosisSearch
-                  [diagnosisListForm]="diagnosis"
-                  [previousSelected]="
-                    generalDiagnosisForm.value.provisionalDiagnosisList
-                  "
-                  >search</mat-icon
-                >
-              </mat-form-field>
-            </div>
+            <div class="col-xs-12 col-sm-8 col-md-9">
+                <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
+                    [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>
+              </div>
             <div class="col-xs-12 col-sm-3 m-t-10">
               <button
                 mat-mini-fab
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 598deb8..214aebe 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
@@ -32,6 +32,7 @@ import { SetLanguageComponent } from 'src/app/app-modules/core/components/set-la
 import { HttpServiceService } from 'src/app/app-modules/core/services/http-service.service';
 import {
   DoctorService,
+  MasterdataService,
   NurseService,
 } from 'src/app/app-modules/nurse-doctor/shared/services';
 import { IdrsscoreService } from 'src/app/app-modules/nurse-doctor/shared/services/idrsscore.service';
@@ -63,6 +64,7 @@ export class NcdScreeningDiagnosisComponent
   confirmDisease = [];
   confirmHyperTensionDisease = [];
   enableProvisionalDiag!: boolean;
+  suggestedDiagnosisList: any = [];
   constructor(
     private fb: FormBuilder,
     private doctorService: DoctorService,
@@ -71,6 +73,7 @@ export class NcdScreeningDiagnosisComponent
     private idrsScoreService: IdrsscoreService,
     private nurseService: NurseService,
     readonly sessionstorage: SessionStorageService,
+    private masterdataService: MasterdataService
   ) {}
 
   ngOnInit() {
@@ -324,4 +327,35 @@ export class NcdScreeningDiagnosisComponent
   addHyperTensionToConfirmDisease(hyperConfirmation: any) {
     this.idrsScoreService.finalDiagnosisHypertensionConfirm(hyperConfirmation);
   }
+
+   onDiagnosisInputKeyup(value: string, index: number) {
+    if (value.length >= 3) {
+      this.masterdataService
+        .searchDiagnosisBasedOnPageNo(value, index)
+        .subscribe((results: any) => {
+          this.suggestedDiagnosisList[index] = results?.data?.sctMaster;
+        });
+    } else {
+      this.suggestedDiagnosisList[index] = [];
+    }
+  }
+
+  displayDiagnosis(diagnosis: any): string {
+    return diagnosis?.term || '';
+  }
+
+  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,
+    });
+  }
 }
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 cdf1f20..c499136 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
@@ -16,33 +16,22 @@ <h4>{{ current_language_set?.casesheet?.provisionalDiag }}</h4>
           >
             <ng-container [formGroupName]="i">
               <div class="row">
-                <div class="col-xs-12 col-sm-9 box">
-                  <mat-form-field class="input-full-width">
-                    <input
-                      matInput
-                      allowText="inputFieldValidator"
-                      appDiagnosisSearch
-                      name="viewProvisionalDiagnosisProvided"
-                      formControlName="viewProvisionalDiagnosisProvided"
-                      [diagnosisListForm]="diagnosis"
-                      maxlength="100"
-                      minlength="3"
-                      [previousSelected]="
-                        generalDiagnosisForm.value.provisionalDiagnosisList
-                      "
-                    />
-                    <mat-icon
-                      class="search-btn"
-                      matSuffix
-                      appDiagnosisSearch
-                      [diagnosisListForm]="diagnosis"
-                      [previousSelected]="
-                        generalDiagnosisForm.value.provisionalDiagnosisList
-                      "
-                      >search</mat-icon
-                    >
-                  </mat-form-field>
-                </div>
+                <div class="col-xs-12 col-sm-8 col-md-9">
+                <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
+                    [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>
+              </div>
+            
                 <div class="col-xs-12 col-sm-3 box pull-right">
                   <button
                     mat-mini-fab
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 22cde00..eacd777 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
@@ -35,7 +35,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';
@@ -93,6 +93,7 @@ export class PncDiagnosisComponent
   current_language_set: any;
   designation: any;
   specialist!: boolean;
+  suggestedDiagnosisList: any[] = [];
 
   constructor(
     private confirmationService: ConfirmationService,
@@ -101,6 +102,7 @@ export class PncDiagnosisComponent
     private doctorService: DoctorService,
     public httpServiceService: HttpServiceService,
     readonly sessionstorage: SessionStorageService,
+    private masterdataService: MasterdataService
   ) {}
 
   beneficiaryAge: any;
@@ -423,4 +425,35 @@ export class PncDiagnosisComponent
       return true;
     }
   }
+
+  onDiagnosisInputKeyup(value: string, index: number) {
+    if (value.length >= 3) {
+      this.masterdataService
+        .searchDiagnosisBasedOnPageNo(value, index)
+        .subscribe((results: any) => {
+          this.suggestedDiagnosisList[index] = results?.data?.sctMaster;
+        });
+    } else {
+      this.suggestedDiagnosisList[index] = [];
+    }
+  }
+
+  displayDiagnosis(diagnosis: any): string {
+    return diagnosis?.term || '';
+  }
+
+  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,
+    });
+  }
 }