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 f8348a9f..62b66d48 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
@@ -263,87 +263,84 @@
 
   <div class="row m-t-20">
     <ng-container formArrayName="clinicalObservationsList">
-      <div
+      <div class="row align-items-center m-t-10"
         *ngFor="
           let observations of getClinicalObservationsList();
           let i = index;
           let isLast = last
         "
       >
-        <ng-container [formGroupName]="i" class="col-12">
-          <div class="row">
-            <div class="col-8">
-              <mat-form-field class="input-full-width">
-                <mat-label>{{
-                  current_language_set?.casesheet?.clinicalObs
-                }}</mat-label>
-                <input
-                  matInput
-                  allowText="inputFieldValidator"
-                  appClinicalObservations
-                  [observationsList]="observations"
-                  name="viewObservationsProvided"
-                  formControlName="clinicalObservationsProvided"
-                  maxlength="100"
-                  minlength="3"
-                  [previousSelected]="
-                    generalFindingsForm.value.clinicalObservationsList
-                  "
-                  (focus)="trackFieldInteraction('Clinical Observations Input')"
-                />
-                <mat-icon
-                  class="search-btn cursorPointer"
-                  matSuffix
-                  appClinicalObservations
-                  [observationsList]="observations"
-                  [previousSelected]="
-                    generalFindingsForm.value.clinicalObservationsList
-                  "
-                  (click)="
-                    trackFieldInteraction('Search Clinical Observations')
-                  "
-                  >search</mat-icon
-                >
-              </mat-form-field>
-            </div>
+        <ng-container [formGroupName]="i">
+          <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?.clinicalObs
+              }}</mat-label>
+              <input
+                matInput
+                type="text"
+                autocomplete="off"
+                name="viewObservationsProvided"
+                formControlName="clinicalObservationsProvided"
+                minlength="3"
+                maxlength="100"
+                #observationInput
+                [matAutocomplete]="autoObservation"
+                (keyup)="onObservationInputKeyup(observationInput.value, i)"
+                (focus)="trackFieldInteraction('Clinical Observations Input')"
+              />
+            </mat-form-field>
 
-            <div class="col-4" style="margin-top: 10px">
-              <button
-                mat-mini-fab
-                type="button"
-                color="primary"
-                *ngIf="isLast"
-                [disabled]="validateAddedObservations(observations)"
-                (click)="
-                  addObservations();
-                  trackFieldInteraction('Add Clinical Observation')
-                "
-                class="mat-add-btn"
+            <mat-autocomplete
+              #autoObservation="matAutocomplete"
+              autoActiveFirstOption
+              [displayWith]="displayObservation"
+              (optionSelected)="onObservationSelected($event.option.value, i)"
+            >
+              <mat-option
+                *ngFor="let obs of suggestedObservationsList[i]"
+                [value]="obs"
               >
-                {{ current_language_set?.common?.add }}
-              </button>
+                {{ obs.term }}
+              </mat-option>
+            </mat-autocomplete>
+          </div>
 
-              <button
-                mat-mini-fab
-                type="button"
-                class="mat-remove-btn"
-                color="warn"
-                *ngIf="
-                  i !== 0 ||
-                  (i === 0 &&
-                    generalFindingsForm.get('clinicalObservationsList')?.value
-                      .clinicalObservationsProvided !== null &&
-                    generalFindingsForm.get('clinicalObservationsList')?.value
-                      .clinicalObservationsProvided !== '')
-                "
-                (click)="
-                  removeObservationsFromList(i, observations);
-                  trackFieldInteraction('Remove Clinical Observation')
-                "
-              >
-                {{ current_language_set?.common?.remove }}
-              </button>
-            </div>
+          <div class="col-xs-12 col-sm-4 col-md-3 d-flex align-items-center">
+            <button
+              mat-mini-fab
+              type="button"
+              color="primary"
+              *ngIf="isLast"
+              [disabled]="validateAddedObservations(observations)"
+              (click)="
+                addObservations();
+                trackFieldInteraction('Add Clinical Observation')
+              "
+              class="mat-add-btn m-r-10"
+            >
+              {{ current_language_set?.common?.add }}
+            </button>
+
+            <button
+              mat-mini-fab
+              type="button"
+              class="mat-remove-btn"
+              color="warn"
+              *ngIf="
+                observations.get('clinicalObservationsProvided')?.disabled ||
+                i !== 0 ||
+                (i === 0 &&
+                  generalFindingsForm.get('clinicalObservationsList')?.value[i]
+                    ?.clinicalObservationsProvided)
+              "
+              (click)="
+                removeObservationsFromList(i, observations);
+                trackFieldInteraction('Remove Clinical Observation')
+              "
+            >
+              {{ current_language_set?.common?.remove }}
+            </button>
           </div>
         </ng-container>
       </div>
