diff --git a/Common-UI b/Common-UI
index 6bb2b20..93c9157 160000
--- a/Common-UI
+++ b/Common-UI
@@ -1 +1 @@
-Subproject commit 6bb2b204b7381300cb9d0436c8f57c3fe86cb0e0
+Subproject commit 93c915707165d8ebeefa5c62cc087b08184b261a
diff --git a/pom.xml b/pom.xml
index b9fddb4..6fc0be4 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.4.0</version>
+  <version>3.6.0</version>
   <name>TM-UI</name>
   <description>Piramal - tm: Module ui</description>
   <packaging>war</packaging>
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 b84f229..2beaefb 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"
@@ -26,7 +26,21 @@
         {{ year }} © {{ currentLanguageSet?.coreComponents?.pSMRI }}
       </p>
     </div>
-    <div class="col-4 text-end">
+    <div
+      class="col-3 text-end"
+      style="cursor: pointer"
+      [routerLink]="['/feedback']"
+      [queryParams]="{ sl: 'TM' }"
+      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.ts b/src/app/app-modules/core/components/app-header/app-header.component.ts
index 1f494e0..09af479 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
@@ -161,13 +161,15 @@ export class AppHeaderComponent implements OnInit {
 
   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: 'TM' } })
+        .then((result) => {
+          if (result) {
+            this.changeLanguage('English');
+            this.sessionstorage.clear();
+            sessionStorage.clear();
+          }
+        });
     });
   }
   rolenavigation() {
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 3f01716..9d09575 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,34 +19,6 @@
       <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/core/core.module.ts b/src/app/app-modules/core/core.module.ts
index 24d5a86..9cf2920 100644
--- a/src/app/app-modules/core/core.module.ts
+++ b/src/app/app-modules/core/core.module.ts
@@ -90,6 +90,7 @@ import { SharedModule } from './components/shared/shared.module';
     WebcamModule,
     MatTableModule,
     SharedModule,
+    RouterModule,
   ],
   declarations: [
     CommonDialogComponent,
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 bf42f9d..60b391e 100644
--- a/src/app/app-modules/core/services/http-interceptor.service.ts
+++ b/src/app/app-modules/core/services/http-interceptor.service.ts
@@ -42,21 +42,32 @@ export class HttpInterceptorService implements HttpInterceptor {
   ): Observable<HttpEvent<any>> {
     const key: any = sessionStorage.getItem('key');
     let modifiedReq = req;
-    if (req.body instanceof FormData) {
-      modifiedReq = req.clone({
-        headers: req.headers.set('Authorization', key || ''),
-      });
+    const isPlatformFeedback =
+      req.url && req.url.toLowerCase().includes('/platform-feedback');
+
+    if (isPlatformFeedback) {
+      // For platform-feedback: remove Authorization and force JSON content-type
+      const headers = req.headers
+        .delete('Authorization')
+        .set('Content-Type', 'application/json');
+      modifiedReq = req.clone({ headers });
     } else {
-      if (key !== undefined && key !== null) {
+      if (req.body instanceof FormData) {
         modifiedReq = req.clone({
-          headers: req.headers
-            .set('Authorization', key)
-            .set('Content-Type', 'application/json'),
+          headers: req.headers.set('Authorization', key || ''),
         });
       } 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(
@@ -73,11 +84,33 @@ export class HttpInterceptorService implements HttpInterceptor {
       catchError((error: HttpErrorResponse) => {
         console.error(error);
         this.spinnerService.setLoading(false);
+
+        if(error.status === 401){
+          this.sessionstorage.clear();
+          this.confirmationService.alert(this.currentLanguageSet.sessionExpiredPleaseLogin, 'error');
+          setTimeout(() => this.router.navigate(['/login']), 0);
+        } else if (error.status === 403) {
+          this.confirmationService.alert(
+            this.currentLanguageSet.accessDenied,
+            'error',
+          );
+        } else if (error.status === 500) {
+          this.confirmationService.alert(
+            this.currentLanguageSet.internaleServerError,
+            'error',
+          );
+        } else {
+          this.confirmationService.alert(
+            error.message || this.currentLanguageSet.somethingWentWrong,
+            'error',
+          );
+        }
         return throwError(error.error);
       }),
     );
   }
 
+
   private onSuccess(url: string, response: any): void {
     if (this.timerRef) clearTimeout(this.timerRef);
 
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 63259ef..8e5d7f7 100644
--- a/src/app/app-modules/core/services/http-service.service.ts
+++ b/src/app/app-modules/core/services/http-service.service.ts
@@ -21,8 +21,15 @@ export class HttpServiceService {
 
   constructor(
     private _http: HttpClient,
-    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,6 +41,8 @@ export class HttpServiceService {
   getCurrentLanguage(response: any) {
     console.log('here at one', response);
     this.language = response;
+    localStorage.setItem('appLanguage', JSON.stringify(response));
+
     console.log('teste', this.language);
     this.appCurrentLanguge.next(response);
     console.log('here at two', this.appCurrentLanguge.value);
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 6f1bb21..ca8cd55 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
@@ -189,7 +189,10 @@ export class GeneralOpdDiagnosisComponent
         (<FormGroup>diagnosisArrayList.at(i)).controls[
           'viewProvisionalDiagnosisProvided'
         ].disable();
-        this.addDiagnosis();
+
+        if (diagnosisArrayList.length < savedDiagnosisData.length) {
+          this.addDiagnosis();
+        }
       }
     }
   }
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 207558c..9806866 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
@@ -129,7 +129,7 @@ <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>
     
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 0bc6ef3..2a564e7 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
@@ -181,7 +181,9 @@ export class NcdCareDiagnosisComponent implements OnInit, DoCheck {
         (<FormGroup>diagnosisArrayList.at(i)).controls[
           'viewProvisionalDiagnosisProvided'
         ].disable();
-        this.addDiagnosis();
+        if (diagnosisArrayList.length < savedDiagnosisData.length) {
+          this.addDiagnosis();
+        }
       }
     }
   }
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 bfdb32b..205c023 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
@@ -22,7 +22,7 @@ <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>
               
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 02e6e2b..ac20b76 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
@@ -220,7 +220,9 @@ export class NcdScreeningDiagnosisComponent
         (<FormGroup>diagnosisArrayList.at(i)).controls[
           'viewProvisionalDiagnosisProvided'
         ].disable();
-        this.addDiagnosis();
+        if (diagnosisArrayList.length < savedDiagnosisData.length) {
+          this.addDiagnosis();
+        }
       }
     }
   }
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 e77880e..1880b06 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
@@ -281,9 +281,9 @@ export class PncDiagnosisComponent
       .subscribe((res: any) => {
         if (res && res.statusCode === 200 && res.data && res.data.diagnosis) {
           this.generalDiagnosisForm.patchValue(res.data.diagnosis);
-          if (res.data.diagnosis.provisionalDiagnosisList) {
+          if (res.data.diagnosis) {
             this.patchDiagnosisDetails(
-              res.data.diagnosis.provisionalDiagnosisList,
+              res.data.diagnosis
             );
           }
         }
@@ -297,6 +297,8 @@ export class PncDiagnosisComponent
     this.handleDiagnosisData(diagnosis);
   }
   handleDiagnosisData(diagnosis: any) {
+        console.log("provisionalDiagnosisDataList dia", diagnosis.provisionalDiagnosisList);
+
     if (
       diagnosis.provisionalDiagnosisList &&
       diagnosis.provisionalDiagnosisList.length > 0
@@ -315,8 +317,13 @@ export class PncDiagnosisComponent
     const provisionalDiagnosisList = this.generalDiagnosisForm.controls[
       'provisionalDiagnosisList'
     ] as FormArray;
+
+    console.log("provisionalDiagnosisDataList", provisionalDiagnosisDataList);
+    
+
     for (let i = 0; i < provisionalDiagnosisDataList.length; i++) {
       provisionalDiagnosisList.at(i).patchValue({
+        provisionalDiagnosis: provisionalDiagnosisDataList[i].term,
         viewProvisionalDiagnosisProvided: provisionalDiagnosisDataList[i].term,
         term: provisionalDiagnosisDataList[i].term,
         conceptID: provisionalDiagnosisDataList[i].conceptID,
@@ -324,14 +331,17 @@ export class PncDiagnosisComponent
       (<FormGroup>provisionalDiagnosisList.at(i)).controls[
         'viewProvisionalDiagnosisProvided'
       ].disable();
-      this.addProvisionalDiagnosis();
-    }
+      if (provisionalDiagnosisList.length < provisionalDiagnosisDataList.length)
+        this.addProvisionalDiagnosis();
+     }
   }
 
   handleConfirmatoryDiagnosisData(confirmatoryDiagnosisDataList: any) {
     const confirmatoryDiagnosisList = this.generalDiagnosisForm.controls[
       'confirmatoryDiagnosisList'
     ] as FormArray;
+        console.log("confirmatoryDiagnosisDataList", confirmatoryDiagnosisDataList);
+
     for (let i = 0; i < confirmatoryDiagnosisDataList.length; i++) {
       confirmatoryDiagnosisList.at(i).patchValue({
         viewConfirmatoryDiagnosisProvided:
@@ -342,9 +352,7 @@ export class PncDiagnosisComponent
       (<FormGroup>confirmatoryDiagnosisList.at(i)).controls[
         'viewConfirmatoryDiagnosisProvided'
       ].disable();
-      if (
-        confirmatoryDiagnosisList.length < confirmatoryDiagnosisDataList.length
-      )
+      if (confirmatoryDiagnosisList.length < confirmatoryDiagnosisDataList.length)
         this.addConfirmatoryDiagnosis();
     }
   }
@@ -448,6 +456,7 @@ export class PncDiagnosisComponent
 
     // Set the nested and top-level fields
     diagnosisFormGroup.patchValue({
+      provisionalDiagnosis: selected?.term || null,
       viewProvisionalDiagnosisProvided: selected,
       conceptID: selected?.conceptID || null,
       term: selected?.term || null,
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 b37db54..de0762f 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
@@ -204,7 +204,7 @@ export class FindingsComponent implements OnInit, OnDestroy, DoCheck {
   }
 
   doctorMasterDataSubscription: any;
-  getDoctorMasterData() {
+  getDoctorMasterData() {    
     this.doctorMasterDataSubscription =
       this.masterdataService.nurseMasterData$.subscribe((masterData) => {
         if (masterData) {
@@ -212,7 +212,7 @@ export class FindingsComponent implements OnInit, OnDestroy, DoCheck {
           this.chiefComplaintTemporarayList[0] =
             this.chiefComplaintMaster.slice();
 
-          if (this.caseRecordMode === 'view') {
+          if (String(this.caseRecordMode) === 'view') {
             this.beneficiaryRegID =
               this.sessionstorage.getItem('beneficiaryRegID');
             this.visitID = this.sessionstorage.getItem('visitID');
@@ -220,11 +220,14 @@ export class FindingsComponent implements OnInit, OnDestroy, DoCheck {
 
             const specialistFlagString =
               this.sessionstorage.getItem('specialist_flag');
+              
             if (
               this.sessionstorage.getItem('referredVisitCode') ===
                 'undefined' ||
-              this.sessionstorage.getItem('referredVisitCode') === null
+              this.sessionstorage.getItem('referredVisitCode') === null ||
+              this.sessionstorage.getItem('referredVisitCode') === ''
             ) {
+              
               this.getFindingDetails(
                 this.beneficiaryRegID,
                 this.visitID,
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 d730bff..4680ab7 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
@@ -52,7 +52,9 @@ <h4 class="norecord">
           </tr>
         </tbody>
         <tbody *ngIf="filteredLabResults?.length > 0">
-          <ng-container *ngFor="let test of currentLabPagedList; let i = index">
+          <ng-container *ngFor="let test of filteredLabResults 
+                        | paginate: { itemsPerPage: currentLabRowsPerPage, currentPage: currentLabActivePage }; let i = index">
+
             <tr>
               <td
                 [attr.rowspan]="test?.componentList.length + 1"
@@ -85,17 +87,17 @@ <h4 class="norecord">
                   vertical-align: middle;
                 "
               >
-                {{ component?.componentName }}
+                  {{ component?.componentName }}
               </td>
               <td
                 style="width: 110px; word-break: normal; vertical-align: middle"
               >
-                {{ component?.testResultValue }}
+                  {{ component?.testResultValue }}
               </td>
               <td
                 style="width: 150px; word-break: normal; vertical-align: middle"
               >
-                {{ component?.testResultUnit }}
+                  {{ component?.testResultUnit }}
               </td>
               <td
                 style="
@@ -120,7 +122,7 @@ <h4 class="norecord">
             <td colspan="7">
               <pagination-controls
                 class="pull-right"
-                (pageChanged)="currentLabPageChanged($event)"
+               (pageChange)="currentLabActivePage = $event"
                 *ngIf="filteredLabResults.length"
                 previousText="&lsaquo;"
                 nextText="&rsaquo;"
diff --git a/src/app/app-modules/nurse-doctor/case-sheet/cancer-case-sheet/cancer-doctor-diagnosis-case-sheet/cancer-doctor-diagnosis-case-sheet.component.ts b/src/app/app-modules/nurse-doctor/case-sheet/cancer-case-sheet/cancer-doctor-diagnosis-case-sheet/cancer-doctor-diagnosis-case-sheet.component.ts
index 322fa9b..961f30f 100644
--- a/src/app/app-modules/nurse-doctor/case-sheet/cancer-case-sheet/cancer-doctor-diagnosis-case-sheet/cancer-doctor-diagnosis-case-sheet.component.ts
+++ b/src/app/app-modules/nurse-doctor/case-sheet/cancer-case-sheet/cancer-doctor-diagnosis-case-sheet/cancer-doctor-diagnosis-case-sheet.component.ts
@@ -177,20 +177,19 @@ export class CancerDoctorDiagnosisCaseSheetComponent
     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(
-        (response) => {
-          const blob = new Blob([response], { type: response.type });
-          this.showSign(blob);
-        },
-        (err) => {
-          console.log('error');
-        },
-      );
-    } else {
-      console.log('No tCSpecialistUserID found');
-    }
+   const userId =
+      this.beneficiaryDetails?.tCSpecialistUserID ??
+      this.sessionstorage.getItem('userID');
+
+    this.doctorService.downloadSign(userId).subscribe(
+      (response: any) => {
+        const blob = new Blob([response], { type: response.type });
+        this.showSign(blob);
+      },
+      (err: any) => {
+        console.error('Error downloading signature:', err);
+      }
+    );
   }
   showSign(blob: any) {
     const reader = new FileReader();
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 c0786a6..02c4975 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 { RegistrarService } from 'src/app/app-modules/registrar/shared/services/
 import { NurseService, MasterdataService } from '../../../shared/services';
 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',
@@ -100,6 +101,7 @@ export class DoctorDiagnosisCaseSheetComponent
   serviceList = '';
   referralReasonList = '';
   isCovidVaccinationStatusVisible = false;
+  userName: any;
 
   constructor(
     private doctorService: DoctorService,
@@ -122,6 +124,7 @@ export class DoctorDiagnosisCaseSheetComponent
   ngDoCheck() {
     this.assignSelectedLanguage();
   }
+  
   assignSelectedLanguage() {
     const getLanguageJson = new SetLanguageComponent(this.httpServiceService);
     getLanguageJson.setLanguage();
@@ -129,10 +132,10 @@ export class DoctorDiagnosisCaseSheetComponent
   }
 
   ngOnChanges() {
+
     this.ncdScreeningCondition = null;
     if (this.casesheetData) {
-      console.log('cases');
-      console.log(this.casesheetData);
+      this.userName = this.casesheetData?.doctorData?.diagnosis?.createdBy;
       const temp2 = this.casesheetData.nurseData.covidDetails;
       if (this.casesheetData.doctorData.diagnosis.doctorDiagnonsis) {
         this.doctorDiagnosis =
@@ -352,25 +355,24 @@ export class DoctorDiagnosisCaseSheetComponent
           }
         }
       }
-      console.log(
-        'referDetailsForRefer',
-        JSON.stringify(this.referDetails, null, 4),
-      );
       if (
         this.casesheetData &&
         this.casesheetData.doctorData.Refer &&
-        this.referDetails.revisitDate &&
-        !moment(this.referDetails.revisitDate, 'DD/MM/YYYY', true).isValid()
+        this.casesheetData.doctorData.Refer.revisitDate &&
+        !moment(this.casesheetData.doctorData.Refer.revisitDate, 'DD/MM/YYYY', true).isValid()
       ) {
-        const sDate = new Date(this.referDetails.revisitDate);
-        this.referDetails.revisitDate = [
+        const sDate = new Date(this.casesheetData.doctorData.Refer.revisitDate);
+        this.casesheetData.doctorData.Refer.revisitDate = [
           this.padLeft.apply(sDate.getDate()),
           this.padLeft.apply(sDate.getMonth() + 1),
           this.padLeft.apply(sDate.getFullYear()),
         ].join('/');
       }
 
-      this.downloadSign();
+      if (this.casesheetData?.BeneficiaryData?.doctorSignatureFlag) {
+        
+        this.downloadSign();
+      }
       this.getVaccinationTypeAndDoseMaster();
     }
   }
@@ -379,22 +381,32 @@ export class DoctorDiagnosisCaseSheetComponent
     const len = String(10).length - String(this).length + 1;
     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(
-        (response) => {
+ 
+   downloadSign() {
+
+    this.getUserId().subscribe((userId) => {
+      const userIdToUse = this.beneficiaryDetails?.tCSpecialistUserID ?? userId;
+      console.log("User", userIdToUse);
+      
+      this.doctorService.downloadSign(userIdToUse).subscribe(
+        (response: any) => {
           const blob = new Blob([response], { type: response.type });
           this.showSign(blob);
         },
-        (err) => {
-          console.log('error');
+        (err: any) => {
+          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();
     reader.readAsDataURL(blob);
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 fd44873..bedb80f 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
@@ -65,6 +65,7 @@ export class DoctorService {
     otherDetails: any,
     tcRequest: any,
     isSpecialist: any,
+    doctorSignatureFlag: any,
   ) {
     const serviceLineDetails: any =
       this.sessionstorage.getItem('serviceLineDetails');
@@ -115,6 +116,7 @@ export class DoctorService {
       createdBy: this.sessionstorage.getItem('userName'),
       tcRequest: tcRequest,
       isSpecialist: isSpecialist,
+      doctorSignatureFlag: doctorSignatureFlag,
     };
 
     console.log(
@@ -145,8 +147,7 @@ export class DoctorService {
     return this.http.get(
       environment.specialistWorkListURL +
         this.sessionstorage.getItem('providerServiceID') +
-        `/${this.sessionstorage.getItem('serviceID')}/${this.sessionstorage.getItem(
-          'userID',
+        `/${this.sessionstorage.getItem('serviceID')},
         )}`,
     );
   }
@@ -165,8 +166,7 @@ export class DoctorService {
     return this.http.get(
       environment.specialistFutureWorkListURL +
         this.sessionstorage.getItem('providerServiceID') +
-        `/${this.sessionstorage.getItem('serviceID')}/${this.sessionstorage.getItem(
-          'userID',
+        `/${this.sessionstorage.getItem('serviceID')},
         )}`,
     );
   }
@@ -233,6 +233,7 @@ export class DoctorService {
     cancerForm: any,
     tcRequest: any,
     isSpecialist: any,
+    doctorSignatureFlag: any,
   ) {
     const serviceLineDetails: any =
       this.sessionstorage.getItem('serviceLineDetails');
@@ -263,7 +264,9 @@ export class DoctorService {
       diagnosisDetails,
       referDetails,
       otherDetails,
-      { isSpecialist: isSpecialist },
+      { isSpecialist: isSpecialist,
+        doctorSignatureFlag: doctorSignatureFlag
+       },
     );
     const cancerRequest = Object.assign({
       tcRequest: tcRequest,
@@ -560,6 +563,7 @@ export class DoctorService {
     consultationData: any,
     tcRequest: any,
     isSpecialist: any,
+    doctorSignatureFlag: any,
   ) {
     const serviceLineDetails: any =
       this.sessionstorage.getItem('serviceLineDetails');
@@ -582,6 +586,7 @@ export class DoctorService {
       vanID: vanID,
       tcRequest: tcRequest,
       isSpecialist: isSpecialist,
+      doctorSignatureFlag: doctorSignatureFlag,
     };
     const quickConsultation = Object.assign(
       {},
@@ -599,6 +604,7 @@ export class DoctorService {
     consultationData: any,
     tcRequest: any,
     isSpecialist: any,
+    doctorSignatureFlag: any
   ) {
     const serviceLineDetails: any =
       this.sessionstorage.getItem('serviceLineDetails');
@@ -621,6 +627,7 @@ export class DoctorService {
       vanID: vanID,
       tcRequest: tcRequest,
       isSpecialist: isSpecialist,
+      doctorSignatureFlag: doctorSignatureFlag
     };
     const quickConsultation = Object.assign(
       {},
@@ -741,6 +748,7 @@ export class DoctorService {
     otherDetails: any,
     tcRequest: any,
     isSpecialist: any,
+    doctorSignatureFlag: any
   ) {
     const serviceLineDetails: any =
       this.sessionstorage.getItem('serviceLineDetails');
@@ -789,6 +797,7 @@ export class DoctorService {
       createdBy: this.sessionstorage.getItem('userName'),
       tcRequest: tcRequest,
       isSpecialist: isSpecialist,
+      doctorSignatureFlag: doctorSignatureFlag
     };
 
     console.log(
@@ -874,6 +883,7 @@ export class DoctorService {
     otherDetails: any,
     tcRequest: any,
     isSpecialist: any,
+    doctorSignatureFlag: any
   ) {
     const serviceLineDetails: any =
       this.sessionstorage.getItem('serviceLineDetails');
@@ -925,6 +935,7 @@ export class DoctorService {
       createdBy: this.sessionstorage.getItem('userName'),
       tcRequest: tcRequest,
       isSpecialist: isSpecialist,
+      doctorSignatureFlag: doctorSignatureFlag
     };
 
     console.log(
@@ -951,6 +962,7 @@ export class DoctorService {
     otherDetails: any,
     tcRequest: any,
     isSpecialist: any,
+    doctorSignatureFlag: any
   ) {
     const serviceLineDetails: any =
       this.sessionstorage.getItem('serviceLineDetails');
@@ -1001,6 +1013,7 @@ export class DoctorService {
       createdBy: this.sessionstorage.getItem('userName'),
       tcRequest: tcRequest,
       isSpecialist: isSpecialist,
+      doctorSignatureFlag: doctorSignatureFlag
     };
 
     console.log(
@@ -2320,6 +2333,7 @@ export class DoctorService {
     otherDetails: any,
     tcRequest: any,
     isSpecialist: any,
+    doctorSignatureFlag: any,
   ) {
     const serviceLineDetails: any =
       this.sessionstorage.getItem('serviceLineDetails');
@@ -2367,6 +2381,7 @@ export class DoctorService {
       createdBy: this.sessionstorage.getItem('userName'),
       tcRequest: tcRequest,
       isSpecialist: isSpecialist,
+      doctorSignatureFlag: doctorSignatureFlag,
     };
 
     console.log(
@@ -2595,6 +2610,7 @@ export class DoctorService {
     visitCategory: any,
     otherDetails: any,
     tcRequest: any,
+    doctorSignatureFlag: any
   ): Observable<object> {
     const serviceLineDetails: any =
       this.sessionstorage.getItem('serviceLineDetails');
@@ -2646,6 +2662,7 @@ export class DoctorService {
       createdBy: this.sessionstorage.getItem('userName'),
       tcRequest: tcRequest,
       isSpecialist: otherDetails.isSpecialist,
+      doctorSignatureFlag: doctorSignatureFlag
     };
 
     console.log(
@@ -2799,6 +2816,7 @@ export class DoctorService {
   saveSpecialistCancerObservation(
     specialistDiagonosis: any,
     otherDetails: any,
+    doctorSignatureFlag: any,
   ) {
     const diagnosisDetails =
       specialistDiagonosis.controls.patientCaseRecordForm.value;
@@ -2811,6 +2829,7 @@ export class DoctorService {
       referDetails,
       diagnosisDetails,
       otherDetails,
+      { doctorSignatureFlag: doctorSignatureFlag },
     );
     console.log(
       'saveSpecialistCancerObservation',
@@ -2843,10 +2862,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({
@@ -2993,4 +3018,8 @@ export class DoctorService {
   getAssessmentDet(assessmentId: any) {
     return this.http.get(environment.getAssessmentUrl + '/' + assessmentId);
   }
+
+  checkUsersignatureExist(userID: any) {
+    return this.http.get(environment.checkUsersignExistUrl + userID);
+  }
 }
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 79bb379..27773c0 100644
--- a/src/app/app-modules/nurse-doctor/workarea/workarea.component.ts
+++ b/src/app/app-modules/nurse-doctor/workarea/workarea.component.ts
@@ -156,6 +156,7 @@ export class WorkareaComponent
   idrsScreeningForm!: FormGroup;
   patientCaseRecordForm!: FormGroup;
   patientReferForm!: FormGroup;
+  doctorSignatureFlag = false;
 
   constructor(
     private router: Router,
@@ -258,7 +259,16 @@ export class WorkareaComponent
     this.getVisitReasonAndCategory();
     this.getVisitType();
     this.getPregnancyStatus();
+
+     this.doctorService
+      .checkUsersignatureExist(this.sessionstorage.getItem('userID'))
+      .subscribe((res: any) => {
+        if (res.statusCode === 200 && res.data !== null) {
+          this.doctorSignatureFlag = res.data.signStatus;
+        }
+      });
   }
+
   setVitalsUpdateButtonValue() {
     this.enableVitalsButtonSubscription =
       this.doctorService.enableVitalsUpdateButton$.subscribe((response) =>
@@ -1063,6 +1073,7 @@ export class WorkareaComponent
           temp,
           this.schedulerData,
           this.isSpecialist,
+          this.doctorSignatureFlag
         )
         .subscribe(
           (res: any) => {
@@ -1149,6 +1160,7 @@ export class WorkareaComponent
           .saveSpecialistCancerObservation(
             this.patientMedicalForm,
             otherDetails,
+            this.doctorSignatureFlag
           )
           .subscribe(
             (res: any) => {
@@ -1177,6 +1189,7 @@ export class WorkareaComponent
             visitCategory,
             otherDetails,
             this.schedulerData,
+            this.doctorSignatureFlag
           )
           .subscribe(
             (res: any) => {
@@ -1248,6 +1261,7 @@ export class WorkareaComponent
             visitCategory,
             otherDetails,
             this.schedulerData,
+            this.doctorSignatureFlag
           )
           .subscribe(
             (res: any) => {
@@ -1419,6 +1433,7 @@ export class WorkareaComponent
           this.patientMedicalForm,
           this.schedulerData,
           this.isSpecialist,
+          this.doctorSignatureFlag
         )
         .subscribe(
           (res: any) => {
@@ -1679,6 +1694,11 @@ export class WorkareaComponent
       );
 
       const diagForm3 = <FormGroup>diagForm2.controls[0];
+      if (diagForm3.controls['viewProvisionalDiagnosisProvided'].errors) {  
+          required.push(  
+            this.current_language_set.DiagnosisDetails.provisionaldiagnosis  
+          );  
+        }
 
       if (!diagForm3.controls['viewProvisionalDiagnosisProvided'].errors) {
         diagForm2.value.filter((item: any) => {
@@ -2742,6 +2762,8 @@ export class WorkareaComponent
           { quickConsultation: patientQuickConsultFormValue },
           this.schedulerData,
           this.isSpecialist,
+          this.doctorSignatureFlag
+
         )
         .subscribe(
           (res: any) => {
@@ -2804,6 +2826,7 @@ export class WorkareaComponent
           { quickConsultation: patientQuickConsultDetails },
           this.schedulerData,
           this.isSpecialist,
+          this.doctorSignatureFlag,
         )
         .subscribe(
           (res: any) => {
@@ -2969,6 +2992,7 @@ export class WorkareaComponent
           temp,
           this.schedulerData,
           this.isSpecialist,
+          this.doctorSignatureFlag,
         )
         .subscribe(
           (res: any) => {
@@ -3178,6 +3202,7 @@ export class WorkareaComponent
           temp,
           this.schedulerData,
           this.isSpecialist,
+          this.doctorSignatureFlag
         )
         .subscribe(
           (res: any) => {
@@ -3407,6 +3432,7 @@ export class WorkareaComponent
           temp,
           this.schedulerData,
           this.isSpecialist,
+          this.doctorSignatureFlag
         )
         .subscribe(
           (res: any) => {
@@ -3451,6 +3477,7 @@ export class WorkareaComponent
           temp,
           this.schedulerData,
           this.isSpecialist,
+          this.doctorSignatureFlag
         )
         .subscribe(
           (res: any) => {
diff --git a/src/app/app-modules/service-point/service-point-resolve.service.ts b/src/app/app-modules/service-point/service-point-resolve.service.ts
index 61a1653..ea6019b 100644
--- a/src/app/app-modules/service-point/service-point-resolve.service.ts
+++ b/src/app/app-modules/service-point/service-point-resolve.service.ts
@@ -38,9 +38,8 @@ export class ServicePointResolve implements Resolve<any> {
   resolve(route: ActivatedRouteSnapshot) {
     const serviceProviderId: any =
       this.sessionstorage.getItem('providerServiceID');
-    const userId: any = this.sessionstorage.getItem('userID');
     return this.servicePointService
-      .getServicePoints(userId, serviceProviderId)
+      .getServicePoints( serviceProviderId)
       .pipe(
         map((res: any) => {
           if (res) {
diff --git a/src/app/app-modules/service-point/service-point.service.ts b/src/app/app-modules/service-point/service-point.service.ts
index 419805f..9f6501e 100644
--- a/src/app/app-modules/service-point/service-point.service.ts
+++ b/src/app/app-modules/service-point/service-point.service.ts
@@ -32,9 +32,8 @@ export class ServicePointService {
     readonly sessionstorage: SessionStorageService,
   ) {}
 
-  getServicePoints(userId: string, serviceProviderId: string) {
+  getServicePoints( serviceProviderId: string) {
     return this.http.post(environment.servicePointUrl, {
-      userID: userId,
       providerServiceMapID: serviceProviderId,
     });
   }
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index cd1064a..f3701da 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/assets/Assamese.json b/src/assets/Assamese.json
index e19837d..7fbbd55 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": "নার্চ",
@@ -17,7 +29,7 @@
       "visit": "ভিজিট বা ভ্ৰমণ",
       "current": "বর্তমান টি.চি.",
       "future": "ভৱিষ্যতৰ টি.চি",
-      "referred": "MMU Referred"
+      "referred": "এমএমইউ উল্লেখিত"
     },
     "tabs": {
       "current": "বর্তমান",
@@ -108,18 +120,18 @@
       "minCharRequired": "অনুগ্ৰহ কৰি অতিকমেও ২টা বর্ণ (কেৰেক্টাৰ) প্ৰদান কৰক",
       "mobNoMandatory": "মোবাইল নম্বৰ আৱশ্যক",
       "minDigitsRequired": "অনুগ্ৰহ কৰি ১০ সংখ্যাৰ নম্বৰ প্ৰদান কৰক",
-      "ageMandatory":"Age is required",
-      "fatherNameMandatory":"Father's Name is required"
+      "ageMandatory": "Age is required",
+      "fatherNameMandatory": "Father's Name is required"
     },
     "common": {
-      "diabetes":"Diabetes",
+      "diabetes": "Diabetes",
       "epilepsy": "Epilepsy",
       "asthma": "Asthma",
       "visionScreening": "Vision Screening",
       "tuberculosisScreening": "Tuberculosis Screening",
       "malariaScreening": "Malaria Screening",
       "term": "ম্যাদ",
-      "doYouWantToLinkCareContext": "Do you want to link Care Context?",
+      "doYouWantToLinkCareContext": "আপুনি কি কেয়াৰ কনটেক্সটৰ লগত সংযুক্ত হ’ব খুজিছে?",
       "moderate": "মজলীয়া",
       "higher": "উচ্চতৰ",
       "weight": "ওজন",
@@ -135,7 +147,7 @@
       "kindlyMark": "তলৰ ৰেখাচিত্ৰত অনুগ্ৰহ কৰি চিহ্নিত কৰক",
       "update": "আপডেট কৰক",
       "month": "মাহ",
-      "ok": "হ'ব", 
+      "ok": "হ'ব",
       "enterDigitAadharNumber": "১২টা সংখ্যা থকা আধাৰ নম্বৰ ভৰাওঁক",
       "enterCharacterVoterID": "10টা সংখ্যা থকা ভোটাৰ চিনাক্তকৰণ নম্বৰ ভৰাওঁক",
       "enterCharacterDrivingLicenseID": "8টা সংখ্যা থকা চালকৰ অনুজ্ঞাপত্ৰ চিনাক্তকৰণ (ড্ৰাইভিং লাইচেঞ্চ) নম্বৰ ভৰাওঁক",
@@ -149,7 +161,7 @@
       "MedicineAlreadyPrescribed": "ঔষধৰ বিধান আগতেই দিয়া হৈছে, অনুগ্রহ কৰি আগতে যোগ কৰা বোৰ ডিলিট কৰক",
       "DurationannotGreater": "সময়ৰ ব্যাপ্তি বয়সতকৈ ডাঙৰ হব নোৱাৰে",
       "MaximumDiagnosisAdded": "আটাইতকৈ বেছি ৩০ টা ডায়েগ্নছিছ যোগ কৰিব পাৰি",
-      "NoCasesheetAvailableNCDScreening": "এন চি ডিৰ স্ক্রীনিংৰ বাবে কোনো কেছ শ্বীট নাই",
+      "NoCasesheetAvailableNCDScreening": "এন চি ডিৰ স্ক্রীনিংৰ বাবে কোনো কেছ শ্বীট নাই",
       "ConfirmtoViewCasesheet": "কেছ শ্বীট চোৱাটো নিশ্চিত কৰক",
       "valueCannotGreater": "মান ৫ ত কৈ ডাঙৰ হব নোৱাৰে",
       "invalidValueMorethan": "অবৈধ মান ( 0 তকৈ বেছি হোৱা উচিত)",
@@ -167,7 +179,7 @@
       "caseRecord": "কেছ ৰেকৰ্ড",
       "search": "বিচৰা",
       "reset": "পুন:স্থাপন কৰা",
-      "generateOTP": "Generate Health ID",
+      "generateOTP": "হেল্থ আই.ডি. উত্পন্ন কৰক",
       "select": "নির্বাচন কৰক",
       "submit": "দাখিল কৰা",
       "close": "বন্ধ",
@@ -221,7 +233,7 @@
       "answer": "উত্তৰ",
       "noCallDetailsFound": "কলৰ কোনো তথ্য পোৱা নগল",
       "load": "লোড",
-      "noVisitFound": "কোনো দৰ্শন পোৱা নাযায়",
+      "noVisitFound": "কোনো দৰ্শন পোৱা নাযায়",
       "visibility": "দৃশ্যমানতা",
       "viewQnA": "প্ৰশ্নোত্তৰ চাওক",
       "id": "আই দি",
@@ -233,7 +245,7 @@
       "otherComplication": "চলিত গৰ্ভাৱস্থাৰ অনান্য অসুবিধা",
       "add": "যোগ কৰা",
       "confirmDiagnosis": "কনফাৰমেটৰী ডায়েগ্নছিছ",
-      "labTest": "পৰীক্ষাৰ প্ৰতিবেদন",
+      "labTest": "পৰীক্ষাৰ প্ৰতিবেদন",
       "annotatedimagereport": "টীকা সংযোগ কৰা চিত্ৰ তথ্য",
       "chevronleft": "চেভৰণ লেফ্ট",
       "arrowupward": "এৰো আপৱার্ড",
@@ -244,31 +256,31 @@
       "allocationDate": "আৱন্টন কৰা তাৰিখ",
       "specialization": "বিশেষত্ব",
       "specialistDetails": "বিশেষজ্ঞৰ সবিশেষ",
-      "hR": "এইছ্ আৰ",
-      "rR": "আৰ আৰ",
+      "hR": "এইছ্ আৰ",
+      "rR": "আৰ আৰ",
       "download": "ডাউনলোড",
       "prevFamilyHistory": "পৰিয়াল পূর্বৰ সবিশেষ তথ্য উপলব্ধ",
       "prevVaccine": "পূৰ্বৱৰ্তী অন্যান্য ভেকছিনৰ বিৱৰণ",
       "prevObsteric": "পূর্বৰ প্ৰসূতী সন্মন্ধীয় (অবষ্টেট্ৰীক) হিষ্ট'ৰী",
-      "beneAlreadyAdded": "নাৰ্চ ৱৰ্কলিস্টত ইতিমধ্যে হিতাধিকাৰী উপস্থিত",
+      "beneAlreadyAdded": "নাৰ্চ ৱৰ্কলিস্টত ইতিমধ্যে হিতাধিকাৰী উপস্থিত",
       "scheduleforTM": "ৰ কাৰণে সূচী",
       "confirmation": "অনুমোদন",
       "YesPregnancyStatus": "হয় গর্ভাবস্থাৰ স্থিতিত",
-      "MMU": "এম এম ইউ",
+      "MMU": "এম এম ইউ",
       "TM": "টিএম",
       "MCTS": "এমচিটিএছ",
-      "LoadMMU": "এম এম ইউ লোড কৰক",
-      "Dashboard": "ডেস্ ব'ৰ্ড",
-      "syncUpdate": "চিঙ্ক আপডেট",
-      "Rangeto": "পৰিসৰ 1000ৰ পৰা 5000 পর্যন্ত ব্যাপ্তি",
-      "LabStart": "লেব আৰম্ভ কৰক",
-      "SelectLanguage": "ভাষা নিৰ্বাচন কৰক",
-      "Pendinglatestresult": "সৰ্বশেষ ফলাফলৰ বাবে অমীমাংসিত",
+      "LoadMMU": "এম এম ইউ লোড কৰক",
+      "Dashboard": "ডেস্ ব'ৰ্ড",
+      "syncUpdate": "চিঙ্ক আপডেট",
+      "Rangeto": "পৰিসৰ 1000ৰ পৰা 5000 পর্যন্ত ব্যাপ্তি",
+      "LabStart": "লেব আৰম্ভ কৰক",
+      "SelectLanguage": "ভাষা নিৰ্বাচন কৰক",
+      "Pendinglatestresult": "সৰ্বশেষ ফলাফলৰ বাবে অমীমাংসিত",
       "loadSyncUpdate": "লোড চিনক্ৰোনাইজেচন আপডেটত",
       "loadDash": "লোড ড্যাচ্‌বোর্ড",
       "loadMcts": "লোড এম.চি.টি.এচ্‌",
       "loadTm": "লোড টি.এম.",
-      "mmu": "এম এম ইউ",
+      "mmu": "এম এম ইউ",
       "submitSlot": "চাব্‌মিট স্লোট",
       "allocation": "আৱন্টন",
       "conformPopUp": "আগবাঢি়বলৈ পপ্‌-আপ নিশ্চিতকৰণ",
@@ -299,7 +311,6 @@
       "startTest": "Start Test"
     },
     "idrs": {
-    
       "screening": "স্ক্ৰীণিং",
       "iDRSScore": "আইডিআৰএছ স্কোৰ",
       "suspectedFor": "সন্দেহকৰা (+-ৰ) বাবে",
@@ -355,7 +366,7 @@
         "unitOfDuration": "ইউনিট অব ডিউৰেচন",
         "description": "বর্ণনা",
         "noCheifComplaint": "নার্চ গ্ৰহণ কৰা মূল অভিযোগৰ সংখ্যা",
-        "selectunitOfDuration": "সময় ব্যাপ্তিৰ একক চয়ন কৰক"
+        "selectunitOfDuration": "সময় ব্যাপ্তিৰ একক চয়ন কৰক"
       },
       "adherenceDetails": {
         "adherence": "বি‍শ্বস্ততা",
@@ -397,9 +408,9 @@
         "tt2Status": "টি টি ২ স্থিতি",
         "ttBoosterStatus": "টি টি বুস্টাৰ অবস্থা",
         "dateReceived": "প্ৰাপ্তিৰ তাৰিখ",
-        "facilityName": "সুবিধাৰ নাম",
-        "govtFacility": "চৰকাৰী সুবিধা",
-        "pvtFacility": "বেচৰকাৰী সুবিধা"
+        "facilityName": "সুবিধাৰ নাম",
+        "govtFacility": "চৰকাৰী সুবিধা",
+        "pvtFacility": "বেচৰকাৰী সুবিধা"
       }
     },
     "pncData": {
@@ -479,13 +490,13 @@
             "typeofReaction": "বিক্ৰিয়াৰ প্ৰকাৰ"
           },
           "previousAllergyhistory": "পূৰ্বৱৰ্তী এলাৰ্জি ইতিহাস",
-            "previousAlcoholhistory": "পূৰ্বৱৰ্তী সুৰাৰ ইতিহাস",
-            "previousTobaccohistory": "পূৰ্বৱৰ্তী ধপাতইতিহাস",
-          "snomedTermRemoved": "Snomed Term removed"
+          "previousAlcoholhistory": "পূৰ্বৱৰ্তী সুৰাৰ ইতিহাস",
+          "previousTobaccohistory": "পূৰ্বৱৰ্তী ধপাতইতিহাস",
+          "snomedTermRemoved": "Snomed শব্দটি মচোৱা হৈছে"
         },
         "familyHistoryDataANC_OPD_NCD_PNC": {
           "familyHistory": "পাৰিবাৰিক ইতিহাস",
-          "diseaseType": "ৰোগৰ প্ৰকাৰ",
+          "diseaseType": "ৰোগৰ প্ৰকাৰ",
           "familyMember": "পৰিয়ালৰ সদস্যসকল",
           "H_geneticDisorders": "এইচ/অ' জেনেটিক বিকাৰ",
           "consanguineousMarriage": "এইচ/অ' কনচাংগুইনিয়াছ বিবাহ",
@@ -502,8 +513,8 @@
       },
       "cancerScreeningHistory": {
         "familyMedical": {
-          "familyMedicalHistory": "পৰিয়ালৰ চিকিৎসাৰ ইতিহাস",
-          "diseaseType": "ৰোগৰ প্ৰকাৰ",
+          "familyMedicalHistory": "পৰিয়ালৰ চিকিৎসাৰ ইতিহাস",
+          "diseaseType": "ৰোগৰ প্ৰকাৰ",
           "otherCancerDetails": "অন্য কর্কটৰোগৰ সবিশেষ",
           "familyMembers": "পৰিয়ালৰ সদস্যসকল"
         },
@@ -511,11 +522,11 @@
           "filtered": "ফিল্টাৰ কৰা হৈছে",
           "nonFiltered": "ফিল্টাৰ নকৰা",
           "personalHistory": "ব্যক্তিগত ইতিহাস",
-          "tobaccoUse": "ধূম্ৰপাণৰ ব্যবহাৰ",
+          "tobaccoUse": "ধূম্ৰপাণৰ ব্যবহাৰ",
           "startAge": "আৰম্ভ কৰাৰ বয়স (বছৰত)",
-          "stopAge": "শেষ কৰাৰ বয়স (বছৰত)",
+          "stopAge": "শেষ কৰাৰ বয়স (বছৰত)",
           "typeofTobaccoProductsused": "ব্যৱহাৰ কৰা ধঁপাতৰ প্ৰকাৰ",
-          "cigarettes": "চিগাৰেট/বিড়িৰ পৰিমাণ/দিন",
+          "cigarettes": "চিগাৰেট/বিড়িৰ পৰিমাণ/দিন",
           "exposuretoSecondHandsmoke": "চেকেণ্ড হেণ্ড স্ম'ক বা পৰোক্ষ ধূমঁপানৰ সংস্পর্শলৈ অহা (>৫ মিনিট)",
           "habitofBetelnutchewing": "তামোল-পান  চুবুৱাৰ অভ্যাস",
           "durationofbetelquidinmouth": "ধঁপাতৰ সোপা মুখত লৈ থকাৰ সময় (মিনিটত)",
@@ -571,7 +582,7 @@
         },
         "otherVaccine": {
           "vaccine": "টিকা (ভেকচিন)",
-          "otherVaccineName":"Other Vaccine Name",
+          "otherVaccineName": "অন্য ভেকচিনৰ নাম",
           "otherVaccines": "অন্যান্য/বৈকল্পিক ভেকছিন",
           "nameofVaccine": "ভেকছিনৰ নাম",
           "vaccineSctCode": "ভেকছিন স্নোমেড চিটি কোড",
@@ -621,10 +632,10 @@
           "postpartumComplication": "প্ৰসোৱত্তৰ কালত হোৱা জটিলতা",
           "newBornComplication": "নৱজাতকজটিলতা",
           "congenitalAnomalies": "নৱজাতকৰ জন্মগত বিসংগতি",
-          "typeOfAbortion":"গৰ্ভপাতৰ প্ৰকাৰ",
+          "typeOfAbortion": "গৰ্ভপাতৰ প্ৰকাৰ",
           "noOfcompletedWeeks": "গৰ্ভধাৰণৰ সম্পূৰ্ণ সপ্তাহৰ সংখ্যা",
           "complicationPostAbortion": "গৰ্ভপাতৰ পিছত জটিলতা",
-          "typeofFacility":"সুবিধাৰ প্ৰকাৰ"
+          "typeofFacility": "সুবিধাৰ প্ৰকাৰ"
         }
       },
       "familyhistory": {
@@ -656,7 +667,7 @@
       "obstetrichistory": {
         "obstetricshistory": "প্ৰসূতী সন্মন্ধীয় হিষ্ট'ৰী",
         "previousobstetrichistory": "পূৰ্বৱৰ্তী প্ৰসূতি ইতিহাসৰ বিৱৰণ",
-        "previousObstetricHist":"পূৰ্বৱৰ্তী প্ৰসূতি ইতিহাস",
+        "previousObstetricHist": "পূৰ্বৱৰ্তী প্ৰসূতি ইতিহাস",
         "pregorder": "গর্ভাৱস্থাৰ স্থিতিত 'হয়'",
         "Pregcomplicationtype": "গর্ভাৱস্থাৰ  জটিলতা প্ৰকাৰ",
         "otherpregcomplication": "গর্ভাৱস্থাৰ অন্য জটিলতা",
@@ -953,10 +964,10 @@
       "cancerScreeningExamination": {
         "symptoms": {
           "symptoms": "লক্ষণবোৰ",
-          "shortnessofbreath": "উশাহ চুটি হোৱা",
+          "shortnessofbreath": "উশাহ চুটি হোৱা",
           "coughweeks": "কাহ >= ২ সপ্তাহ",
           "bloodinsputum": "খেকাৰত তেজ",
-          "difficultyinopeningmouth": "মুখ খোলাত অসুবিধা",
+          "difficultyinopeningmouth": "মুখ খোলাত অসুবিধা",
           "nonhealing": "নুশুকুৱা ঘা",
           "changeInTheToneOfVoice": "স্বৰধ্বনীত হোৱা পৰিৱর্তন",
           "foulsmellingvaginaldischarge": "দুর্গন্ধময় ভেজিনেল ডিচাৰ্জ",
@@ -981,20 +992,20 @@
         },
         "oral": {
           "oralExamamination": "মুখৰ পৰীক্ষা",
-          "limitedmouthopening": "সীমিতভাবে মুখ খোল খোৱা (তৃষ্মাস)",
+          "limitedmouthopening": "সীমিতভাবে মুখ খোল খোৱা (তৃষ্মাস)",
           "premalignantLesions": " প্ৰীমেলিগনেন্ট আঘাত",
           "typeofPremalignantLesions": " প্ৰীমেলিগনেন্ট আঘাতৰ ধৰণ",
           "prolongedirritation": " দাঁত সম্বন্ধীয় দীর্ঘ সময়ৰ বিষ",
-          "chronicburningsensation": "সময়ে সময়ে জিভা বা গালৰ জ্বলা পোৰা কৰা",
+          "chronicburningsensation": "সময়ে সময়ে জিভা বা গালৰ জ্বলা পোৰা কৰা",
           "observations": "পৰ্যবেক্ষণ",
           "otherlesion": "অন্য আঘাত"
         },
         "breast": {
           "breastExamination": "স্তন সম্বন্ধীয় পৰীক্ষা",
-          "everbreastfedachild": "কেতিয়াবা কেচুঁৱাক গাখীৰ খুৱাইচেনে?",
-          "durationofbreastfeeding": "গাখীৰ খুওৱাৰ দিওৰেচন",
-          "less6months": "৬ মাহতকৈ কম",
-          "greater6months": "৬ মাহতকৈ বেচি",
+          "everbreastfedachild": "কেতিয়াবা কেচুঁৱাক গাখীৰ খুৱাইচেনে?",
+          "durationofbreastfeeding": "গাখীৰ খুওৱাৰ দিওৰেচন",
+          "less6months": "৬ মাহতকৈ কম",
+          "greater6months": "৬ মাহতকৈ বেচি",
           "breastsappearnormal": "স্তন যুগল স্বাভাৱিক দেখা যাইনে?",
           "anyrashonthebreast": "স্তনত ৰেচ্ আছে নেকি?",
           "anydimplingofskinonthebreast": "স্তনৰ ছালত ডিম্পলিং আছে নেকি ?",
@@ -1004,11 +1015,11 @@
           "lumpSize": "লাম্পৰ আকাৰ",
           "lumpTexture": "লাম্পৰ গাঁথনি",
           "lumpShape": "লাম্পৰ আকাৰ",
-          "referredtoMammogram": "মেম'গ্ৰামলৈ পথিওৱা"
+          "referredtoMammogram": "মেম'গ্ৰামলৈ পথিওৱা"
         },
         "abdominal": {
           "abdominalExamination": "তল পেটৰ পৰীক্ষা",
-          "abdominalInspection": "তলপেটৰ পৰীক্ষা",
+          "abdominalInspection": "তলপেটৰ পৰীক্ষা",
           "liver": "যকৃৎ",
           "ascites": "এচচিটেচ",
           "anyOtherMass": "অন্য কোনো মাচ",
@@ -1016,18 +1027,18 @@
           "rightPalpable": "সোঁফালৰ পাল্পবল",
           "lymphnode": "লিমফ্ নোড",
           "inguinal": "ইঙ্গুইনেল",
-          "externalIliac": "বাহিৰৰ ইলিয়াক",
-          "paraAortic": "পেৰা এৰ'টিক",
+          "externalIliac": "বাহিৰৰ ইলিয়াক",
+          "paraAortic": "পেৰা এৰ'টিক",
           "observation": "পর্য্যাবে‍ক্ষণ"
         },
         "gynecological": {
           "gynecologicalExamination": "প্রসূতি সম্বন্ধীয় পৰীক্ষা",
           "appearanceunderAceticAcid": "এচিটিক এচিডৰ তলত চার্ভিক্সৰ দৃশ্যমান",
-          "typeoflesion": "আঘাতৰ প্ৰকাৰ",
+          "typeoflesion": "আঘাতৰ প্ৰকাৰ",
           "vulvalInvolvement": "ভলভাল জড়িত",
           "vaginalInvolvement": "যোনি জড়িত",
           "uterus": "ইউটেৰাচ",
-          "sufferedfromanyRTI": "কোনো আৰ টি আই/এচ টি আইৰ পৰা কষ্ট পোৱা",
+          "sufferedfromanyRTI": "কোনো আৰ টি আই/এচ টি আইৰ পৰা কষ্ট পোৱা",
           "rTISuffered": "আৰ.টি.আই/এচ্.টি.এইত ভুগা (যদি কোনো তথ্য উপলব্ধ থাকে‍)",
           "specify": "সূচীযুক্ত",
           "experiencedPostcoitalbleeding": "পস্ট কইটেল ব্লিডিংৰ অভিজ্ঞতা"
@@ -1072,7 +1083,7 @@
       "medicationmmu": "Medicines",
       "bloodpressuremmhg": "ৰক্তচাপ",
       "bloodglucosemg": "তেজত শৰ্কৰা",
-      "bodyweighttrends": "শৰীৰৰ ওজনৰ ধাৰা",
+      "bodyweighttrends": "শৰীৰৰ ওজনৰ ধাৰা",
       "systolic": "চিস্টোলিক",
       "diastolic": "ডাইস্টলিক",
       "postprandial": "প্রন্ডিয়ালৰ ২ ঘন্টা পিচত",
@@ -1092,8 +1103,8 @@
       "SMSadvicemcts": "এচ এম এচ পৰামৰ্শ ",
       "actions": "ক্রিয়া",
       "actionByHao": "এইছ্ এ ও দ্বাৰা কৰা কার্য্য",
-      "actionByMo": "এম ও দ্বাৰা কৰা কার্য্য",
-      "actionByCoPd": "চি ও/ পি ডি দ্বাৰা কৰা কার্য্য",
+      "actionByMo": "এম ও দ্বাৰা কৰা কার্য্য",
+      "actionByCoPd": "চি ও/ পি ডি দ্বাৰা কৰা কার্য্য",
       "bloodPressureTrends": "ৰক্তচাপৰ ধাৰা",
       "bloodGlucoseTrends": "তেজত শৰ্কৰাৰ ধাৰা",
       "nopreviousweightrecordsfound": "আগৰ কোনো ওজনৰ তথ্য পোৱা নগল"
@@ -1142,7 +1153,7 @@
       "externalinvestigations": "বাহ্যিক অনুসন্ধান"
     },
     "Prescription": {
-      "form": "আকাৰ বা প্ৰপত্র",
+      "form": "আকাৰ বা প্ৰপত্র",
       "medicine": "ঔষধ",
       "dosage": "মাত্রা",
       "frequency": "ফ্ৰিকুৱেঞ্চি",
@@ -1155,12 +1166,12 @@
       "labtestreports": "পৰীক্ষাগাৰৰ ৰোগ নির্ণয় পৰীক্ষাৰ ফলাফলসমূহ (ৰিপোর্টচ্‌)",
       "notestresultsfound": "কোনো ধৰণৰ পৰীক্ষণীয় ফল পোৱা নগল",
       "radiologyreports": "ৰেডিঅ'লজী প্ৰতিবেদন",
-      "noradiologyreportsfound": "ৰেডিঅ'লজীৰ কোনো প্ৰতিবেদন পোৱা নগল",
+      "noradiologyreportsfound": "ৰেডিঅ'লজীৰ কোনো প্ৰতিবেদন পোৱা নগল",
       "archivedreports": "মজুত কৰি ৰখা ফলাফল (ৰিপোর্টচ্‌)",
       "visitcode": "দৰ্শন কোড",
       "view": "দর্শন",
-      "noarchivedreportsfound": "কোনো অভিলেখা  প্রতিবেদন পোৱা নগল",
-      "labreport": "পৰীক্ষাগাৰৰ প্ৰতিবেদন",
+      "noarchivedreportsfound": "কোনো অভিলেখা  প্রতিবেদন পোৱা নগল",
+      "labreport": "পৰীক্ষাগাৰৰ প্ৰতিবেদন",
       "radiologyreport": "ৰেডিঅ'লজী প্ৰতিবেদন",
       "testresult": "পৰীক্ষাৰ ফল",
       "unit": "একক"
@@ -1210,12 +1221,12 @@
         "pendingForConsultation": "টেলিফোনৰ দ্বাৰা প্ৰদান কৰা পৰামর্শ (টেলি-কনচাল্‌টেচন)ৰ বাবে ৰৈ থকা",
         "consultationDone": "টেলি-পৰামৰ্শ সম্পন্ন",
         "pendingForTC": "টি.চি.ৰ বাবে ৰৈ থকা (পেণ্ডিং ফৰ টি.চি.)",
-        "tCCancelled": "টি চি বাতিল হৈছে",
+        "tCCancelled": "টি চি বাতিল হৈছে",
         "pendingforLabtestResult": "পৰীক্ষাগাৰৰ ফলাফলৰ বাবে ৰৈ থকা (পেণ্ডিং ফৰ লেবটেষ্ট ৰিজাল্ট)",
         "labtestDone": "পৰীক্ষাগাৰত পৰীক্ষা কৰা হ'ল",
         "consultation_done": "পৰামর্শ প্ৰদান কৰা হ'ল",
-        "fetosenseTest_done": "Fetosense Test Done",
-        "fetosenseTest_pending": "Pending for Fetosense Test result",
+        "fetosenseTest_done": "ফেট’চেন্স পৰীক্ষা সম্পন্ন",
+        "fetosenseTest_pending": "ফেটোসেন্স পৰীক্ষা ফলৰ বাবে অৱসৰৰ বাবে অপেক্ষা",
         "langNotDefinesd": "ভাষআটি নির্দিষ্টকৈ নির্দেশ কৰা হোৱা নাই",
         "comingUpWithThisLang": "আমি এই ভাষাটোৰে সৈতে লৈ আহিছো",
         "sixMakers": "আমাৰ সৰ্বাধিক মাত্ৰ 6 টা মাৰ্কাৰ থাকিব পাৰে",
@@ -1248,7 +1259,7 @@
         "invalidValue": "অবৈধ মান ( 9 ৰ সমান বা সৰু হোৱা উচিত)",
         "valueRange": "মান ৫ ত কৈ ডাঙৰ হব নোৱাৰে",
         "viewCasesheet": "কেছ শ্বীট চোৱাটো নিশ্চিত কৰক",
-        "noCasesheet": "এন চি ডিৰ স্ক্রীনিংৰ বাবে কোনো কেছ শ্বীট নাই",
+        "noCasesheet": "এন চি ডিৰ স্ক্রীনিংৰ বাবে কোনো কেছ শ্বীট নাই",
         "highRiskStatus": "অতিশয় বিপদৰ স্থিতি",
         "maxDiagnosis": "আটাইতকৈ বেছি ৩০ টা ডায়েগ্নছিছ যোগ কৰিব পাৰি",
         "highRisk": "অতিশয় বিপদৰ অবস্থা",
@@ -1273,7 +1284,7 @@
         "issueFacingLocDetails": "অৱস্থিতি বা স্থান (লোকেচন) বিচাৰি উলিওৱাত সমস্যা৷ পুনৰায় চেষ্টা কৰক",
         "inputForSelectedField": "অনুগ্ৰহ কৰি প্ৰথমতে নির্বাচিত ফিল্ডটোৰ বাবে ইনপুট প্ৰদান কৰক - অন্য",
         "beneNotFound": "হিতাধিকাৰীসমূহ বিচাৰি পোৱা নগ'ল",
-        "confirmSubmitBeneficiary": "অনুগ্ৰহ কৰি নাৰ্চ ৱৰ্কলিস্টত হিতাধিকাৰী জমা দিয়াৰ বিষয়টো নিশ্চিত কৰক",
+        "confirmSubmitBeneficiary": "অনুগ্ৰহ কৰি নাৰ্চ ৱৰ্কলিস্টত হিতাধিকাৰী জমা দিয়াৰ বিষয়টো নিশ্চিত কৰক",
         "navigateSearchedData": "আপুনি নেভিগটে কৰবি বিচাৰে নেকি? বিচৰা কোনো তথ্য হেৰাব পাৰে",
         "logoutAndLoginAgain": "আপোনাৰ বেলেগৰ পৰা লগড্‌ কৰা যেন অনুমান কৰা হৈছে, তাৰ পৰা লগড্‌ আউট্‌ কৰক আৰু পিছত চেষ্টা কৰক",
         "priveledgeToAccessLogin": "এপ্লিকেচনটি ইউজাৰে ব্যৱহাৰ কৰাৰ সুবিধা নাই - লগিন",
@@ -1332,7 +1343,7 @@
       "printCaseheet": "কেচ্‌চিট প্ৰিন্ট কৰক",
       "workList": "ৱর্কলিষ্টলৈ যাওঁক",
       "servicePoint": "চাৰ্ভিচ পইন্ট",
-      "beneficiaryDetails": "সেৱা গ্ৰহণকাৰীৰ তথ্য",
+      "beneficiaryDetails": "সেৱা গ্ৰহণকাৰীৰ তথ্য",
       "visitCode": "পৰিদর্শন ক'ড",
       "name": "নাম",
       "consultDate": "পৰামর্শ কৰা তাৰিখ",
@@ -1352,7 +1363,7 @@
       "refer": "প্রেৰণ কৰক",
       "instituteName": "অনুষ্ঠানৰ নাম",
       "addService": "অন্যান্য সেৱা",
-      "docSign": "চিকিৎসকৰ স্বাক্ষৰ",
+      "docSign": "চিকিৎসকৰ স্বাক্ষৰ",
       "sizeRight": "আকাৰ সোফালে",
       "mobilityRight": "চলন সোফালে",
       "lymphName": "লিমফ্ নোড নাম",
@@ -1360,7 +1371,7 @@
       "sizeLeft": "আকাৰ বাওফালে",
       "brestFeed": "স্তন যুগল স্বাভাৱিক দেখা যাইনে?",
       "serialNo": "ক্ৰমিক নং",
-      "typeOfTobacco": "ধূম্ৰপাণ জাতীয় বস্তুৰ ব্যবহাৰ",
+      "typeOfTobacco": "ধূম্ৰপাণ জাতীয় বস্তুৰ ব্যবহাৰ",
       "cigaretteFilter": "চিগাৰেট ফিল্টার্ড",
       "quidDuration": "ধঁপাতৰ সোপা মুখত লৈ থকাৰ সময় (মিনিটত)",
       "print": "প্রিন্ট",
@@ -1382,7 +1393,7 @@
       "tt2": "টিটি ২",
       "ttBoster": "টিটি বুষ্টাৰ ",
       "date": "তাৰিখ",
-      "beniId": "সেৱা গ্ৰহণকাৰীৰ আই ডি",
+      "beniId": "সেৱা গ্ৰহণকাৰীৰ আই ডি",
       "height": "উচ্চতা (ছেমি)",
       "temp": "উষ্ণতা (ফেৰেইহাইট)",
       "weight": "ওজন (কিগ্ৰা)",
@@ -1462,15 +1473,15 @@
       "logout": "লগআউট",
       "user": "ব্যৱহাৰকাৰী",
       "help": "সহায়",
-      "connectBluetooth": "Connect Bluetooth",
-      "selectCallibrationStrip": "Select Callibration Strip",
-      "inTableSearchStripCode": "In-Table Search (Strip Code)",
+      "connectBluetooth": "ব্লুটুথ সংযোগ কৰক",
+      "selectCallibrationStrip": "কলিব্ৰেচন ষ্ট্ৰিপ বাচি লওক",
+      "inTableSearchStripCode": "ইন-টেবুল অনুসন্ধান (ষ্ট্ৰিপ কোড)",
       "sno": "ক্ৰমিক নং",
-      "stripCode": "Strip Code",
-      "expiryDate": "Expiry Date",
+      "stripCode": "ষ্ট্ৰিপ কোড",
+      "expiryDate": "ম্যাদ শেষ হোৱাৰ তাৰিখ",
       "totalPages": "মুঠ পৃষ্ঠা",
-      "selectedCalibrationStripIs": "Selected Calibration Strip is Expired. Do you still want to proceed?",
-      "doYouWantToProceedWithSelectedCalibrationStrip": "Do you want to proceed with selected Calibration Strip?",
+      "selectedCalibrationStripIs": "নিৰ্বাচিত মানাংকন ষ্ট্ৰিপ মেয়াদ উকলি গৈছে। এতিয়াও আগবাঢ়িব বিচাৰেনে?",
+      "doYouWantToProceedWithSelectedCalibrationStrip": "আপুনি নিৰ্বাচিত মানাংকন ষ্ট্ৰিপৰ সৈতে আগবাঢ়িব বিচাৰেনে?",
       "close": "বন্ধ",
       "noDataAvailableForThisBeneficiary": "এই হিতাধিকাৰীৰ বাবে কোনো তথ্য উপলব্ধ নহয়।",
       "markDescriptions": "চিহ্নিত বিৱৰণ",
@@ -1493,29 +1504,29 @@
       "to": "to",
       "mandatory": "বাধ্যতামূলক",
       "belowExternalTestRequired": "তলত প্ৰয়োজনীয় বাহ্যিক পৰীক্ষাৰ বিৱৰণ দিয়া হৈছে, অনুগ্ৰহ কৰি ইয়াক হিতাধিকাৰীৰ সৈতে ভাগ বতৰা কৰক",
-      "issuesInGettingLocationTryToReLogin": "Issues in getting your location, Please try to re-login."
+      "issuesInGettingLocationTryToReLogin": "আপোনাৰ স্থান পোৱাৰ ক্ষেত্ৰত সমস্যা হৈছে, অনুগ্ৰহ কৰি পুনৰ লগ-ইন কৰিবলৈ চেষ্টা কৰক:n."
     },
     "MISSIN_WORDS": "Starts Here",
     "stillBirth": "মৃত সন্তানজন্ম (এছ)",
     "highRiskPregnancy": "উচ্চ বিপদাশংকা গৰ্ভধাৰণ",
     "doctorDiagnosis": "চিকিৎসকৰ ৰোগ নিৰ্ণয়",
-    "finalDiagnosis": "Final Diagnosis",
+    "finalDiagnosis": "চূড়ান্ত নিৰ্ণয়",
     "isDiabetesConfirmed": "ডায়েবেটিচ নিশ্চিত নেকি",
-    "isHypertensionConfirmed": "Is Hypertension Confirmed",
-    "mmuInvestigationDetailsNotAvailable": "MMU Investigation details not available",
-    "errorInFetchingMMUInvestigationDetails": "Error in fetching MMU Investigation details",
+    "isHypertensionConfirmed": "উচ্চ ৰক্তচাপ নিশ্চিত হৈছে নে?",
+    "mmuInvestigationDetailsNotAvailable": "এম এম ইউ অনুসন্ধানৰ বিৱৰণ উপলব্ধ নহয়",
+    "errorInFetchingMMUInvestigationDetails": "এম এম ইউ অনুসন্ধানৰ বিৱৰণ আনিবলৈ ত্ৰুটি ঘটিছে",
     "pleaseSelectRBSTest": "অনুগ্ৰহ কৰি আৰবিএছ পৰীক্ষা বাছনি কৰক",
     "pleaseSelectVisualAcuityTest": "অনুগ্ৰহ কৰি ভিজুৱেল একুইটি পৰীক্ষা বাছনি কৰক",
     "pleaseSelectRBSTestAndHaemoglobinTest": "অনুগ্ৰহ কৰি আৰবিএছ পৰীক্ষা আৰু হিমোগ্লোবিন পৰীক্ষা বাছনি কৰক",
     "mmuInvestigationDetails": "এমএমইউ অনুসন্ধানৰ বিৱৰণ",
     "stockNotAvailableWouldYouPrescribe": "ষ্টক উপলব্ধ নহয়, আপুনি এতিয়াও নিৰ্ধাৰণ কৰিব বিচাৰে নেকি?",
-    "mmuPrescriptionDetailsNotAvailable": "MMU Prescription details not available",
+    "mmuPrescriptionDetailsNotAvailable": "এম এম ইউ প্ৰেছক্ৰিপচনৰ বিৱৰণ উপলব্ধ নহয়",
     "mmuPrescriptionDetails": "এমএমইউ প্ৰেছক্ৰিপশ্বন বিৱৰণ",
-    "loadMMUPrescription": "Load MMU Prescription",
+    "loadMMUPrescription": "এম এম ইউ প্ৰেছক্ৰিপচন ল'ড কৰক",
     "stockAvailability": "ষ্টকৰ উপলব্ধতা",
-    "nonEDLMedicine": "- (Non-EDL) Medicine",
-    "testDate": "TestDate",
-    "clickToViewGraph": "Click to view Graph",
+    "nonEDLMedicine": "(নন-ই.ডি.এল) ঔষধ",
+    "testDate": "পৰীক্ষাৰ তাৰিখ",
+    "clickToViewGraph": "গ্ৰাফ চাবলৈ ক্লিক কৰক",
     "revisitRefer": "পুনৰ দৰ্শন কৰক আৰু চাওক",
     "covidNineteen": "ক'ভিড-19",
     "contactStatus": "পৰিচয়ৰ স্থিতি",
@@ -1523,7 +1534,7 @@
     "suspectedCOVID": "সন্দেহজনক কোভিড-19",
     "recommendation": "পৰামৰ্শ",
     "idrsInCaps": "আইডিআৰএছ",
-    "confirmedDisease": "Confirmed Disease",
+    "confirmedDisease": "নিশ্চিত ৰোগ",
     "suspectedDisease": "সন্দেহজনক ৰোগ",
     "loincCode": "লইনক কোড",
     "loincTerm": "লইনক ম্যাদ",
@@ -1531,203 +1542,206 @@
     "physicalActivity": "শাৰীৰিক সক্ৰিয়তা",
     "activityType": "কাৰ্যকলাপৰ ধৰণ",
     "confirmWhetherBeneficiaryHasArrived": "হিতাধিকাৰী আহিছে নে নাই নিশ্চিত কৰক",
-    "pleaseSelectLastMenstrualPeriod": "Please Select Last Menstrual Period",
+    "pleaseSelectLastMenstrualPeriod": "অনুগ্ৰহ কৰি শেষ মাহवारीৰ তাৰিখ বাছনি কৰক",
     "poa": "পি.ও.এ",
-    "testIsPrescribed": "Test is prescribed",
+    "testIsPrescribed": "পৰীক্ষা নিৰ্দেশ দিয়া হৈছে",
     "invalidEmail": "অবৈধ ইমেইল",
     "otherReligion": "অন্যান্য ধৰ্ম",
-    "removeID": "Remove ID",
-    "addID": "Add ID",
-    "quickSearch": "Quick Search",
+    "removeID": "আই.ডি. আঁতৰাওক",
+    "addID": "আই.ডি. যোগ কৰক",
+    "quickSearch": "দ্ৰুত সন্ধান",
     "fingerPrintSearch": "আঙুলিৰ প্ৰিন্ট সন্ধান",
     "modalHeader": "মডেল হেডাৰ",
-    "editBeneficiary": "Edit Beneficiary",
+    "editBeneficiary": "হিতাধিকাৰী সম্পাদনা কৰক",
     "dateOfBirth": "জন্মৰ তাৰিখ",
-    "emailAddress": "Email Address",
+    "emailAddress": "ইমেইল ঠিকনা",
     "block": "খণ্ড",
-    "otherReligionName": "Other Religion Name",
-    "otherGovtID": "Other Govt ID",
+    "otherReligionName": "অন্যান্য ধৰ্মৰ নাম",
+    "otherGovtID": "অন্যান্য চৰকাৰী আইডি",
     "govID": "চৰকাৰী আইডি",
     "contactHistory": "যোগাযোগইতিহাস",
-    "pleaseSelectRBSTestInInvestigation": "Please select RBS test in investigation",
-    "pleaseSelectHeamoglobinTestInInvestigation": "Please select heamoglobin test in investigation",
-    "allergyNameIsNotValid": "Allergy Name is not valid",
-    "systolicBPReading": "Systolic BP Reading",
-    "diastolicBPReading": "Diastolic BP Reading",
+    "pleaseSelectRBSTestInInvestigation": "অনুসন্ধানত অনুগ্ৰহ কৰি আৰ.বি.এছ. পৰীক্ষা বাছনি কৰক",
+    "pleaseSelectHeamoglobinTestInInvestigation": "অনুসন্ধানত অনুগ্ৰহ কৰি হিম'গ্ৰ'বিন পৰীক্ষা বাছনি কৰক",
+    "allergyNameIsNotValid": "অ্যালাৰ্জি নাম বৈধ নহয়",
+    "systolicBPReading": "সিস্টোলিক বি.পি. পঢ়া",
+    "diastolicBPReading": "ডায়াস্টোলিক বি.পি. পঢ়া",
     "screening": "স্ক্ৰীণিং",
-    "pleaseSelectDiabetesMellitusInFamilyHistory": "Please select Diabetes Mellitus in family history",
-    "familyMemberInFamilyHistory": "Family Member in Family History",
-    "pleaseSelectFinalDiagnosis": "Please select final diagnosis",
-    "pleaseSelectVisualAcuityTestInInvestigation": "Please select Visual Acuity test in investigation",
-    "provideSwyMedLoginDetailsToStartTC": "Provide swyMed login details to start TC",
-    "loginManuallyThroughSwyMed": "Login manually through swyMed",
-    "address":"ঠিকনা ৰেখা",
-    "healthId":"স্বাস্থ্য আইডি",
-    "healthIdGenerationMode":"HealthId Generation Mode",
-    "aadhar":"Aadhar",
-    "enterValidHealthID":"Enter valid health ID:Please enter a valid Health ID. It should contain 4 (min) to 32 (max) characters. For instance- xxxx.1523 :healthId",
-    "retry":"পুনৰ চেষ্টা কৰক",
-    "capture":"কেপচাৰ কৰক",
-    "otpSentToYourMobileNumber":"আপোনাৰ ম'বাইল নম্বৰলৈ প্ৰেৰণ কৰা ওটিপি",
-    "issueInGettingBeneficiaryHealthIDDetails":"Issue in getting Beneficiary Health ID  Details",
-    "bluetooth":"ব্লুটুথ",
-    "pleaseWaitFetchingRequiredData":"অনুগ্ৰহ কৰি ৰওক। প্ৰয়োজনীয় তথ্য প্ৰাপ্ত কৰা হৈছে",
-    "pair":"যোৰ",
-    "pairing":"যোৰা লগোৱা",
-    "paired":"যোৰ কৰা হৈছে",
-    "searchBletoothDevice":"ব্লুটুথ ডিভাইচ সন্ধান কৰক",
-    "IOTsdkNotUp":"আই.ও.টি. এছ.ডি.কে. ওপৰলৈ নাই।",
-    "calibrationTestSuccess":"Calibration is success.Do you want to proceed with test?",
-    "abort":"Abort",
-    "OTPSentToRegMobNo":"OTP sent to your registered mobile number",
-    "healthIDDetails":"স্বাস্থ্য আইডিৰ বিৱৰণ",
-    "healthIDCareContextMapping":"Health ID Care Context Mapping",
-    "healthID":"স্বাস্থ্য আইডি",
-    "healthIDNumber":"স্বাস্থ্য আইডি নম্বৰ",
-    "dateOfCreation":"Date of Creation",
-    "healthIDMode":"HealthID Mode",
-    "generateOTP":"Generate OTP",
-    "enterOTP":"ওটিপি প্ৰবিষ্ট কৰক",
-    "OTPSentToMobNo":"আপোনাৰ ম'বাইল নম্বৰলৈ প্ৰেৰণ কৰা ওটিপি :",
-        "OTPSentToAadharLinkedNo":"OTP sent to your Aadhar linked mobile number",
-        "healthIDGeneration":"স্বাস্থ্য পৰিচয় প্ৰজন্ম",
-        "registeredContactNumberIs":"পঞ্জীভুক্ত পৰিচয় নম্বৰ হৈছে",
-        "alternateNumber":"বৈকল্পিক সংখ্যা",
-        "mobileNumber": "ম'বাইল নম্বৰ",
-        "resendOTP":"ওটিপি পুনৰ প্ৰেৰণ কৰক",
-        "generateHealthID": "Generate Health ID",
-        "healthIDGeneratedSuccessfully":"স্বাস্থ্য আইডি উৎপন্ন সফলতা",
-        "healthIDValidatedSuccessfully":"Health ID validated Successfully.",
-        "healthIDValidation":"Health ID Validation",
-        "healthIDSearch":"Health ID Search",
-        "printHealthIDCard": "Print Health ID Card",
-        "healthIDCard": "Health ID Card",
-        "generateHealthIDCard": "Generate Health ID Card",
-        "healthIDGenerationMode":"HealthId Generation Mode",
-        "enterHealthID":"Enter Health ID",
-        "validHealthIDMessage":"Enter valid health ID:Please enter a valid Health ID. It should contain 4 (min) to 32 (max) characters. For instance- xxxx.1523 :healthId",
-        "validate":"Validate",
-        "disconnect":"Disconnect",
-        "stopTest": "Stop Test",
-        "screeningComplete": "স্ক্ৰীণিং সম্পূৰ্ণ",
-        "ncdScreeningOther": "NCD Screening Other",
-        "previousReferredDetails": "Previous Referred Details",
-        "files":"ফাইলসমূহ",
-        "totalNumberOfPastPregnancyFor":"অতীতৰ গৰ্ভধাৰণৰ মুঠ সংখ্যা",
-        "cannotBeZero":"শূন্য হ'ব নোৱাৰে(0)",
-        "previousPhyscialActivityHistoryDetails":"পূৰ্বৱৰ্তী ফাইচিয়াল কাৰ্যকলাপৰ ইতিহাসৰ বিৱৰণ",
-        "pastDiabetesHistoryNotAvailable":"অতীতৰ ডায়েবেটিচৰ ইতিহাস উপলব্ধ নহয়",
-        "previousAllergyhistoryDet": "এলার্জতি পিডি়ত হোৱা পূর্বৰ কোনো তথ্য সবিশেষs",
-        "pleasewaitTestinProgress": "অনুগ্ৰহ কৰি ৰওক। পৰীক্ষা চলি আছে",
-        "previousAlcoholhistoryDet": "সুৰাপান কৰা পূর্বৰ কোনো তথ্যৰ সবিশেষ",
-        "previousTobaccohistoryDet": "Previous Tobacco history Details",
-        "notAvailable": "উপলব্ধ নহয়",
-        "previousDiabetesHistoryDetails":"পূৰ্বৱৰ্তী ডায়েবেটিচ ইতিহাসৰ বিৱৰণ",
-        "pleaseSelectprovisionalDiagnosisWithSnomedCode":"Provisional Diagnosis is not valid",
-        "licenseInfo": "অনুজ্ঞাপত্ৰতথ্য",
-        "fetosensereports": "Fetosense reports",
-        "itemDispensed": "Item Dispensed",
-        "nolegendindications": "No legend indications",
-        "isDiabetesconfirmed": "Is Diabetes confirmed?",
-        "isHypertensionconfirmed": "Is Hypertension confirmed",
-        "ncdConditionOther": "NCD Condition Other",
-        "version": "সংস্কৰণ",
-        "previousReferralHistoryDetails": "Previous Referral History Details",
-        "confirmatoryDiagnosisIsNotValid":"Confirmatory Diagnosis is not valid",
-        "healthIDCardNotAvailable":"Health ID Card is not available",
-        "doYouWantToDownloadHealthIDCard": "Do you want to download Health ID Card?",
-        "errorInHealthIDValidation":"Error in Health ID Validate",
-        "enterHealthIDOrNumber": "Enter Health ID / Health ID Number",
-        "normal":"Normal",
-        "mildMalnourished":"Mild Malnourished",
-        "moderatelyMalnourished":"Moderately Malnourished",
-        "severelyMalnourished":"Severely Malnourished",
-        "overweight":"Overweight",
-        "obese":"Obese",
-        "severelyObese":"Severely Obese",
-        "pleaseConfirmClinically":"Please confirm this clinically or calculate manually for this gender",
-        "sPOTwo": "SPO2",
-        "rbsTestResult": "RBS Result (mg/dl)",
-        "rbsTestRemarks": "RBS Test Remarks",
-        "rbs":"Random Blood Glucose (mg/dl)",
-        "rbsRemarks":"Random Blood Glucose Remarks",
-        "sPOTwoWithUnit": "SPO2 (%)",
-        "loadMMURBS":"Load MMU RBS Details",
-        "mmuRBSDetails":"MMU RBS details",
-        "abha":"ABHA",
-        "abhaNumber":"ABHA Number",
-        "abhaDetails":"ABHA Details",
-        "abhaAddress":"ABHA Address",
-        "abhaMode":"ABHA Mode",
-        "abhaDetailsNotAvailable":"ABHA details not available",
-        "invalidFileExtensionSupportedFileFormats":"সমৰ্থিত ফাইল ফৰ্মেট (.msg,.pdf,.png,.jpeg,.doc,.docx,.xlsx,.xls,.csv,.txt)",
-        "fileSizeShouldNotExceed":"ফাইলৰ আকাৰ অতিক্ৰম কৰিব নালাগে",
-        "mb":"এমবি",
-        "invalidFileName":"Invalid file name",
-        "uploadFileSizeLimit":"ফাইল আপলোড কৰক (আকাৰৰ সীমা",
-        "SupportedFileFormats": "Supported File Formats(.msg,.pdf,.png,.jpeg,.doc,.docx,.xlsx,.xls,.csv,.txt)",
-        "covidVaccinationStatus":"COVID Vaccination Status",
-        "ageGroup": "Age Group",
-        "isApplicableForVaccine": "Is Applicable For Vaccine",
-        "vaccineStatus": "Vaccination Status",
-        "vaccineTypes": "Vaccine Type",
-        "doseTaken": "Dose Taken",
-        "doseOneDate": "Dose 1 Date",
-        "doseTwoDate": "Dose 2 Date",
-        "boosterDoseDate": "Booster Dose Date",
-        "covidVaccinationDetailsSaved":"Covid vaccination details saved successfully",
-
-        "aBHA": "ABHA",
-        "aBHASearch": "ABHA Search",
-        "generateABHACard": "Generate ABHA Card",
-        "aBHADetails":"ABHA Details",
-        "issueInGettingBeneficiaryABHADetails":"Issue in getting Beneficiary ABHA Details",
-        "aBHACareContextMapping":"ABHA Care Context Mapping",
-        "aBHANumber":"ABHA Number",
-        "aBHAMode":"ABHA Mode",
-        "aBHAGeneration":"ABHA Generation",
-        "generateABHA": "Generate ABHA",
-        "aBHAGeneratedSuccessfully":"ABHA Generated Successfully.",
-        "aBHAValidatedSuccessfully":"ABHA validated Successfully.",
-        "aBHAValidation":"ABHA Validation",
-        "aBHACard": "ABHA Card",
-        "printABHACard": "Print ABHA Card",
-        "aBHAGenerationMode":"ABHA Generation Mode",
-        "enterABHA":"Enter ABHA",
-        "aBHACardNotAvailable":"ABHA Card is not available",
-        "doYouWantToDownloadABHACard": "Do you want to download ABHA Card?",
-        "errorInABHAValidation":"Error in ABHA Validate",
-        "enterABHAOrNumber": "Enter ABHA / ABHA Number",
-        "enterMobileNo": "Enter Mobile Number",
-        "enterOTPToVerify": "The entered mobile number is not linked with your Aadhar card. Please enter the OTP received to verify or Please press cancel to re-enter the mobile number",
-        "newPassword": "New Password",
-        "confirmPassword": "Confirm Password",
-        "setPasswordForAbha": "Set Password For ABHA",
-        "mustContainForSetPassword": "Password must contain an uppercase, a lowercase, a number, a special character",
-        "passwordNotContainSequence" : "Password should not contain any sequence numbers",
-        "passwordDoesNotMatch" :"Password does not match",
-        "minCharPassRequired": "Please provide atleast 8 character",
-        "proceedWithOutPassword": "Do you want to proceed further without setting password for ABHA?",
-        "benPreviousVisitDetails": "Beneficiary previous visit details",
-        "downloadAbhaCard":"Download ABHA Card",
-        "beneficaryConsent":"Beneficiary Consent",
-        "consentFormText": "To provide you with better service, we would,request your personal information. The information that you will providewill be kept confidential and will only be used for research and analysis.",
-        "mobile":"Mobile",
-        "noRecordsFound":"No Records Found",
-        "enterMobileNumberToBeLinkedWithAbha": "Enter Phone number to be linked with ABHA",
-        "doYouWantToVerifyMobileOtpForAbha": "Your provided mobile number is not linked with Aadhaar, Do you want to verify it?",
-        "abhaCardAlreadyExists": "ABHA already exists for the Aadhaar Number",
-        "enterABHANumberOrAadhar": "Enter Aadhaar Number Or ABHA Number Or ABHA Address",
-        "enterABHANumberOrMobile": "Enter Mobile Number Or ABHA Number Or ABHA Address",
-        "enterCorrectAuthIdForAuthMode": "Please Enter correct Authentication ID for choosen AuthMode",
-        "abhaAddressFound" : "ABHA Address Found:",
-        "searchAndDownloadAbha": "Search and Download ABHA",
-        "abhaSearchMode": "ABHA Search Mode*",
-        "verifyAbha": "Verify ABHA",
-        "issueInAbhaCard": "Issue in printing ABHA Card",
-        "fileUploadedSuccessfully": "File Uploaded successfully",
-        "verifyMobileOtp": "Verify Mobile OTP",
-        "enterMobileOtp": "Enter Mobile OTP",
-        "verify": "Verify"
+    "pleaseSelectDiabetesMellitusInFamilyHistory": "অনুগ্ৰহ কৰি পৰিয়ালৰ ইতিহাসত ডায়েবেটিছ মেলিটাছ বাছনি কৰক",
+    "familyMemberInFamilyHistory": "পৰিয়ালৰ ইতিহাসত পৰিয়ালৰ সদস্য",
+    "pleaseSelectFinalDiagnosis": "অনুগ্ৰহ কৰি চূড়ান্ত নিৰ্ণয় বাছনি কৰক",
+    "pleaseSelectVisualAcuityTestInInvestigation": "অনুসন্ধানত অনুগ্ৰহ কৰি দৃষ্টিক্ষমতা পৰীক্ষা বাছনি কৰক",
+    "provideSwyMedLoginDetailsToStartTC": "TC আৰম্ভ কৰিবলৈ swyMed লগইন বিৱৰণ দিয়ক",
+    "loginManuallyThroughSwyMed": "swyMed ৰ জৰিয়তে নিজে লগইন কৰক",
+    "address": "ঠিকনা ৰেখা",
+    "healthId": "স্বাস্থ্য আইডি",
+    "healthIdGenerationMode": "হেল্থ আই.ডি. সৃষ্টি পদ্ধতি",
+    "aadhar": "আধাৰ",
+    "enterValidHealthID": "বৈধ হেল্থ আই.ডি. প্ৰৱিষ্ট কৰক: অনুগ্ৰহ কৰি ৪ (সৰ্বনিম্ন) ৰ পৰা ৩২ (সৰ্বাধিক) আখৰৰ ভিতৰত থকা বৈধ হেল্থ আই.ডি. প্ৰৱিষ্ট কৰক। উদাহৰণস্বৰূপে - xxxx.1523 :healthId",
+    "retry": "পুনৰ চেষ্টা কৰক",
+    "capture": "কেপচাৰ কৰক",
+    "otpSentToYourMobileNumber": "আপোনাৰ ম'বাইল নম্বৰলৈ প্ৰেৰণ কৰা ওটিপি",
+    "issueInGettingBeneficiaryHealthIDDetails": "Issue in getting Beneficiary Health ID  Details",
+    "bluetooth": "ব্লুটুথ",
+    "pleaseWaitFetchingRequiredData": "অনুগ্ৰহ কৰি ৰওক। প্ৰয়োজনীয় তথ্য প্ৰাপ্ত কৰা হৈছে",
+    "pair": "যোৰ",
+    "pairing": "যোৰা লগোৱা",
+    "paired": "যোৰ কৰা হৈছে",
+    "searchBletoothDevice": "ব্লুটুথ ডিভাইচ সন্ধান কৰক",
+    "IOTsdkNotUp": "আই.ও.টি. এছ.ডি.কে. ওপৰলৈ নাই।",
+    "calibrationTestSuccess": "কেলিব্ৰেছন সফল হৈছে। আপুনি কি পৰীক্ষা আগবঢ়াব বিচাৰে?",
+    "abort": "বাতিল কৰক",
+    "OTPSentToRegMobNo": "আপোনাৰ পঞ্জীয়নভুক্ত মোবাইল নম্বৰত OTP প্ৰেৰণ কৰা হৈছে",
+    "healthIDDetails": "স্বাস্থ্য আইডিৰ বিৱৰণ",
+    "healthIDCareContextMapping": "হেল্থ আই.ডি. কেয়াৰ কনটেক্সট মেপিং",
+    "healthID": "স্বাস্থ্য আইডি",
+    "healthIDNumber": "স্বাস্থ্য আইডি নম্বৰ",
+    "dateOfCreation": "সৃষ্টিৰ তাৰিখ",
+    "healthIDMode": "হেল্থ আই.ডি. মোড",
+    "generateOTP": "OTP উত্পন্ন কৰক",
+    "enterOTP": "ওটিপি প্ৰবিষ্ট কৰক",
+    "OTPSentToMobNo": "আপোনাৰ ম'বাইল নম্বৰলৈ প্ৰেৰণ কৰা ওটিপি :",
+    "OTPSentToAadharLinkedNo": "আপোনাৰ আধাৰ সংলগ্ন মোবাইল নম্বৰত OTP প্ৰেৰণ কৰা হৈছে",
+    "healthIDGeneration": "স্বাস্থ্য পৰিচয় প্ৰজন্ম",
+    "registeredContactNumberIs": "পঞ্জীভুক্ত পৰিচয় নম্বৰ হৈছে",
+    "alternateNumber": "বৈকল্পিক সংখ্যা",
+    "mobileNumber": "ম'বাইল নম্বৰ",
+    "resendOTP": "ওটিপি পুনৰ প্ৰেৰণ কৰক",
+    "generateHealthID": "হেল্থ আই.ডি. উত্পন্ন কৰক",
+    "healthIDGeneratedSuccessfully": "স্বাস্থ্য আইডি উৎপন্ন সফলতা",
+    "healthIDValidatedSuccessfully": "হেল্থ আই.ডি. সফলভাৱে স্বীকৃত হৈছে",
+    "healthIDValidation": "হেল্থ আই.ডি. স্বীকৃতি",
+    "healthIDSearch": "হেল্থ আই.ডি. সন্ধান",
+    "printHealthIDCard": "হেল্থ আই.ডি. কাৰ্ড মুদ্ৰণ কৰক",
+    "healthIDCard": "হেল্থ আই.ডি. কাৰ্ড",
+    "generateHealthIDCard": "হেল্থ আই.ডি. কাৰ্ড উত্পন্ন কৰক",
+    "healthIDGenerationMode": "হেল্থ আই.ডি. সৃষ্টি পদ্ধতি",
+    "enterHealthID": "হেল্থ আই.ডি. প্ৰৱিষ্ট কৰক",
+    "validHealthIDMessage": "বৈধ হেল্থ আই.ডি. প্ৰৱিষ্ট কৰক: অনুগ্ৰহ কৰি ৪ (সৰ্বনিম্ন) ৰ পৰা ৩২ (সৰ্বাধিক) আখৰৰ ভিতৰত থকা বৈধ হেল্থ আই.ডি. প্ৰৱিষ্ট কৰক। উদাহৰণস্বৰূপে - xxxx.1523 :healthId",
+    "validate": "স্বীকৃতি দিয়ক",
+    "disconnect": "সংযোগ বিচ্ছিন্ন কৰক",
+    "stopTest": "পৰীক্ষা ৰখাওক",
+    "screeningComplete": "স্ক্ৰীণিং সম্পূৰ্ণ",
+    "ncdScreeningOther": "অন্য NCD পৰীক্ষা",
+    "previousReferredDetails": "পূৰ্বতন ৰেফাৰৰ বিৱৰণ",
+    "files": "ফাইলসমূহ",
+    "totalNumberOfPastPregnancyFor": "অতীতৰ গৰ্ভধাৰণৰ মুঠ সংখ্যা",
+    "cannotBeZero": "শূন্য হ'ব নোৱাৰে(0)",
+    "previousPhyscialActivityHistoryDetails": "পূৰ্বৱৰ্তী ফাইচিয়াল কাৰ্যকলাপৰ ইতিহাসৰ বিৱৰণ",
+    "pastDiabetesHistoryNotAvailable": "অতীতৰ ডায়েবেটিচৰ ইতিহাস উপলব্ধ নহয়",
+    "previousAllergyhistoryDet": "এলার্জতি পিডি়ত হোৱা পূর্বৰ কোনো তথ্য সবিশেষs",
+    "pleasewaitTestinProgress": "অনুগ্ৰহ কৰি ৰওক। পৰীক্ষা চলি আছে",
+    "previousAlcoholhistoryDet": "সুৰাপান কৰা পূর্বৰ কোনো তথ্যৰ সবিশেষ",
+    "previousTobaccohistoryDet": "পূৰ্বৰ তামাক ব্যৱহাৰৰ ইতিহাসৰ বিৱৰণ",
+    "notAvailable": "উপলব্ধ নহয়",
+    "previousDiabetesHistoryDetails": "পূৰ্বৱৰ্তী ডায়েবেটিচ ইতিহাসৰ বিৱৰণ",
+    "pleaseSelectprovisionalDiagnosisWithSnomedCode": "অস্থায়ী নিৰ্ণয় বৈধ নহয়",
+    "licenseInfo": "অনুজ্ঞাপত্ৰতথ্য",
+    "fetosensereports": "ফিট'চেন্স প্ৰতিবেদনসমূহ",
+    "itemDispensed": "বস্তু বিতৰণ কৰা হৈছে",
+    "nolegendindications": "কোনো সংকেত চিহ্ন উপলব্ধ নহয়",
+    "isDiabetesconfirmed": "ডায়েবেটিছ নিশ্চিত হৈছে নে?",
+    "isHypertensionconfirmed": "উচ্চ ৰক্তচাপ নিশ্চিত হৈছে নে?",
+    "ncdConditionOther": "অন্য NCD অৱস্থা",
+    "version": "সংস্কৰণ",
+    "previousReferralHistoryDetails": "পূৰ্বৰ ৰেফাৰেল ইতিহাসৰ বিৱৰণ",
+    "confirmatoryDiagnosisIsNotValid": "নিশ্চিত নিৰ্ণয় বৈধ নহয়",
+    "healthIDCardNotAvailable": "হেল্থ আই.ডি. কাৰ্ড উপলব্ধ নহয়",
+    "doYouWantToDownloadHealthIDCard": "আপুনি হেল্থ আই.ডি. কাৰ্ড ডাউনলোড কৰিব বিচাৰে নে?",
+    "errorInHealthIDValidation": "হেল্থ আই.ডি. স্বীকৃতি প্ৰক্ৰিয়াত ত্ৰুটি",
+    "enterHealthIDOrNumber": "হেল্থ আই.ডি. / হেল্থ আই.ডি. নম্বৰ প্ৰৱিষ্ট কৰক",
+    "normal": "সাধাৰণ",
+    "mildMalnourished": "সৰু পৰিমাণে অপুষ্ট",
+    "moderatelyMalnourished": "মধ্যম পৰিমাণে অপুষ্ট",
+    "severelyMalnourished": "তীব্ৰভাৱে অপুষ্ট",
+    "overweight": "অতি ওজন",
+    "obese": "মোটা",
+    "severelyObese": "তীব্ৰভাৱে মোটা",
+    "pleaseConfirmClinically": "অনুগ্ৰহ কৰি ইয়াক ক্লিনিকেলভাৱে নিশ্চিত কৰক বা এই লিংগৰ বাবে নিজে গণনা কৰক",
+    "sPOTwo": "SPO2",
+    "rbsTestResult": "RBS ফলাফল (mg/dl)",
+    "rbsTestRemarks": "RBS পৰীক্ষাৰ মন্তব্য",
+    "rbs": "ৰেন্ডম ব্লাড গ্লুক’জ (mg/dl)",
+    "rbsRemarks": "ৰেন্ডম ব্লাড গ্লুক’জ পৰীক্ষাৰ মন্তব্য",
+    "sPOTwoWithUnit": "SPO2 (%)",
+    "loadMMURBS": "এম এম ইউ RBS বিৱৰণ ল'ড কৰক",
+    "mmuRBSDetails": "এম এম ইউ RBS বিৱৰণ",
+    "abha": "আভা (ABHA)",
+    "abhaNumber": "আভা নম্বৰ",
+    "abhaDetails": "আভাৰ বিৱৰণ",
+    "abhaAddress": "আভা ঠিকনা",
+    "abhaMode": "আভা মোড",
+    "abhaDetailsNotAvailable": "আভাৰ বিৱৰণ উপলব্ধ নহয়",
+    "invalidFileExtensionSupportedFileFormats": "সমৰ্থিত ফাইল ফৰ্মেট (.msg,.pdf,.png,.jpeg,.doc,.docx,.xlsx,.xls,.csv,.txt)",
+    "fileSizeShouldNotExceed": "ফাইলৰ আকাৰ অতিক্ৰম কৰিব নালাগে",
+    "mb": "এমবি",
+    "invalidFileName": "Invalid file name",
+    "uploadFileSizeLimit": "ফাইল আপলোড কৰক (আকাৰৰ সীমা",
+    "SupportedFileFormats": "সমৰ্থিত ফাইল ফৰ্মেটসমূহ (.msg, .pdf, .png, .jpeg, .doc, .docx, .xlsx, .xls, .csv, .txt)",
+    "covidVaccinationStatus": "ক'ভিড টীকাকৰণ স্থিতি",
+    "ageGroup": "বয়সৰ শ্ৰেণী",
+    "isApplicableForVaccine": "টীকাৰ বাবে প্ৰযোজ্য নে?",
+    "vaccineStatus": "টীকাকৰণৰ স্থিতি",
+    "vaccineTypes": "টীকাৰ ধৰণ",
+    "doseTaken": "ডোজ গ্ৰহণ কৰা হৈছে",
+    "doseOneDate": "প্ৰথম ডোজৰ তাৰিখ",
+    "doseTwoDate": "দ্বিতীয় ডোজৰ তাৰিখ",
+    "boosterDoseDate": "বুছ্টাৰ ডোজৰ তাৰিখ",
+    "covidVaccinationDetailsSaved": "ক'ভিড টীকাকৰণৰ বিৱৰণ সফলভাৱে সংৰক্ষণ কৰা হৈছে",
+    "aBHA": "আভা (ABHA)",
+    "aBHASearch": "আভা সন্ধান",
+    "generateABHACard": "আভা কাৰ্ড উত্পন্ন কৰক",
+    "aBHADetails": "আভাৰ বিৱৰণ",
+    "issueInGettingBeneficiaryABHADetails": "হিতাধিকাৰীৰ আভা বিৱৰণ পোৱাৰ সময়ত সমস্যা হৈছে",
+    "aBHACareContextMapping": "আভা কেয়াৰ কনটেক্সট মেপিং",
+    "aBHANumber": "আভা নম্বৰ",
+    "aBHAMode": "আভা মোড",
+    "aBHAGeneration": "আভা উত্পাদন",
+    "generateABHA": "আভা উত্পন্ন কৰক",
+    "aBHAGeneratedSuccessfully": "আভা সফলভাৱে উত্পন্ন কৰা হৈছে",
+    "aBHAValidatedSuccessfully": "আভা সফলভাৱে স্বীকৃত হৈছে",
+    "aBHAValidation": "আভা স্বীকৃতি",
+    "aBHACard": "আভা কাৰ্ড",
+    "printABHACard": "আভা কাৰ্ড মুদ্ৰণ কৰক",
+    "aBHAGenerationMode": "আভা উত্পাদনৰ পদ্ধতি",
+    "enterABHA": "আভা নম্বৰ প্ৰৱিষ্ট কৰক",
+    "aBHACardNotAvailable": "আভা কাৰ্ড উপলব্ধ নহয়",
+    "doYouWantToDownloadABHACard": "আপুনি আভা কাৰ্ড ডাউনলোড কৰিব বিচাৰে নে?",
+    "errorInABHAValidation": "আপুনি আভা কাৰ্ড ডাউনলোড কৰিব বিচাৰে নে?",
+    "enterABHAOrNumber": "আভা / আভা নম্বৰ প্ৰৱিষ্ট কৰক",
+    "enterMobileNo": "মোবাইল নম্বৰ প্ৰৱিষ্ট কৰক",
+    "enterOTPToVerify": "আপুনি প্ৰৱিষ্ট কৰা মোবাইল নম্বৰটো আপোনাৰ আধাৰ কাৰ্ডৰ সৈতে সংযুক্ত নহয়। অনুগ্ৰহ কৰি প্ৰাপ্ত OTPটো প্ৰৱিষ্ট কৰি প্ৰমাণিত কৰক বা বাতিল টিপি মোবাইল নম্বৰটো পুনৰ প্ৰৱিষ্ট কৰক।",
+    "newPassword": "নতুন পাছৱাৰ্ড",
+    "confirmPassword": "পাছৱাৰ্ড নিশ্চিত কৰক",
+    "setPasswordForAbha": "আভাৰ বাবে পাছৱাৰ্ড নিৰ্ধাৰণ কৰক",
+    "mustContainForSetPassword": "পাছৱাৰ্ডত এটা কেপিটেল আখৰ, এটা সৰু আখৰ, এটা সংখ্যা আৰু এটা বিশেষ চিহ্ন থাকিব লাগিব",
+    "passwordNotContainSequence": "পাছৱাৰ্ডত কোনো ক্রমিক সংখ্যাৰ সমষ্টি থাকিব নালাগে",
+    "passwordDoesNotMatch": "পাছৱাৰ্ড মিল খাইছে নে নাই",
+    "minCharPassRequired": "অনুগ্ৰহ কৰি অন্ততঃ ৮টা আখৰ প্ৰদান কৰক",
+    "proceedWithOutPassword": "ABHA ৰ বাবে পাছৱাৰ্ড নিধাৰণ নকৰাকৈ আগবাঢ়িব খুজিছেনে?",
+    "benPreviousVisitDetails": "হিতাধিকাৰীৰ পূৰ্বৰ পৰিদৰ্শনৰ বিৱৰণ",
+    "downloadAbhaCard": "ABHA কাৰ্ড ডাউনলোড কৰক",
+    "beneficaryConsent": "হিতাধিকাৰীৰ অনুমতি",
+    "consentFormText": "To provide you with better service, we would,request your personal information. The information that you will providewill be kept confidential and will only be used for research and analysis.",
+    "mobile": "মোবাইল",
+    "noRecordsFound": "কোনো ৰেকৰ্ড পোৱা নগ’ল",
+    "enterMobileNumberToBeLinkedWithAbha": "ABHAৰ সৈতে সংযুক্ত কৰাৰ বাবে ফোন নম্বৰ দিয়ক",
+    "doYouWantToVerifyMobileOtpForAbha": "আপোনাৰ দিয়া মোবাইল নম্বৰটো আধাৰৰ সৈতে সংযুক্ত নহয়, আপুনি কি একে পৰীক্ষা কৰিব বিচাৰে?",
+    "abhaCardAlreadyExists": "উল্লেখ কৰা আধাৰ নম্বৰৰ বাবে ABHA ইতিমধ্যে আছে",
+    "enterABHANumberOrAadhar": "Enter Aadhaar Number Or ABHA Number Or ABHA Address",
+    "enterABHANumberOrMobile": "Enter Mobile Number Or ABHA Number Or ABHA Address",
+    "enterCorrectAuthIdForAuthMode": "অনুগ্ৰহ কৰি বাছনি কৰা প্ৰমাণীকৰণ পদ্ধতিৰ বাবে সঠিক প্ৰমাণীকৰণ ID দিয়ক",
+    "abhaAddressFound": "ABHA ঠিকনা পোৱা গ’ল",
+    "searchAndDownloadAbha": "ABHA সন্ধান কৰক আৰু ডাউনলোড কৰক",
+    "abhaSearchMode": "ABHA সন্ধান পদ্ধতি*",
+    "verifyAbha": "ABHA সত্যাপন কৰক",
+    "issueInAbhaCard": "ABHA কাৰ্ড ছপা কৰোঁতে সমস্যা",
+    "fileUploadedSuccessfully": "ফাইল সফলভাৱে আপল'ড কৰা হৈছে",
+    "verifyMobileOtp": "মোবাইল OTP  সত্যাপন কৰক",
+    "enterMobileOtp": "মোবাইল OTP দিয়ক",
+    "verify": "সত্যাপন কৰক",
+    "accessDenied": "প্ৰৱেশ অধিকার নিষিদ্ধ",
+    "internaleServerError": "আভ্যন্তৰীণ চাৰ্ভাৰ ত্ৰুটি",
+    "somethingWentWrong": "কিবা ভুল হৈ গ'ল",
+    "sessionExpiredPleaseLogin": "আপোনাৰ ছেছন সমাপ্ত, অনুগ্ৰহ কৰি পুনৰ লগইন কৰক"
   }
-}
+}
\ No newline at end of file
diff --git a/src/assets/English.json b/src/assets/English.json
index 82e4da1..6ec9071 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",
@@ -1735,7 +1747,11 @@
         "fileUploadedSuccessfully": "File Uploaded successfully",
         "verifyMobileOtp": "Verify Mobile OTP",
         "enterMobileOtp": "Enter Mobile OTP",
-        "verify": "Verify"
+        "verify": "Verify",
+        "accessDenied": "Access Denied",
+        "internaleServerError": "Internal Server Error",
+        "somethingWentWrong": "Something went wrong",
+        "sessionExpiredPleaseLogin": "Session expired, Please login again to continue"
     }  
     
 }
\ No newline at end of file
diff --git a/src/assets/Hindi.json b/src/assets/Hindi.json
index b3576f9..bd4233f 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": "नर्स",
@@ -1731,6 +1743,10 @@
         "fileUploadedSuccessfully": "File Uploaded successfully",
         "verifyMobileOtp": "Verify Mobile OTP",
         "enterMobileOtp": "Enter Mobile OTP",
-        "verify": "Verify"
+        "verify": "जाँच करें",
+        "accessDenied": "पहुंच अस्वीकृत",
+        "internaleServerError": "आंतरिक सर्वर त्रुटि",
+        "somethingWentWrong": "कुछ गलत हो गया",
+        "sessionExpiredPleaseLogin": "सत्र समाप्त हो गया, कृपया जारी रखने के लिए दोबारा लॉगिन करें"
   }
 }
diff --git a/src/environments/environment.ci.ts.template b/src/environments/environment.ci.ts.template
index 3f1c0f4..b390b53 100644
--- a/src/environments/environment.ci.ts.template
+++ b/src/environments/environment.ci.ts.template
@@ -38,7 +38,7 @@ const ADMIN_API = '<%= ADMIN_API_BASE %>';
 const biologicalScreeningDeviceAPI = `${ADMIN_API}/diagnostics/biologicalScreeningDevice`;
 const IOT_API = '<%= IOT_API_BASE %>';
 const FHIR_API = '<%= FHIR_API_BASE %>';
-const mmuUICasesheet = '<%= TM_API_BASE %>';
+const mmuUICasesheet = '<%= TM_UI %>';
 const SCHEDULER_UI =  '<%= SCHEDULER_UI_BASE %>';
 const INVENTORY_UI =  '<%= INVENTORY_UI %>';
 const IDENTITY_API = `<%= IDENTITY_API_BASE %>`;
@@ -51,7 +51,13 @@ export const environment = {
   production: true,
   isTMOffline: true,
   encKey: sessionStorageEncKey,
-
+  tracking: {
+    enabled: true,
+    trackingPlatform: 'matomo',
+    platform: 'matomo',
+    siteId: 3, // The new Site ID from Matomo
+    trackerUrl: 'https://matomo.piramalswasthya.org/',
+  },
   app: `MMU`,
   RBSTest: `RBS Test`,
   visualAcuityTest: `Visual Acuity Test`,
@@ -495,4 +501,8 @@ export const environment = {
   siteKey: siteKey,
   captchaChallengeURL: captchaChallengeURL,
   enableCaptcha: enableCaptcha,
+
+  getUserId: `${COMMON_API}user/userName/`,
+  checkUsersignExistUrl: `${ADMIN_API}signature1/signexist/`,
+
 };
diff --git a/src/environments/environment.dev.ts b/src/environments/environment.dev.ts
index e888a8b..0f6d49e 100644
--- a/src/environments/environment.dev.ts
+++ b/src/environments/environment.dev.ts
@@ -66,7 +66,13 @@ export const environment = {
   production: true,
   encKey: sessionStorageEncKey,
   isTMOffline: false,
-
+  tracking: {
+    enabled: true,
+    trackingPlatform: 'matomo',
+    platform: 'matomo',
+    siteId: 3, // The new Site ID from Matomo
+    trackerUrl: 'https://matomo.piramalswasthya.org/',
+  },
   app: `MMU`,
   RBSTest: `RBS Test`,
   visualAcuityTest: `Visual Acuity Test`,
diff --git a/src/environments/environment.development.ts b/src/environments/environment.development.ts
index c97b77f..80b2f00 100644
--- a/src/environments/environment.development.ts
+++ b/src/environments/environment.development.ts
@@ -66,7 +66,13 @@ export const environment = {
   production: true,
   isTMOffline: false,
   encKey: sessionStorageEncKey,
-
+  tracking: {
+    enabled: true,
+    trackingPlatform: 'matomo',
+    platform: 'matomo',
+    siteId: 3, // The new Site ID from Matomo
+    trackerUrl: 'https://matomo.piramalswasthya.org/',
+  },
   app: `MMU`,
   RBSTest: `RBS Test`,
   visualAcuityTest: `Visual Acuity Test`,
diff --git a/src/environments/environment.local.ts b/src/environments/environment.local.ts
index 70ba525..9cd89e3 100644
--- a/src/environments/environment.local.ts
+++ b/src/environments/environment.local.ts
@@ -70,6 +70,13 @@ const enableCaptcha = false;
 export const environment = {
   production: false,
   isTMOffline: true,
+  tracking: {
+    enabled: true,
+    trackingPlatform: 'matomo',
+    platform: 'matomo',
+    siteId: 3, // The new Site ID from Matomo
+    trackerUrl: 'https://matomo.piramalswasthya.org/',
+  },
   app: `MMU`,
   RBSTest: `RBS Test`,
   visualAcuityTest: `Visual Acuity Test`,
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index d816d38..85a7fcc 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -67,7 +67,13 @@ export const environment = {
   production: true,
   isTMOffline: false,
   encKey: sessionStorageEncKey,
-
+  tracking: {
+    enabled: true,
+    trackingPlatform: 'matomo',
+    platform: 'matomo',
+    siteId: 3, // The new Site ID from Matomo
+    trackerUrl: 'https://matomo.piramalswasthya.org/',
+  },
   app: `MMU`,
   RBSTest: `RBS Test`,
   visualAcuityTest: `Visual Acuity Test`,