diff --git a/Common-UI b/Common-UI
index 87bebfa..6bb2b20 160000
--- a/Common-UI
+++ b/Common-UI
@@ -1 +1 @@
-Subproject commit 87bebfa922a23fa3db7b6348b473792d15492fd0
+Subproject commit 6bb2b204b7381300cb9d0436c8f57c3fe86cb0e0
diff --git a/pom.xml b/pom.xml
index 25e9b69..b9fddb4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.iemr.tm-ui</groupId>
   <artifactId>tm-ui</artifactId>
-  <version>3.0.0</version>
+  <version>3.4.0</version>
   <name>TM-UI</name>
   <description>Piramal - tm: Module ui</description>
   <packaging>war</packaging>
@@ -94,7 +94,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>
-        <version>3.1.0</version>
+        <version>3.4.0</version>
         <executions>
           <execution>
             <id>npm-install</id>
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 9d09575..3f01716 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
@@ -19,6 +19,34 @@
       <tr style="color: #595959; font-size: 14px">
         <td>{{ beneficiary?.beneficiaryName }}</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/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..ca914ed 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
@@ -8,41 +8,28 @@ <h4>{{ current_language_set?.casesheet?.provisionalDiag }}*</h4>
         <div
           class="col-12 row"
           *ngFor="
-            let diagnosis of getProvisionalDiagnosisList();
+            let diagnosis of provisionalDiagnosisControls;
             let i = index;
             let isLast = last
           "
         >
           <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..6f1bb21 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() {
@@ -186,8 +189,7 @@ export class GeneralOpdDiagnosisComponent
         (<FormGroup>diagnosisArrayList.at(i)).controls[
           'viewProvisionalDiagnosisProvided'
         ].disable();
-        if (diagnosisArrayList.length < savedDiagnosisData.length)
-          this.addDiagnosis();
+        this.addDiagnosis();
       }
     }
   }
@@ -204,13 +206,11 @@ export class GeneralOpdDiagnosisComponent
       );
     }
   }
-  getProvisionalDiagnosisList(): AbstractControl[] | null {
-    const provisionalDiagnosisListControl = this.generalDiagnosisForm.get(
-      'provisionalDiagnosisList',
+  get provisionalDiagnosisControls(): AbstractControl[] {
+    return (
+      (this.generalDiagnosisForm.get('provisionalDiagnosisList') as FormArray)
+        ?.controls || []
     );
-    return provisionalDiagnosisListControl instanceof FormArray
-      ? provisionalDiagnosisListControl.controls
-      : null;
   }
 
   removeDiagnosisFromList(
@@ -252,4 +252,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 typeof diagnosis === 'string' ? diagnosis : 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..207558c 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
@@ -118,40 +118,29 @@ <h4>{{ current_language_set?.casesheet?.provisionalDiag }}</h4>
       <ng-container formArrayName="provisionalDiagnosisList">
         <div
           *ngFor="
-            let diagnosis of getProvisionalDiagnosisList();
+            let diagnosis of provisionalDiagnosisControls;
             let i = index;
             let isLast = last
           "
         >
           <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..0bc6ef3 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,
@@ -178,8 +181,7 @@ export class NcdCareDiagnosisComponent implements OnInit, DoCheck {
         (<FormGroup>diagnosisArrayList.at(i)).controls[
           'viewProvisionalDiagnosisProvided'
         ].disable();
-        if (diagnosisArrayList.length < savedDiagnosisData.length)
-          this.addDiagnosis();
+        this.addDiagnosis();
       }
     }
   }
@@ -197,13 +199,11 @@ export class NcdCareDiagnosisComponent implements OnInit, DoCheck {
     }
   }
 
-  getProvisionalDiagnosisList(): AbstractControl[] | null {
-    const provisionalDiagnosisListControl = this.generalDiagnosisForm.get(
-      'provisionalDiagnosisList',
+  get provisionalDiagnosisControls(): AbstractControl[] {
+    return (
+      (this.generalDiagnosisForm.get('provisionalDiagnosisList') as FormArray)
+        ?.controls || []
     );
-    return provisionalDiagnosisListControl instanceof FormArray
-      ? provisionalDiagnosisListControl.controls
-      : null;
   }
 
   removeDiagnosisFromList(
@@ -268,4 +268,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 typeof diagnosis === 'string' ? diagnosis : 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..bfdb32b 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
@@ -12,39 +12,27 @@ <h4 *ngIf="!enableProvisionalDiag">
       <ng-container formArrayName="provisionalDiagnosisList">
         <div
           *ngFor="
-            let diagnosis of getProvisionalDiagnosisList();
+            let diagnosis of provisionalDiagnosisControls;
             let i = index;
             let isLast = last
           "
         >
           <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..02e6e2b 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() {
@@ -217,8 +220,7 @@ export class NcdScreeningDiagnosisComponent
         (<FormGroup>diagnosisArrayList.at(i)).controls[
           'viewProvisionalDiagnosisProvided'
         ].disable();
-        if (diagnosisArrayList.length < savedDiagnosisData.length)
-          this.addDiagnosis();
+        this.addDiagnosis();
       }
     }
   }
@@ -236,13 +238,11 @@ export class NcdScreeningDiagnosisComponent
     }
   }
 