@@ -351,92 +348,84 @@
   </div>
   <div class="row m-t-5">
     <ng-container formArrayName="significantFindingsList">
-      <div
+      <div class="row align-items-center m-t-10"
         *ngFor="
           let findings of getSignificantFindingsList();
           let i = index;
           let isLast = last
         "
       >
-        <ng-container [formGroupName]="i" class="col-12">
-          <div class="row">
-            <div class="col-8">
-              <mat-form-field class="input-full-width">
-                <mat-label>{{
-                  current_language_set?.casesheet?.significantFind
-                }}</mat-label>
-                <input
-                  matInput
-                  allowText="inputFieldValidator"
-                  appSignificantFindings
-                  [findingsList]="findings"
-                  name="viewFindingsProvided"
-                  formControlName="significantFindingsProvided"
-                  maxlength="100"
-                  minlength="3"
-                  [previousSelected]="
-                    generalFindingsForm.value.significantFindingsList
-                  "
-                  (keyup)="
-                    resetFindingsCheckbox(
-                      generalFindingsForm.get('significantFindingsList')?.value
-                        .significantFindingsProvided
-                    )
-                  "
-                  (focus)="trackFieldInteraction('Significant Findings Input')"
-                />
-
-                <mat-icon
-                  class="search-btn cursorPointer"
-                  matSuffix
-                  appSignificantFindings
-                  [findingsList]="findings"
-                  [previousSelected]="
-                    generalFindingsForm.value.significantFindingsList
-                  "
-                  (click)="trackFieldInteraction('Search Significant Findings')"
-                  >search</mat-icon
-                >
-              </mat-form-field>
-            </div>
+        <ng-container [formGroupName]="i">
+          <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?.significantFind
+              }}</mat-label>
+              <input
+                matInput
+                type="text"
+                autocomplete="off"
+                name="viewFindingsProvided"
+                formControlName="significantFindingsProvided"
+                minlength="3"
+                maxlength="100"
+                #findingsInput
+                [matAutocomplete]="autoFindings"
+                (keyup)="onFindingsInputKeyup(findingsInput.value, i)"
+                (focus)="trackFieldInteraction('Significant Findings Input')"
+              />
+            </mat-form-field>
 
-            <div class="col-4" style="margin-top: 10px">
-              <button
-                mat-mini-fab
-                type="button"
-                color="primary"
-                *ngIf="isLast"
-                [disabled]="validateAddedFindings(findings)"
-                (click)="
-                  addFindings();
-                  trackFieldInteraction('Add Significant Finding')
-                "
-                class="mat-add-btn"
+            <mat-autocomplete
+              #autoFindings="matAutocomplete"
+              autoActiveFirstOption
+              [displayWith]="displayFindings"
+              (optionSelected)="onFindingsSelected($event.option.value, i)"
+            >
+              <mat-option
+                *ngFor="let finding of suggestedFindingsSearchList[i]"
+                [value]="finding"
               >
-                {{ current_language_set?.common?.add }}
-              </button>
+                {{ finding.term }}
+              </mat-option>
+            </mat-autocomplete>
+          </div>
 
-              <button
-                mat-mini-fab
-                type="button"
-                color="warn"
-                class="mat-remove-btn"
-                *ngIf="
-                  i !== 0 ||
-                  (i === 0 &&
-                    generalFindingsForm.get('significantFindingsList')?.value
-                      .significantFindingsProvided !== null &&
-                    generalFindingsForm.get('significantFindingsList')?.value
-                      .significantFindingsProvided !== '')
-                "
-                (click)="
-                  removeFindingsFromList(i, findings);
-                  trackFieldInteraction('Remove Significant Finding')
-                "
-              >
-                {{ current_language_set?.common?.remove }}
-              </button>
-            </div>
+          <div class="col-xs-12 col-sm-4 col-md-3 d-flex align-items-center">
+            <button
+              mat-mini-fab
+              type="button"
+              color="primary"
+              *ngIf="isLast"
+              [disabled]="validateAddedFindings(findings)"
+              (click)="
+                addFindings();
+                trackFieldInteraction('Add Significant Finding')
+              "
+              class="mat-add-btn m-r-10"
+            >
+              {{ current_language_set?.common?.add }}
+            </button>
+
+            <button
+              mat-mini-fab
+              type="button"
+              color="warn"
+              class="mat-remove-btn"
+              *ngIf="
+                findings.get('significantFindingsProvided')?.disabled ||
+                i !== 0 ||
+                (i === 0 &&
+                  generalFindingsForm.get('significantFindingsList')?.value[i]
+                    ?.significantFindingsProvided)
+              "
+              (click)="
+                removeFindingsFromList(i, findings);
+                trackFieldInteraction('Remove Significant Finding')
+              "
+            >
+              {{ current_language_set?.common?.remove }}
+            </button>
           </div>
         </ng-container>
       </div>
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 094b8a87..2ff6c858 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
@@ -83,6 +83,11 @@ export class FindingsComponent implements OnInit, DoCheck, OnDestroy {
   current_language_set: any;
   enableIsHistory = false;
   enableProvisionalDiag = false;
+
+  suggestedObservationsList: any = [];
+  suggestedFindingsSearchList: any = [];
+  private latestObservationQuery: Map<number, string> = new Map();
+  private latestFindingsQuery: Map<number, string> = new Map();
   displayedColumns: any = [
     'chiefComplaintsDetails',
     'duration',
@@ -618,11 +623,7 @@ export class FindingsComponent implements OnInit, DoCheck, OnDestroy {
               findingsList.reset();
             }
             this.generalFindingsForm.markAsDirty();
-            this.resetFindingsCheckbox(
-              this.generalFindingsForm.controls[
-                'significantFindingsList'
-              ].value.at(0).term,
-            );
+            this.resetFindingsCheckbox();
           }
         });
     } else {
@@ -631,10 +632,7 @@ export class FindingsComponent implements OnInit, DoCheck, OnDestroy {
       } else {
         findingsList.reset();
       }
-      this.resetFindingsCheckbox(
-        this.generalFindingsForm.controls['significantFindingsList'].value.at(0)
-          .term,
-      );
+      this.resetFindingsCheckbox();
     }
   }
   patchCapturedClinicalObservations(clinicalObservations: any) {
@@ -686,12 +684,95 @@ export class FindingsComponent implements OnInit, DoCheck, OnDestroy {
         ].disable();
         if (findingsList.length < savedFindings.length) this.addFindings();
       }
-      this.resetFindingsCheckbox(
-        this.generalFindingsForm.controls['significantFindingsList'].value.at(0)
-          .term,
-      );
+      this.resetFindingsCheckbox();
+    }
+  }
+  // --- Clinical Observations: Autocomplete search ---
+  onObservationInputKeyup(value: string, index: number) {
+    const term = (value || '').trim();
+    this.latestObservationQuery.set(index, term);
+    const observationsFormArray = this.generalFindingsForm.get(
+      'clinicalObservationsList',
+    ) as FormArray;
+    const observationsFormGroup = observationsFormArray.at(index) as FormGroup;
+    observationsFormGroup.patchValue({ conceptID: null, term: null });
+    if (term.length >= 3) {
+      this.masterdataService.searchDiagnosisBasedOnPageNo(term, 0).subscribe({
+        next: (results: any) => {
+          if (this.latestObservationQuery.get(index) === term) {
+            this.suggestedObservationsList[index] =
+              results?.data?.sctMaster ?? [];
+          }
+        },
+        error: () => {
+          console.error('Error fetching observation data');
+        },
+      });
+    } else {
+      this.suggestedObservationsList[index] = [];
     }
   }