-  getProvisionalDiagnosisList(): AbstractControl[] | null {
-    const provisionalDiagnosisListControl = this.generalDiagnosisForm.get(
-      'provisionalDiagnosisList',
+  get provisionalDiagnosisControls(): AbstractControl[] {
+    return (
+      (this.generalDiagnosisForm.get('provisionalDiagnosisList') as FormArray)
+        ?.controls || []
     );
-    return provisionalDiagnosisListControl instanceof FormArray
-      ? provisionalDiagnosisListControl.controls
-      : null;
   }
 
   removeDiagnosisFromList(
@@ -324,4 +324,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 typeof diagnosis === 'string' ? diagnosis : 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..020b0bd 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
@@ -8,7 +8,7 @@ <h4>{{ current_language_set?.casesheet?.provisionalDiag }}</h4>
         <ng-container formArrayName="provisionalDiagnosisList">
           <div
             *ngFor="
-              let diagnosis of getProvisionalDiagnosisList();
+              let diagnosis of provisionalDiagnosisControls;
               let i = index;
               let isLast = last
             "
@@ -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..e77880e 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;
@@ -173,13 +175,11 @@ export class PncDiagnosisComponent
     }
   }
 
-  getProvisionalDiagnosisList(): AbstractControl[] | null {
-    const provisionalDiagnosisListControl = this.generalDiagnosisForm.get(
-      'provisionalDiagnosisList',
+  get provisionalDiagnosisControls(): AbstractControl[] {
+    return (
+      (this.generalDiagnosisForm.get('provisionalDiagnosisList') as FormArray)
+        ?.controls || []
     );
-    return provisionalDiagnosisListControl instanceof FormArray
-      ? provisionalDiagnosisListControl.controls
-      : null;
   }
 
   getConfirmatoryDiagnosisList(): AbstractControl[] | null {
@@ -324,8 +324,7 @@ export class PncDiagnosisComponent
       (<FormGroup>provisionalDiagnosisList.at(i)).controls[
         'viewProvisionalDiagnosisProvided'
       ].disable();
-      if (provisionalDiagnosisList.length < provisionalDiagnosisDataList.length)
-        this.addProvisionalDiagnosis();
+      this.addProvisionalDiagnosis();
     }
   }
 
@@ -423,4 +422,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 typeof diagnosis === 'string' ? diagnosis : 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/assets/Assamese.json b/src/assets/Assamese.json
index ba7c38e..e19837d 100644
--- a/src/assets/Assamese.json
+++ b/src/assets/Assamese.json
@@ -83,6 +83,7 @@
       "editLocation": "অৱস্থান সম্পাদনা কৰক",
       "beneficiaryID": "হিতাধিকাৰী আইডি",
       "beneficiaryName": "হিতাধিকাৰীৰ নাম",
+      "lastName": "উপাধী (চাৰন্যেম)",
       "gender": "লিঙ্গ",
       "age": "বয়স",
       "fatherName": "পিতৃৰ নাম",
diff --git a/src/assets/English.json b/src/assets/English.json
index 786b7ac..82e4da1 100644
--- a/src/assets/English.json
+++ b/src/assets/English.json
@@ -85,6 +85,7 @@
             "editLocation": "Edit Location",
             "beneficiaryID": "Beneficiary ID",
             "beneficiaryName": "Beneficiary Name",
+            "lastName":"Last Name",
             "gender": "Gender",
             "age": "Age",
             "fatherName": "Father's Name",
diff --git a/src/assets/Hindi.json b/src/assets/Hindi.json
index 2a8094f..b3576f9 100644
--- a/src/assets/Hindi.json
+++ b/src/assets/Hindi.json
@@ -82,6 +82,7 @@
       "editLocation": "स्थान संपादित करें",
       "beneficiaryID": "लाभार्थी आईडी",
       "beneficiaryName": "लाभार्थी का नाम",
+      "lastName": "उपनाम",
       "gender": "लिंग",
       "age": "उम्र",
       "fatherName": "पिता का नाम",
diff --git a/src/environments/environment.ci.ts.template b/src/environments/environment.ci.ts.template
index 3d2ff87..3f1c0f4 100644
--- a/src/environments/environment.ci.ts.template
+++ b/src/environments/environment.ci.ts.template
@@ -40,7 +40,7 @@ const IOT_API = '<%= IOT_API_BASE %>';
 const FHIR_API = '<%= FHIR_API_BASE %>';
 const mmuUICasesheet = '<%= TM_API_BASE %>';
 const SCHEDULER_UI =  '<%= SCHEDULER_UI_BASE %>';
-const INVENTORY_UI =  '<%= INVENTORY_UI_BASE %>';
+const INVENTORY_UI =  '<%= INVENTORY_UI %>';
 const IDENTITY_API = `<%= IDENTITY_API_BASE %>`;
 const sessionStorageEncKey = '<%= SESSION_STORAGE_ENC_KEY %>';
 const siteKey = '<%= SITE_KEY %>';