+
+  displayObservation(obs: any): string {
+    return typeof obs === 'string' ? obs : obs?.term || '';
+  }
+
+  onObservationSelected(selected: any, index: number) {
+    const observationsFormArray = this.generalFindingsForm.get(
+      'clinicalObservationsList',
+    ) as FormArray;
+    const observationsFormGroup = observationsFormArray.at(index) as FormGroup;
+    observationsFormGroup.patchValue({
+      clinicalObservationsProvided: selected?.term || null,
+      conceptID: selected?.conceptID || null,
+      term: selected?.term || null,
+    });
+  }
+
+  // --- Significant Findings: Autocomplete search ---
+  onFindingsInputKeyup(value: string, index: number) {
+    const term = (value || '').trim();
+    this.latestFindingsQuery.set(index, term);
+    const findingsFormArray = this.generalFindingsForm.get(
+      'significantFindingsList',
+    ) as FormArray;
+    const findingsFormGroup = findingsFormArray.at(index) as FormGroup;
+    findingsFormGroup.patchValue({ conceptID: null, term: null });
+    this.resetFindingsCheckbox();
+    if (term.length >= 3) {
+      this.masterdataService.searchDiagnosisBasedOnPageNo(term, 0).subscribe({
+        next: (results: any) => {
+          if (this.latestFindingsQuery.get(index) === term) {
+            this.suggestedFindingsSearchList[index] =
+              results?.data?.sctMaster ?? [];
+          }
+        },
+        error: () => {
+          console.error('Error fetching findings data');
+        },
+      });
+    } else {
+      this.suggestedFindingsSearchList[index] = [];
+    }
+  }
+
+  displayFindings(finding: any): string {
+    return typeof finding === 'string' ? finding : finding?.term || '';
+  }
+
+  onFindingsSelected(selected: any, index: number) {
+    const findingsFormArray = this.generalFindingsForm.get(
+      'significantFindingsList',
+    ) as FormArray;
+    const findingsFormGroup = findingsFormArray.at(index) as FormGroup;
+    findingsFormGroup.patchValue({
+      significantFindingsProvided: selected?.term || null,
+      conceptID: selected?.conceptID || null,
+      term: selected?.term || null,
+    });
+    this.resetFindingsCheckbox();
+  }
+
   ngOnDestroy() {
     if (this.doctorMasterDataSubscription)
       this.doctorMasterDataSubscription.unsubscribe();
@@ -702,26 +783,18 @@ export class FindingsComponent implements OnInit, DoCheck, OnDestroy {
     }
   }
 
-  resetFindingsCheckbox(significantFindingsProvidedValue: any) {
-    if (
-      this.generalFindingsForm.controls['significantFindingsList'].value
-        .length === 1 &&
-      (significantFindingsProvidedValue === undefined ||
-        significantFindingsProvidedValue === null ||
-        significantFindingsProvidedValue === '')
-    ) {
-      this.generalFindingsForm.controls['isForHistory'].patchValue(null);
-      this.enableIsHistory = false;
-    }
-
-    if (
-      this.generalFindingsForm.controls['significantFindingsList'].value
-        .length > 0 &&
-      significantFindingsProvidedValue !== null &&
-      significantFindingsProvidedValue !== ''
-    ) {
+  resetFindingsCheckbox() {
+    const findingsList = this.generalFindingsForm.get(
+      'significantFindingsList',
+    ) as FormArray;
+    const hasAnyFinding = findingsList.controls.some((ctrl) => {
+      const val = (ctrl as FormGroup).get('significantFindingsProvided')?.value;
+      return val !== null && val !== undefined && val !== '';
+    });
+    if (hasAnyFinding) {
       this.enableIsHistory = true;
     } else {
+      this.generalFindingsForm.controls['isForHistory'].patchValue(null);
       this.enableIsHistory = false;
     }
   }
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 fe8657ef..9c83ab6b 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
@@ -70,7 +70,6 @@
             getFormValueChanged();
             trackFieldInteraction('Medicine Form Selection')
           "
-          required
         >
           <mat-option
             *ngFor="let item of drugFormMaster"
@@ -98,7 +97,6 @@
           (keyup)="filterMedicine(tempDrugName)"
           (blur)="reEnterMedicine()"
           (focus)="trackFieldInteraction('Medicine Name Input')"
-          required
           [matAutocomplete]="autoGroup"
         />
         <mat-autocomplete
@@ -129,7 +127,6 @@
           [(ngModel)]="currentPrescription.dose"
           [disabled]="!currentPrescription.drugID"
           (selectionChange)="trackFieldInteraction('Dosage Selection')"
-          required
         >
           <mat-option
             *ngFor="let item of filteredDrugDoseMaster"
@@ -152,7 +149,6 @@
           [(ngModel)]="currentPrescription.frequency"
           [disabled]="!currentPrescription.drugID"
           (selectionChange)="trackFieldInteraction('Frequency Selection')"
-          required
         >
           <mat-option
             *ngFor="let item of drugFrequencyMaster"
@@ -225,7 +221,6 @@
           [(ngModel)]="currentPrescription.qtyPrescribed"
           [disabled]="!currentPrescription.drugID"
           (selectionChange)="trackFieldInteraction('Quantity Selection')"
-          required
         >
           <mat-option
             *ngFor="let item of drugDurationMaster | slice: 0 : 5"
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 b85450f3..2e9a3f7f 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
@@ -725,7 +725,6 @@ <h4>
                       name="form"
                       [(ngModel)]="tempform"
                       (selectionChange)="getFormValueChanged()"
-                      required
                     >
                       <mat-option
                         *ngFor="let item of drugFormMaster"
@@ -751,7 +750,6 @@ <h4>
                       [(ngModel)]="tempDrugName"
                       (keyup)="filterMedicine(tempDrugName)"
                       (blur)="reEnterMedicine()"
-                      required
                       [matAutocomplete]="autoGroup"
                     />
                     <mat-autocomplete
@@ -784,7 +782,6 @@ <h4>
                       name="dose"
                       [(ngModel)]="currentPrescription.dose"
                       [disabled]="!currentPrescription.drugID"
-                      required
                     >
                       <mat-option
                         *ngFor="let item of filteredDrugDoseMaster"
@@ -805,7 +802,6 @@ <h4>
                       name="frequency"
                       [(ngModel)]="currentPrescription.frequency"
                       [disabled]="!currentPrescription.drugID"
-                      required
                     >
                       <mat-option
                         *ngFor="let item of drugFrequencyMaster"
@@ -829,7 +825,6 @@ <h4>
                       name="duration"
                       [(ngModel)]="currentPrescription.duration"
                       [disabled]="!currentPrescription.drugID"
-                      required
                     >
                       <mat-option
                         *ngFor="let item of drugDurationMaster"
@@ -850,7 +845,6 @@ <h4>
                       name="unit"
                       [(ngModel)]="currentPrescription.unit"
                       [disabled]="!currentPrescription.drugID"
-                      required
                     >
                       <mat-option
                         *ngFor="let item of drugDurationUnitMaster"
@@ -878,7 +872,6 @@ <h4>
                       name="quantity"
                       [(ngModel)]="currentPrescription.qtyPrescribed"
                       [disabled]="!currentPrescription.drugID"
-                      required
                     >
                       <mat-option
                         *ngFor="let item of drugDurationMaster | slice: 0 : 5"
diff --git a/src/app/app-modules/nurse-doctor/workarea/workarea.component.ts b/src/app/app-modules/nurse-doctor/workarea/workarea.component.ts
index d88598a6..c4698659 100644
--- a/src/app/app-modules/nurse-doctor/workarea/workarea.component.ts
+++ b/src/app/app-modules/nurse-doctor/workarea/workarea.component.ts
@@ -2937,32 +2937,6 @@ export class WorkareaComponent
         }
       }
     }
-    // Ensure doctor has added at least one prescription
-    if (this.attendant === 'doctor') {
-      try {
-        const drugPrescriptionForm = <FormGroup>(
-          (caseRecordForm && caseRecordForm.controls
-            ? caseRecordForm.controls['drugPrescriptionForm']
-            : null)
-        );
-        if (drugPrescriptionForm) {
-          let prescribedDrugs =
-            drugPrescriptionForm.value &&
-            drugPrescriptionForm.value.prescribedDrugs
-              ? drugPrescriptionForm.value.prescribedDrugs
-              : [];
-          prescribedDrugs = prescribedDrugs.filter((d: any) => !!d.createdBy);
-          if (!prescribedDrugs || prescribedDrugs.length === 0) {
-            required.push(
-              this.current_language_set?.Prescription?.prescriptionRequired ||
-                'Please add at least one prescription',
-            );
-          }
-        }
-      } catch (err) {
-        console.warn('Error validating prescription presence', err);
-      }
-    }
 
     if (required.length) {
       this.confirmationService.notify(
@@ -3661,7 +3635,8 @@ export class WorkareaComponent
           (res: any) => {
             if (res.statusCode === 200 && res.data !== null) {
               this.confirmationService.alert(
-                this.current_language_set.alerts.info.datafillSuccessfully,
+                this.current_language_set?.alerts?.info?.datafillSuccessfully ??
+                  'Data saved successfully',
                 'success',
               );
               this.navigateToNurseWorklist();
@@ -3925,13 +3900,15 @@ export class WorkareaComponent
                   labTestOrders.length > 0
                 ) {
                   this.confirmationService.alert(
-                    this.current_language_set.alerts.info.datafillSuccessfully,
+                    this.current_language_set?.alerts?.info
+                      ?.datafillSuccessfully ?? 'Data saved successfully',
                     'success',
                   );
                   this.navigateToSpecialistWorklist();
                 } else {
                   this.getHealthIDDetails(
-                    this.current_language_set.alerts.info.datafillSuccessfully,
+                    this.current_language_set?.alerts?.info
+                      ?.datafillSuccessfully ?? 'Data saved successfully',
                   );
                 }
               } else {
@@ -3943,13 +3920,15 @@ export class WorkareaComponent
                     this.schedulerData !== null)
                 ) {
                   this.confirmationService.alert(
-                    this.current_language_set.alerts.info.datafillSuccessfully,
+                    this.current_language_set?.alerts?.info
+                      ?.datafillSuccessfully ?? 'Data saved successfully',
                     'success',
                   );
                   this.navigateToDoctorWorklist();
                 } else {
                   this.getHealthIDDetails(
-                    this.current_language_set.alerts.info.datafillSuccessfully,
+                    this.current_language_set?.alerts?.info
+                      ?.datafillSuccessfully ?? 'Data saved successfully',
                   );
                 }
               }
@@ -4103,7 +4082,8 @@ export class WorkareaComponent
           (res: any) => {
             if (res.statusCode === 200 && res.data !== null) {
               this.confirmationService.alert(
-                this.current_language_set.alerts.info.datafillSuccessfully,
+                this.current_language_set?.alerts?.info?.datafillSuccessfully ??
+                  'Data saved successfully',
                 'success',
               );
               this.navigateToNurseWorklist();
@@ -4179,7 +4159,8 @@ export class WorkareaComponent
           (res: any) => {
             if (res.statusCode === 200 && res.data !== null) {
               this.confirmationService.alert(
-                this.current_language_set.alerts.info.datafillSuccessfully,
+                this.current_language_set?.alerts?.info?.datafillSuccessfully ??
+                  'Data saved successfully',
                 'success',
               );
               this.navigateToNurseWorklist();
@@ -4212,7 +4193,8 @@ export class WorkareaComponent
           (res: any) => {
             if (res.statusCode === 200 && res.data !== null) {
               this.confirmationService.alert(
-                this.current_language_set.alerts.info.datafillSuccessfully,
+                this.current_language_set?.alerts?.info?.datafillSuccessfully ??
+                  'Data saved successfully',
                 'success',
               );
               this.navigateToNurseWorklist();
@@ -4248,7 +4230,8 @@ export class WorkareaComponent
           (res: any) => {
             if (res.statusCode === 200 && res.data !== null) {
               this.confirmationService.alert(
-                this.current_language_set.alerts.info.datafillSuccessfully,
+                this.current_language_set?.alerts?.info?.datafillSuccessfully ??
+                  'Data saved successfully',
                 'success',
               );
               this.navigateToNurseWorklist();
@@ -4309,13 +4292,15 @@ export class WorkareaComponent
                     this.schedulerData !== null)
                 ) {
                   this.confirmationService.alert(
-                    this.current_language_set.alerts.info.datafillSuccessfully,
+                    this.current_language_set?.alerts?.info
+                      ?.datafillSuccessfully ?? 'Data saved successfully',
                     'success',
                   );
                   this.navigateToDoctorWorklist();
                 } else {
                   this.getHealthIDDetails(
-                    this.current_language_set.alerts.info.datafillSuccessfully,
+                    this.current_language_set?.alerts?.info
+                      ?.datafillSuccessfully ?? 'Data saved successfully',
                   );
                 }
               }
@@ -4389,7 +4374,8 @@ export class WorkareaComponent
           (res: any) => {
             if (res.statusCode === 200 && res.data !== null) {
               this.confirmationService.alert(
-                this.current_language_set.alerts.info.datafillSuccessfully,
+                this.current_language_set?.alerts?.info?.datafillSuccessfully ??
+                  'Data saved successfully',
                 'success',
               );
               this.navigateToNurseWorklist();
@@ -4423,7 +4409,8 @@ export class WorkareaComponent
           (res: any) => {
             if (res.statusCode === 200 && res.data !== null) {
               this.confirmationService.alert(
-                this.current_language_set.alerts.info.datafillSuccessfully,
+                this.current_language_set?.alerts?.info?.datafillSuccessfully ??
+                  'Data saved successfully',
                 'success',
               );
               this.navigateToNurseWorklist();
@@ -4466,13 +4453,15 @@ export class WorkareaComponent
       this.testsPrescribed.laboratoryList.length > 0
     ) {
       this.confirmationService.alert(
-        this.current_language_set.alerts.info.datafillSuccessfully,
+        this.current_language_set?.alerts?.info?.datafillSuccessfully ??
+          'Data saved successfully',
         'success',
       );
       this.navigateToSpecialistWorklist();
     } else {
       this.getHealthIDDetails(
-        this.current_language_set.alerts.info.datafillSuccessfully,
+        this.current_language_set?.alerts?.info?.datafillSuccessfully ??
+          'Data saved successfully',
       );
     }
   }
@@ -4490,13 +4479,15 @@ export class WorkareaComponent
       (this.schedulerData !== undefined && this.schedulerData !== null)
     ) {
       this.confirmationService.alert(
-        this.current_language_set.alerts.info.datafillSuccessfully,
+        this.current_language_set?.alerts?.info?.datafillSuccessfully ??
+          'Data saved successfully',
         'success',
       );
       this.navigateToDoctorWorklist();
     } else {
       this.getHealthIDDetails(
-        this.current_language_set.alerts.info.datafillSuccessfully,
+        this.current_language_set?.alerts?.info?.datafillSuccessfully ??
+          'Data saved successfully',
       );
     }
   }
@@ -4508,7 +4499,8 @@ export class WorkareaComponent
         'info',
         successResponseFromAPI +
           '. ' +
-          this.current_language_set.common.doYouWantToLinkCareContext,
+          (this.current_language_set?.common?.doYouWantToLinkCareContext ??
+            'Do you want to link care context?'),
       )
       .subscribe((res) => {
         if (res) {
@@ -5631,7 +5623,8 @@ export class WorkareaComponent
           (res: any) => {
             if (res.statusCode === 200 && res.data !== null) {
               this.confirmationService.alert(
-                this.current_language_set.alerts.info.datafillSuccessfully,
+                this.current_language_set?.alerts?.info?.datafillSuccessfully ??
+                  'Data saved successfully',
                 'success',
               );
               this.navigateToNurseWorklist();
@@ -5664,7 +5657,8 @@ export class WorkareaComponent
           (res: any) => {
             if (res.statusCode === 200 && res.data !== null) {
               this.confirmationService.alert(
-                this.current_language_set.alerts.info.datafillSuccessfully,
+                this.current_language_set?.alerts?.info?.datafillSuccessfully ??
+                  'Data saved successfully',
                 'success',
               );
               this.navigateToNurseWorklist();
@@ -5694,7 +5688,8 @@ export class WorkareaComponent
           (res: any) => {
             if (res.statusCode === 200 && res.data !== null) {
               this.confirmationService.alert(
-                this.current_language_set.alerts.info.datafillSuccessfully,
+                this.current_language_set?.alerts?.info?.datafillSuccessfully ??
+                  'Data saved successfully',
                 'success',
               );
               this.navigateToNurseWorklist();