diff --git a/src/app/app-modules/core/components/app-header/app-header.component.html b/src/app/app-modules/core/components/app-header/app-header.component.html
index ba5ace2..264a2fc 100644
--- a/src/app/app-modules/core/components/app-header/app-header.component.html
+++ b/src/app/app-modules/core/components/app-header/app-header.component.html
@@ -152,7 +152,7 @@
           </button>
         </li>
         <li class="nav-item" *ngIf="item.role === 'TC Specialist'">
-          <button mat-button [matMenuTriggerFor]="TCitems">
+          <button class="nav-btn" mat-button [matMenuTriggerFor]="TCitems">
             {{ item.label }}
             <span class="caret"></span>
           </button>
diff --git a/src/app/app-modules/core/components/common-dialog/common-dialog.component.css b/src/app/app-modules/core/components/common-dialog/common-dialog.component.css
index 2f7451e..757983e 100644
--- a/src/app/app-modules/core/components/common-dialog/common-dialog.component.css
+++ b/src/app/app-modules/core/components/common-dialog/common-dialog.component.css
@@ -7,6 +7,14 @@
     font-weight: 400;
 }
 
+.action .button-confirm {
+    border: 1px solid lightgray;
+    margin-left: 5px;
+    width: 70px;
+    background-color: #0277bd !important;
+    color: white !important;
+}
+
 .message {
     font-size: 16px;
     /* color: rgba(0, 0, 0, 0.6); */
diff --git a/src/app/app-modules/core/components/common-dialog/common-dialog.component.html b/src/app/app-modules/core/components/common-dialog/common-dialog.component.html
index 67c0335..c467962 100644
--- a/src/app/app-modules/core/components/common-dialog/common-dialog.component.html
+++ b/src/app/app-modules/core/components/common-dialog/common-dialog.component.html
@@ -212,7 +212,7 @@ <h4>{{ message | titlecase }}</h4>
       {{ btnCancelText }}
     </button>
     <button
-      class="full-width-login button-ok"
+      class="full-width-login button-confirm"
       (click)="dialogRef.close(selectedValue)"
       cdkFocusInitial
     >
diff --git a/src/app/app-modules/core/components/open-previous-visit-details/open-previous-visit-details.component.html b/src/app/app-modules/core/components/open-previous-visit-details/open-previous-visit-details.component.html
index 42cfa0c..0f9565f 100644
--- a/src/app/app-modules/core/components/open-previous-visit-details/open-previous-visit-details.component.html
+++ b/src/app/app-modules/core/components/open-previous-visit-details/open-previous-visit-details.component.html
@@ -179,18 +179,15 @@ <h4 class="norecord" style="text-align: center">
                               >
                                 <ng-container
                                   *ngFor="
-                                    let viewProvisionalDiagnosisProvided of visit
+                                    let provisionalDiagnosis of visit
                                       .benPreviousData?.doctorData?.diagnosis
                                       ?.provisionalDiagnosisList
                                   "
                                 >
                                   <ng-container
-                                    *ngIf="
-                                      viewProvisionalDiagnosisProvided.term !==
-                                      ''
-                                    "
+                                    *ngIf="provisionalDiagnosis.term !== ''"
                                   >
-                                    {{ viewProvisionalDiagnosisProvided.term }},
+                                    {{ provisionalDiagnosis.term }},
                                   </ng-container>
                                 </ng-container>
                                 <ng-container
diff --git a/src/app/app-modules/core/components/open-previous-visit-details/open-previous-visit-details.component.ts b/src/app/app-modules/core/components/open-previous-visit-details/open-previous-visit-details.component.ts
index 071b9de..4e3cff2 100644
--- a/src/app/app-modules/core/components/open-previous-visit-details/open-previous-visit-details.component.ts
+++ b/src/app/app-modules/core/components/open-previous-visit-details/open-previous-visit-details.component.ts
@@ -55,7 +55,7 @@ export class OpenPreviousVisitDetailsComponent implements OnInit {
   }
 
   loadPreviousVisitDetails() {
-    this.doctorService.getMMUHistory().subscribe(
+    this.doctorService.getTMHistory().subscribe(
       (data: any) => {
         console.log('data', data);
         if (data.statusCode === 200) {
@@ -86,7 +86,7 @@ export class OpenPreviousVisitDetailsComponent implements OnInit {
           beneficiaryRegID: item.beneficiaryRegID,
           visitCode: item.visitCode,
         };
-        this.doctorService.getMMUCasesheetData(reqObj).subscribe((res: any) => {
+        this.doctorService.getTMCasesheetData(reqObj).subscribe((res: any) => {
           if (res.statusCode === 200 && res.data !== null) {
             this.previousVisitData[i]['benPreviousData'] = res.data;
             this.filteredHistory = res.data;
diff --git a/src/app/app-modules/core/core.module.ts b/src/app/app-modules/core/core.module.ts
index 5cd420e..d3595e6 100644
--- a/src/app/app-modules/core/core.module.ts
+++ b/src/app/app-modules/core/core.module.ts
@@ -54,7 +54,6 @@ import { CalibrationComponent } from './components/calibration/calibration.compo
 import { ConfirmatoryDiagnosisDirective } from './directives/confirmatory-diagnosis.directive';
 import { DisableFormControlDirective } from './directives/disableFormControl.directive';
 import { NullDefaultValueDirective } from './directives/null-default-value.directive';
-import { OpenModalDirective } from './directives/open-modal.directive';
 import { AllergenSearchComponent } from './components/allergen-search/allergen-search.component';
 import { SpinnerComponent } from './components/spinner/spinner.component';
 import { StringValidatorDirective } from './directives/stringValidator.directive';
@@ -104,7 +103,6 @@ import { RegistrarService } from '../registrar/shared/services/registrar.service
     SpecialistLoginComponent,
     MyEmailDirective,
     MyMobileNumberDirective,
-    OpenModalDirective,
     ConfirmatoryDiagnosisDirective,
     MyNameDirective,
     MyPasswordDirective,
@@ -137,7 +135,6 @@ import { RegistrarService } from '../registrar/shared/services/registrar.service
     PreviousDetailsComponent,
     MyEmailDirective,
     MyMobileNumberDirective,
-    OpenModalDirective,
     ConfirmatoryDiagnosisDirective,
     MyNameDirective,
     MyPasswordDirective,
diff --git a/src/app/app-modules/core/directives/open-modal.directive.ts b/src/app/app-modules/core/directives/open-modal.directive.ts
deleted file mode 100644
index 9addb33..0000000
--- a/src/app/app-modules/core/directives/open-modal.directive.ts
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * AMRIT – Accessible Medical Records via Integrated Technology
- * Integrated EHR (Electronic Health Records) Solution
- *
- * Copyright (C) "Piramal Swasthya Management and Research Institute"
- *
- * This file is part of AMRIT.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see https://www.gnu.org/licenses/.
- */
-
-import {
-  Directive,
-  HostListener,
-  Input,
-  ElementRef,
-  OnInit,
-  DoCheck,
-} from '@angular/core';
-import {
-  FormArray,
-  FormBuilder,
-  FormGroup,
-  AbstractControl,
-} from '@angular/forms';
-import { SetLanguageComponent } from '../components/set-language.component';
-import { HttpServiceService } from '../services/http-service.service';
-import { MatDialog } from '@angular/material/dialog';
-import { GeneralUtils } from '../../nurse-doctor/shared/utility';
-import { DiagnosisSearchComponent } from '../components/diagnosis-search/diagnosis-search.component';
-
-@Directive({
-  selector: '[appOpenModal]',
-})
-export class OpenModalDirective implements OnInit, DoCheck {
-  @Input()
-  previousSelected: any;
-
-  @Input()
-  diagnosisListForm!: AbstractControl<any, any>;
-  currentLanguageSet: any;
-
-  @HostListener('keyup.enter') onKeyDown() {
-    this.openDialog();
-  }
-
-  @HostListener('click') onClick() {
-    if (this.el.nativeElement.nodeName !== 'INPUT') this.openDialog();
-  }
-
-  utils = new GeneralUtils(this.fb);
-
-  constructor(
-    private fb: FormBuilder,
-    private el: ElementRef,
-    private dialog: MatDialog,
-    private httpServiceService: HttpServiceService,
-  ) {}
-
-  ngOnInit() {
-    this.fetchLanguageResponse();
-  }
-
-  openDialog(): void {
-    const searchTerm =
-      this.diagnosisListForm.value.viewProvisionalDiagnosisProvided;
-    if (searchTerm.length > 2) {
-      const dialogRef = this.dialog.open(DiagnosisSearchComponent, {
-        width: '800px',
-        hasBackdrop: false,
-        data: {
-          searchTerm: searchTerm,
-          addedDiagnosis: this.previousSelected,
-          diagonasisType:
-            this.currentLanguageSet.DiagnosisDetails.provisionaldiagnosis,
-        },
-      });
-      dialogRef.afterClosed().subscribe((result) => {
-        if (result) {
-          const formArray = this.diagnosisListForm.parent as FormArray;
-          const len = formArray.length;
-          for (let i = len - 1, j = 0; i < len + result.length - 1; i++, j++) {
-            (<FormGroup>formArray.at(i)).controls['term'].setValue(
-              result[j].term,
-            );
-            (<FormGroup>formArray.at(i)).controls['conceptID'].setValue(
-              result[j].conceptID,
-            );
-            (<FormGroup>formArray.at(i)).controls[
-              'provisionalDiagnosis'
-            ].setValue(result[j].term);
-            (<FormGroup>formArray.at(i)).controls[
-              'provisionalDiagnosis'
-            ].disable();
-            this.diagnosisListForm.markAsDirty();
-            if (formArray.length < len + result.length - 1)
-              formArray.push(this.utils.initProvisionalDiagnosisList());
-          }
-        }
-      });
-    }
-  }
-  ngDoCheck() {
-    this.fetchLanguageResponse();
-  }
-
-  fetchLanguageResponse() {
-    const getLanguageJson = new SetLanguageComponent(this.httpServiceService);
-    getLanguageJson.setLanguage();
-    this.currentLanguageSet = getLanguageJson.currentLanguageObject;
-  }
-}
diff --git a/src/app/app-modules/nurse-doctor/anc/anc-immunization/anc-immunization.component.html b/src/app/app-modules/nurse-doctor/anc/anc-immunization/anc-immunization.component.html
index 2e713fd..3a0880d 100644
--- a/src/app/app-modules/nurse-doctor/anc/anc-immunization/anc-immunization.component.html
+++ b/src/app/app-modules/nurse-doctor/anc/anc-immunization/anc-immunization.component.html
@@ -4,22 +4,24 @@
       class="col-xs-12 col-sm-6 col-md-4 col-lg-4 box"
       *ngIf="enableTTStatus_1_2 || enableTTStatus_1_2_b"
     >
-      <mat-label class="mat-label-text">{{
-        current_language_set?.ancData?.ancImmune?.tt1Status
-      }}</mat-label>
-      <mat-select
-        class="input-full-width"
-        name="tT_1Status"
-        formControlName="tT_1Status"
-        (change)="checkTT_1Status(tT_1Status)"
-      >
-        <mat-option
-          *ngFor="let immunizationStatus_1 of selectImmunizationStatus"
-          [value]="immunizationStatus_1"
+      <mat-form-field [style.width]="'100%'">
+        <mat-label class="mat-label-text">{{
+          current_language_set?.ancData?.ancImmune?.tt1Status
+        }}</mat-label>
+        <mat-select
+          class="input-full-width"
+          name="tT_1Status"
+          formControlName="tT_1Status"
+          (change)="checkTT_1Status(tT_1Status)"
         >
-          {{ immunizationStatus_1 }}
-        </mat-option>
-      </mat-select>
+          <mat-option
+            *ngFor="let immunizationStatus_1 of selectImmunizationStatus"
+            [value]="immunizationStatus_1"
+          >
+            {{ immunizationStatus_1 }}
+          </mat-option>
+        </mat-select>
+      </mat-form-field>
     </div>
     <div
       class="col-xs-12 col-sm-6 col-md-4 col-lg-4"
@@ -88,22 +90,24 @@
         (enableTTStatus_1_2_b && tT_1Status !== null)
       "
     >
-      <mat-label class="mat-label-text">{{
-        current_language_set?.ancData?.ancImmune?.tt2Status
-      }}</mat-label>
-      <mat-select
-        class="input-full-width"
-        name="tT_2Status"
-        formControlName="tT_2Status"
-        (change)="checkTT_2Status(tT_2Status)"
-      >
-        <mat-option
-          *ngFor="let immunizationStatus_2 of selectImmunizationStatus"
-          [value]="immunizationStatus_2"
+      <mat-form-field [style.width]="'100%'">
+        <mat-label class="mat-label-text">{{
+          current_language_set?.ancData?.ancImmune?.tt2Status
+        }}</mat-label>
+        <mat-select
+          class="input-full-width"
+          name="tT_2Status"
+          formControlName="tT_2Status"
+          (change)="checkTT_2Status(tT_2Status)"
         >
-          {{ immunizationStatus_2 }}
-        </mat-option>
-      </mat-select>
+          <mat-option
+            *ngFor="let immunizationStatus_2 of selectImmunizationStatus"
+            [value]="immunizationStatus_2"
+          >
+            {{ immunizationStatus_2 }}
+          </mat-option>
+        </mat-select>
+      </mat-form-field>
     </div>
     <div
       class="col-xs-12 col-sm-6 col-md-4 col-lg-4"
@@ -178,22 +182,24 @@
         (enableTTStatus_1_2 && tT_1Status === 'NA' && tT_2Status !== null)
       "
     >
-      <mat-label class="mat-label-text">{{
-        current_language_set?.ancData?.ancImmune?.ttBoosterStatus
-      }}</mat-label>
-      <mat-select
-        class="input-full-width"
-        name="tT_3Status"
-        formControlName="tT_3Status"
-        (change)="checkTT_3Status(tT_3Status)"
-      >
-        <mat-option
-          *ngFor="let immunizationStatus_3 of selectImmunizationStatus"
-          [value]="immunizationStatus_3"
+      <mat-form-field [style.width]="'100%'">
+        <mat-label class="mat-label-text">{{
+          current_language_set?.ancData?.ancImmune?.ttBoosterStatus
+        }}</mat-label>
+        <mat-select
+          class="input-full-width"
+          name="tT_3Status"
+          formControlName="tT_3Status"
+          (change)="checkTT_3Status(tT_3Status)"
         >
-          {{ immunizationStatus_3 }}
-        </mat-option>
-      </mat-select>
+          <mat-option
+            *ngFor="let immunizationStatus_3 of selectImmunizationStatus"
+            [value]="immunizationStatus_3"
+          >
+            {{ immunizationStatus_3 }}
+          </mat-option>
+        </mat-select>
+      </mat-form-field>
     </div>
     <div
       class="col-xs-12 col-sm-6 col-md-4 col-lg-4"
diff --git a/src/app/app-modules/nurse-doctor/case-record/cancer-case-record/cancer-case-record.component.html b/src/app/app-modules/nurse-doctor/case-record/cancer-case-record/cancer-case-record.component.html
index 7502fed..8539d82 100644
--- a/src/app/app-modules/nurse-doctor/case-record/cancer-case-record/cancer-case-record.component.html
+++ b/src/app/app-modules/nurse-doctor/case-record/cancer-case-record/cancer-case-record.component.html
@@ -177,7 +177,7 @@ <h4>{{ current_language_set?.previousvisit?.currentvitals }}</h4>
         >
           <h5>{{ current_language_set?.previousvisit?.bodyweighttrends }}</h5>
 
-          <!-- <canvas
+          <canvas
             baseChart
             [datasets]="weightChartData"
             [labels]="weightChartLabels"
@@ -185,7 +185,7 @@ <h5>{{ current_language_set?.previousvisit?.bodyweighttrends }}</h5>
             [legend]="weightChartLegend"
             [type]="'line'"
             (chartClick)="chartClicked('bw')"
-          ></canvas> -->
+          ></canvas>
         </div>
         <div class="no_records" *ngIf="!weightChartData.length">
           <h4>{{ current_language_set?.common?.previousRecordWeight }}</h4>
@@ -200,15 +200,15 @@ <h4>{{ current_language_set?.common?.previousRecordWeight }}</h4>
           *ngIf="bpChartData.length && bpChartLabels.length"
         >
           <h5>{{ current_language_set?.common?.bloodPressureTrend }}</h5>
-          <!-- <canvas
+          <canvas
             baseChart
-            [datasets]="weightChartData"
-            [labels]="weightChartLabels"
+            [datasets]="bpChartData"
+            [labels]="bpChartLabels"
             [options]="lineChartOptions"
-            [legend]="weightChartLegend"
+            [legend]="bpChartLegend"
             [type]="'line'"
             (chartClick)="chartClicked('bp')"
-          ></canvas> -->
+          ></canvas>
         </div>
         <div class="no_records" *ngIf="!bpChartData.length">
           <h4>
@@ -227,15 +227,15 @@ <h4>
         >
           <h5>{{ current_language_set?.common?.bloodGlucoseTrend }}</h5>
 
-          <!-- <canvas
+          <canvas
             baseChart
-            [datasets]="weightChartData"
-            [labels]="weightChartLabels"
+            [datasets]="bgChartData"
+            [labels]="bgChartLabels"
             [options]="lineChartOptions"
-            [legend]="weightChartLegend"
+            [legend]="bgChartLegend"
             [type]="'line'"
             (chartClick)="chartClicked('bg')"
-          ></canvas> -->
+          ></canvas>
         </div>
         <div class="no_records" *ngIf="!bgChartData.length">
           <h4>
diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/anc-diagnosis/anc-diagnosis.component.html b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/anc-diagnosis/anc-diagnosis.component.html
index b477782..0ea5811 100644
--- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/anc-diagnosis/anc-diagnosis.component.html
+++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/anc-diagnosis/anc-diagnosis.component.html
@@ -49,36 +49,38 @@
         </mat-form-field>
       </div>
       <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 box">
-        <mat-label class="mat-label-text">{{
-          current_language_set?.casesheet?.complications
-        }}</mat-label>
-        <mat-select
-          class="select-full-width"
-          name="complicationOfCurrentPregnancyList"
-          formControlName="complicationOfCurrentPregnancyList"
-          multiple
-          (change)="
-            resetOtherPregnancyComplication(
-              complicationOfCurrentPregnancyList,
-              0
-            );
-            displayPositive(complicationOfCurrentPregnancyList)
-          "
-        >
-          <mat-option
-            *ngFor="let complication of masterData?.pregComplicationTypes"
-            [value]="complication"
-            [disabled]="
-              !showAllPregComplication &&
-              ((disableNonePregnancyComplication &&
-                complication.pregComplicationType === 'None') ||
-                (!disableNonePregnancyComplication &&
-                  complication.pregComplicationType !== 'None'))
+        <mat-form-field [style.width]="'100%'">
+          <mat-label class="mat-label-text">{{
+            current_language_set?.casesheet?.complications
+          }}</mat-label>
+          <mat-select
+            class="select-full-width"
+            name="complicationOfCurrentPregnancyList"
+            formControlName="complicationOfCurrentPregnancyList"
+            multiple
+            (change)="
+              resetOtherPregnancyComplication(
+                complicationOfCurrentPregnancyList,
+                0
+              );
+              displayPositive(complicationOfCurrentPregnancyList)
             "
           >
-            {{ complication.pregComplicationType }}
-          </mat-option>
-        </mat-select>
+            <mat-option
+              *ngFor="let complication of masterData?.pregComplicationTypes"
+              [value]="complication"
+              [disabled]="
+                !showAllPregComplication &&
+                ((disableNonePregnancyComplication &&
+                  complication.pregComplicationType === 'None') ||
+                  (!disableNonePregnancyComplication &&
+                    complication.pregComplicationType !== 'None'))
+              "
+            >
+              {{ complication.pregComplicationType }}
+            </mat-option>
+          </mat-select>
+        </mat-form-field>
       </div>
       <div
         class="col-xs-12 col-sm-6 col-md-4 col-lg-4 box"
diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/general-opd-diagnosis/general-opd-diagnosis.component.html b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/general-opd-diagnosis/general-opd-diagnosis.component.html
index f544a8c..4273500 100644
--- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/general-opd-diagnosis/general-opd-diagnosis.component.html
+++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/general-opd-diagnosis/general-opd-diagnosis.component.html
@@ -22,7 +22,7 @@ <h4>{{ current_language_set?.casesheet?.provisionalDiag }}*</h4>
                   appDiagnosisSearch
                   [diagnosisListForm]="diagnosis"
                   required
-                  name="viewProvisionalDiagnosisProvided"
+                  name="viewDiagnosisProvided"
                   formControlName="viewProvisionalDiagnosisProvided"
                   maxlength="100"
                   minlength="3"
@@ -46,6 +46,7 @@ <h4>{{ current_language_set?.casesheet?.provisionalDiag }}*</h4>
                 type="button"
                 color="warn"
                 class="mat_warn_circle"
+                style="margin-right: 5px"
                 *ngIf="
                   diagnosis.get('viewProvisionalDiagnosisProvided')?.disabled ||
                   i !== 0 ||
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 4a9f953..4002c9a 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
@@ -162,19 +162,17 @@ export class GeneralOpdDiagnosisComponent
       });
   }
 
-  patchDiagnosisDetails(viewProvisionalDiagnosisProvided: any) {
-    const savedDiagnosisData = viewProvisionalDiagnosisProvided;
+  patchDiagnosisDetails(provisionalDiagnosis: any) {
+    const savedDiagnosisData = provisionalDiagnosis;
     const diagnosisArrayList = this.generalDiagnosisForm.controls[
       'provisionalDiagnosisList'
     ] as FormArray;
-    console.log('from diagnosis' + viewProvisionalDiagnosisProvided[0].term);
+    console.log('from diagnosis' + provisionalDiagnosis[0].term);
     if (
-      viewProvisionalDiagnosisProvided[0].term !== '' &&
-      viewProvisionalDiagnosisProvided[0].conceptID !== ''
+      provisionalDiagnosis[0].term !== '' &&
+      provisionalDiagnosis[0].conceptID !== ''
     ) {
-      console.log(
-        'from diagnosis second' + viewProvisionalDiagnosisProvided[0].term,
-      );
+      console.log('from diagnosis second' + provisionalDiagnosis[0].term);
 
       for (let i = 0; i < savedDiagnosisData.length; i++) {
         diagnosisArrayList.at(i).patchValue({
@@ -243,8 +241,8 @@ export class GeneralOpdDiagnosisComponent
     }
   }
 
-  checkProvisionalDiagnosisValidity(viewProvisionalDiagnosisProvided: any) {
-    const temp = viewProvisionalDiagnosisProvided.value;
+  checkProvisionalDiagnosisValidity(provisionalDiagnosis: any) {
+    const temp = provisionalDiagnosis.value;
     if (temp.term && temp.conceptID) {
       return false;
     } else {
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 4c47f82..85fc05a 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
@@ -29,24 +29,26 @@
       style="width: 300px"
       *ngIf="!enableNCDCondition"
     >
-      <mat-label class="mat-label-text">{{
-        current_language_set?.casesheet?.ncdCondition
-      }}</mat-label>
-      <mat-select
-        class="input-full-width"
-        name="ncdScreeningCondition"
-        multiple
-        (change)="changeNcdScreeningCondition($event, $event)"
-        [(ngModel)]="temp"
-        [ngModelOptions]="{ standalone: true }"
-      >
-        <mat-option
-          *ngFor="let ncdCareCondition of ncdCareConditions"
-          [value]="ncdCareCondition.screeningCondition"
-        >
-          {{ ncdCareCondition.screeningCondition }}</mat-option
+      <mat-form-field [style.width]="'100%'">
+        <mat-label class="mat-label-text">{{
+          current_language_set?.casesheet?.ncdCondition
+        }}</mat-label>
+        <mat-select
+          class="input-full-width"
+          name="ncdScreeningCondition"
+          multiple
+          (change)="changeNcdScreeningCondition($event, $event)"
+          [(ngModel)]="temp"
+          [ngModelOptions]="{ standalone: true }"
         >
-      </mat-select>
+          <mat-option
+            *ngFor="let ncdCareCondition of ncdCareConditions"
+            [value]="ncdCareCondition.screeningCondition"
+          >
+            {{ ncdCareCondition.screeningCondition }}</mat-option
+          >
+        </mat-select>
+      </mat-form-field>
     </div>
     <div
       class="col-xs-12"
@@ -70,21 +72,23 @@
       </mat-form-field>
     </div>
     <div class="col-xs-12 col-xs-6 box" style="width: 300px">
-      <mat-label class="mat-label-text">{{
-        current_language_set?.casesheet?.typeOfNcd
-      }}</mat-label>
-      <mat-select
-        class="input-full-width"
-        name="ncdCareType"
-        formControlName="ncdCareType"
-      >
-        <mat-option
-          *ngFor="let ncdCareType of ncdCareTypes"
-          [value]="ncdCareType"
-        >
-          {{ ncdCareType.ncdCareType }}</mat-option
+      <mat-form-field [style.width]="'100%'">
+        <mat-label class="mat-label-text">{{
+          current_language_set?.casesheet?.typeOfNcd
+        }}</mat-label>
+        <mat-select
+          class="input-full-width"
+          name="ncdCareType"
+          formControlName="ncdCareType"
         >
-      </mat-select>
+          <mat-option
+            *ngFor="let ncdCareType of ncdCareTypes"
+            [value]="ncdCareType"
+          >
+            {{ ncdCareType.ncdCareType }}</mat-option
+          >
+        </mat-select>
+      </mat-form-field>
     </div>
     <div class="col-xs-12 col-sm-6 col-md-6 col-lg-6" style="display: none">
       <mat-form-field class="input-full-width">
@@ -126,7 +130,7 @@ <h4>{{ current_language_set?.casesheet?.provisionalDiag }}</h4>
                     allowText="inputFieldValidator"
                     appDiagnosisSearch
                     [diagnosisListForm]="diagnosis"
-                    name="viewProvisionalDiagnosisProvided"
+                    name="viewDiagnosisProvided"
                     formControlName="viewProvisionalDiagnosisProvided"
                     maxlength="100"
                     minlength="3"
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 d232fb4..76488ea 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
@@ -154,19 +154,17 @@ export class NcdCareDiagnosisComponent implements OnInit, DoCheck {
 
     this.generalDiagnosisForm.patchValue(diagnosis);
   }
-  patchProvisionalDiagnosisDetails(viewProvisionalDiagnosisProvided: any) {
-    const savedDiagnosisData = viewProvisionalDiagnosisProvided;
+  patchProvisionalDiagnosisDetails(provisionalDiagnosis: any) {
+    const savedDiagnosisData = provisionalDiagnosis;
     const diagnosisArrayList = this.generalDiagnosisForm.controls[
       'provisionalDiagnosisList'
     ] as FormArray;
-    console.log('from diagnosis' + viewProvisionalDiagnosisProvided[0].term);
+    console.log('from diagnosis' + provisionalDiagnosis[0].term);
     if (
-      viewProvisionalDiagnosisProvided[0].term !== '' &&
-      viewProvisionalDiagnosisProvided[0].conceptID !== ''
+      provisionalDiagnosis[0].term !== '' &&
+      provisionalDiagnosis[0].conceptID !== ''
     ) {
-      console.log(
-        'from diagnosis second' + viewProvisionalDiagnosisProvided[0].term,
-      );
+      console.log('from diagnosis second' + provisionalDiagnosis[0].term);
 
       for (let i = 0; i < savedDiagnosisData.length; i++) {
         diagnosisArrayList.at(i).patchValue({
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 2061918..c1c5db6 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
@@ -25,7 +25,7 @@ <h4 *ngIf="!enableProvisionalDiag">
                   allowText="inputFieldValidator"
                   appDiagnosisSearch
                   [diagnosisListForm]="diagnosis"
-                  name="viewProvisionalDiagnosisProvided"
+                  name="viewDiagnosisProvided"
                   formControlName="viewProvisionalDiagnosisProvided"
                   maxlength="100"
                   minlength="3"
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 ee24d4f..e901da0 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
@@ -193,19 +193,17 @@ export class NcdScreeningDiagnosisComponent
       });
   }
 
-  patchDiagnosisDetails(viewProvisionalDiagnosisProvided: any) {
-    const savedDiagnosisData = viewProvisionalDiagnosisProvided;
+  patchDiagnosisDetails(provisionalDiagnosis: any) {
+    const savedDiagnosisData = provisionalDiagnosis;
     const diagnosisArrayList = this.generalDiagnosisForm.controls[
       'provisionalDiagnosisList'
     ] as FormArray;
-    console.log('from diagnosis' + viewProvisionalDiagnosisProvided[0].term);
+    console.log('from diagnosis' + provisionalDiagnosis[0].term);
     if (
-      viewProvisionalDiagnosisProvided[0].term !== '' &&
-      viewProvisionalDiagnosisProvided[0].conceptID !== ''
+      provisionalDiagnosis[0].term !== '' &&
+      provisionalDiagnosis[0].conceptID !== ''
     ) {
-      console.log(
-        'from diagnosis second' + viewProvisionalDiagnosisProvided[0].term,
-      );
+      console.log('from diagnosis second' + provisionalDiagnosis[0].term);
 
       for (let i = 0; i < savedDiagnosisData.length; i++) {
         diagnosisArrayList.at(i).patchValue({
@@ -274,8 +272,8 @@ export class NcdScreeningDiagnosisComponent
       diagnosisListForm.push(this.utils.initProvisionalDiagnosisList());
     }
   }
-  checkProvisionalDiagnosisValidity(viewProvisionalDiagnosisProvided: any) {
-    const temp = viewProvisionalDiagnosisProvided.value;
+  checkProvisionalDiagnosisValidity(provisionalDiagnosis: any) {
+    const temp = provisionalDiagnosis.value;
     if (temp.term && temp.conceptID) {
       return false;
     } else {
diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/pnc-diagnosis/pnc-diagnosis.component.html b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/pnc-diagnosis/pnc-diagnosis.component.html
index 60f5005..09ecfd8 100644
--- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/pnc-diagnosis/pnc-diagnosis.component.html
+++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/pnc-diagnosis/pnc-diagnosis.component.html
@@ -49,6 +49,7 @@ <h4>{{ current_language_set?.casesheet?.provisionalDiag }}</h4>
                     type="button"
                     color="warn"
                     class="mat_warn_circle"
+                    style="margin-right: 5px"
                     *ngIf="
                       i !== 0 ||
                       (i === 0 &&
@@ -98,12 +99,12 @@ <h4>{{ current_language_set?.common?.confirmDiagnosis }}</h4>
                     matInput
                     appConfirmatoryDiagnosis
                     [diagnosisListForm]="confirmatoryDiagnosis"
-                    name="confirmatoryDiagnosis"
-                    formControlName="confirmatoryDiagnosis"
+                    name="viewConfirmatoryDiagnosisProvided"
+                    formControlName="viewConfirmatoryDiagnosisProvided"
                     maxlength="100"
                     minlength="3"
                     [previousSelected]="
-                      generalDiagnosisForm.value.confirmatoryDiagnosisList
+                      generalDiagnosisForm.value?.confirmatoryDiagnosisList
                     "
                   />
                   <mat-icon
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 e35c5a4..8286bc3 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
@@ -369,8 +369,8 @@ export class PncDiagnosisComponent
     }
   }
 
-  checkProvisionalDiagnosisValidity(viewProvisionalDiagnosisProvided: any) {
-    const temp = viewProvisionalDiagnosisProvided.value;
+  checkProvisionalDiagnosisValidity(provisionalDiagnosis: any) {
+    const temp = provisionalDiagnosis.value;
     if (temp.term && temp.conceptID) {
       return false;
     } else {
diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/doctor-investigations/doctor-investigations.component.html b/src/app/app-modules/nurse-doctor/case-record/general-case-record/doctor-investigations/doctor-investigations.component.html
index b547e1a..179ef88 100644
--- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/doctor-investigations/doctor-investigations.component.html
+++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/doctor-investigations/doctor-investigations.component.html
@@ -55,7 +55,7 @@
 
 <div class="row" [formGroup]="generalDoctorInvestigationForm">
   <div class="col-xs-12 col-sm-6">
-    <mat-form-field>
+    <mat-form-field style="width: 100%">
       <mat-label class="mat-label-text">{{
         current_language_set?.labTechnicianData?.testName
       }}</mat-label>
@@ -77,7 +77,7 @@
     </mat-form-field>
   </div>
   <div class="col-xs-12 col-sm-6">
-    <mat-form-field>
+    <mat-form-field style="width: 100%">
       <mat-label class="mat-label-text">{{
         current_language_set?.labTechnicianData?.radiologyimaging
       }}</mat-label>
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 f579c58..3f27ac3 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
@@ -15,7 +15,7 @@
 
     <div class="clearfix"></div>
 
-    <section class="m-t-20 overflow">
+    <section class="m-t-20">
       <table
         class="table table-responsive table-bordered"
         aria-describedby="LabPagedtbl"
@@ -228,7 +228,7 @@ <h4>{{ fetosenseTestName }}</h4>
   <mat-tab label="{{ current_language_set?.Reports?.radiologyreports }}">
     <div class="m-t-20 overflow">
       <table
-        class="table table-responsive table-bordered"
+        class="table table-responsive-report table-bordered"
         aria-describedby="radiologyResultTbl"
       >
         <tr>
diff --git a/src/app/app-modules/nurse-doctor/case-sheet/cancer-case-sheet/cancer-case-sheet.component.css b/src/app/app-modules/nurse-doctor/case-sheet/cancer-case-sheet/cancer-case-sheet.component.css
index 91066a5..88d274c 100644
--- a/src/app/app-modules/nurse-doctor/case-sheet/cancer-case-sheet/cancer-case-sheet.component.css
+++ b/src/app/app-modules/nurse-doctor/case-sheet/cancer-case-sheet/cancer-case-sheet.component.css
@@ -3,23 +3,19 @@
     background: white;
     font-size: 14px;
   }
-  .page-break:last-child {
-    page-break-after: auto;
-  }
   .non-printable {
     display: none;
   }
+  .page-break:last-child {
+    page-break-after: auto;
+  }
   @page {
     margin: 1.3cm;
   }
 }
 
-.navbar {
-  padding: 7px 0px;
-}
-
-.m-t-60 {
-  margin-top: 60px;
+.container {
+  background: white;
 }
 
 .example-fab.mat-mini-fab {
@@ -28,25 +24,34 @@
   z-index: 3;
 }
 
-.upward {
-  bottom: 80px;
+.back {
+  bottom: 30px;
 }
 
 .print {
-  bottom: 130px;
+  bottom: 80px;
 }
 
-.back {
-  bottom: 30px;
+.upward {
+  bottom: 130px;
 }
 
 .select {
   bottom: 180px;
 }
 
-.comment-fab.mat-mini-fab.edit {
+.m-b-10 {
+  margin-bottom: 10px;
+}
+
+.iemr-tooltip {
+  background: yellowgreen;
+  color: brown;
+  display: none;
+}
+
+.button_postion {
+  text-align: -webkit-right;
   position: fixed;
-  left: 20px;
-  bottom: 30px;
-  z-index: 3;
-}
\ No newline at end of file
+  margin-top: 23rem;
+}
diff --git a/src/app/app-modules/nurse-doctor/case-sheet/cancer-case-sheet/cancer-case-sheet.component.html b/src/app/app-modules/nurse-doctor/case-sheet/cancer-case-sheet/cancer-case-sheet.component.html
index aadf441..872c32e 100644
--- a/src/app/app-modules/nurse-doctor/case-sheet/cancer-case-sheet/cancer-case-sheet.component.html
+++ b/src/app/app-modules/nurse-doctor/case-sheet/cancer-case-sheet/cancer-case-sheet.component.html
@@ -1,29 +1,111 @@
-<nav class="navbar navbar-default navbar-fixed-top" *ngIf="!hideBack">
-  <div class="container non-printable">
-    <div class="row">
-      <button
-        mat-raised-button
-        color="primary"
-        class="pull-right"
-        (click)="printPage()"
-      >
-        {{ current_language_set?.casesheet?.print }}
-      </button>
-      <button
-        mat-raised-button
-        color="primary"
-        class="pull-left"
-        (click)="goBack()"
-      >
-        {{ current_language_set?.common?.back }}
-      </button>
+<div class="container" *ngIf="!hideBack">
+  <div class="row">
+    <div class="col-12">
+      <div>
+        <button
+          mat-raised-button
+          color="primary"
+          class="pull-right mat_blue"
+          (click)="printPage()"
+        >
+          {{ current_language_set?.casesheet?.print }}
+        </button>
+      </div>
+      <div>
+        <button
+          mat-raised-button
+          color="primary"
+          class="pull-left mat_blue"
+          (click)="goBack()"
+        >
+          {{ current_language_set?.common?.back }}
+        </button>
+      </div>
     </div>
   </div>
-</nav>
+</div>
+
+<div class="col-12 button_postion">
+  <div>
+    <button
+      mat-mini-fab
+      matTooltip="{{ current_language_set?.casesheet?.caseComponent }}"
+      matTooltipPosition="left"
+      style="margin-bottom: 5px"
+      matTooltipClass="iemr-tooltip"
+      class="example-fab select non-printable mat_blue_circle"
+      color="primary"
+      (click)="selectPrintPage()"
+    >
+      <mat-icon>view_module</mat-icon>
+    </button>
+  </div>
+
+  <div>
+    <button
+      mat-mini-fab
+      matTooltip="{{ current_language_set?.casesheet?.goTop }}"
+      matTooltipPosition="left"
+      style="margin-bottom: 5px"
+      class="example-fab upward non-printable mat_blue_circle"
+      color="primary"
+      (click)="goToTop()"
+      *ngIf="!previous"
+    >
+      <mat-icon>arrow_upward</mat-icon>
+    </button>
+  </div>
+
+  <div>
+    <button
+      mat-mini-fab
+      matTooltip="{{ current_language_set?.casesheet?.printCaseheet }}"
+      matTooltipPosition="left"
+      class="example-fab print non-printable mat_blue_circle"
+      color="primary"
+      style="margin-bottom: 5px"
+      (click)="printPage()"
+      *ngIf="!previous"
+    >
+      <mat-icon>print</mat-icon>
+    </button>
+  </div>
+
+  <div>
+    <button
+      mat-mini-fab
+      matTooltip="{{ current_language_set?.casesheet?.workList }}"
+      matTooltipPosition="left"
+      class="example-fab back non-printable mat_blue_circle"
+      style="margin-bottom: 5px"
+      color="primary"
+      (click)="goBack()"
+      *ngIf="!hideBack"
+    >
+      <mat-icon>chevron_left</mat-icon>
+    </button>
+  </div>
+
+  <div>
+    <button
+      *ngIf="oncologistRemarks"
+      mat-mini-fab
+      matTooltip="{{
+        current_language_set?.common?.enterOncologistObservation
+      }}"
+      matTooltipPosition="right"
+      class="comment-fab edit non-printable"
+      color="primary"
+      (click)="getOncologistRemarks()"
+    >
+      <mat-icon>edit</mat-icon>
+    </button>
+  </div>
+</div>
 
 <div class="m-t-60 non-printable"></div>
 
-<div>
+<div style="margin-top: 20px">
   <app-cancer-doctor-diagnosis-case-sheet
     [printPagePreviewSelect]="printPagePreviewSelect"
     [casesheetData]="caseSheetData"
@@ -44,63 +126,3 @@
     ></app-cancer-examination-case-sheet>
   </ng-container>
 </div>
-
-<button
-  mat-mini-fab
-  matTooltip="{{ current_language_set?.casesheet?.workList }}"
-  matTooltipPosition="left"
-  class="example-fab back non-printable"
-  color="primary"
-  (click)="goBack()"
-  *ngIf="!hideBack"
->
-  <mat-icon>chevron_left</mat-icon>
-</button>
-
-<button
-  mat-mini-fab
-  matTooltip="{{ current_language_set?.casesheet?.goTop }}"
-  matTooltipPosition="left"
-  class="example-fab upward non-printable"
-  color="primary"
-  (click)="goToTop()"
-  *ngIf="!previous"
->
-  <mat-icon>arrow_upward</mat-icon>
-</button>
-
-<button
-  mat-mini-fab
-  matTooltip="{{ current_language_set?.casesheet?.printCaseheet }}"
-  matTooltipPosition="left"
-  class="example-fab print non-printable"
-  color="primary"
-  (click)="printPage()"
-  *ngIf="!previous"
->
-  <mat-icon>print </mat-icon>
-</button>
-
-<button
-  mat-mini-fab
-  matTooltip="{{ current_language_set?.casesheet?.caseComponent }}"
-  matTooltipPosition="left"
-  class="example-fab select non-printable"
-  color="primary"
-  (click)="selectPrintPage()"
-  *ngIf="!previous"
->
-  <mat-icon>view_module</mat-icon>
-</button>
-
-<button
-  *ngIf="oncologistRemarks"
-  mat-mini-fab
-  matTooltip="{{ current_language_set?.common?.enterOncologistObservation }}"
-  matTooltipPosition="right"
-  class="comment-fab edit non-printable"
-  color="primary"
-  (click)="getOncologistRemarks()"
->
-  <mat-icon>edit</mat-icon>
-</button>
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.html b/src/app/app-modules/nurse-doctor/case-sheet/cancer-case-sheet/cancer-doctor-diagnosis-case-sheet/cancer-doctor-diagnosis-case-sheet.component.html
index d70666b..1723aa2 100644
--- a/src/app/app-modules/nurse-doctor/case-sheet/cancer-case-sheet/cancer-doctor-diagnosis-case-sheet/cancer-doctor-diagnosis-case-sheet.component.html
+++ b/src/app/app-modules/nurse-doctor/case-sheet/cancer-case-sheet/cancer-doctor-diagnosis-case-sheet/cancer-doctor-diagnosis-case-sheet.component.html
@@ -299,9 +299,7 @@ <h5>
 
     <div class="row m-t-10">
       <div class="col-xs-12">
-        <h4>
-          {{ currentLanguageSet?.casesheet?.viewProvisionalDiagnosisProvided }}:
-        </h4>
+        <h4>{{ currentLanguageSet?.casesheet?.provisionalDiagnosis }}:</h4>
         <div class="textarea">
           {{ caseSheetDiagnosisData?.provisionalDiagnosisPrimaryDoctor }}
         </div>
diff --git a/src/app/app-modules/nurse-doctor/case-sheet/general-case-sheet/doctor-diagnosis-case-sheet/doctor-diagnosis-case-sheet.component.html b/src/app/app-modules/nurse-doctor/case-sheet/general-case-sheet/doctor-diagnosis-case-sheet/doctor-diagnosis-case-sheet.component.html
index 05707a7..1c4639e 100644
--- a/src/app/app-modules/nurse-doctor/case-sheet/general-case-sheet/doctor-diagnosis-case-sheet/doctor-diagnosis-case-sheet.component.html
+++ b/src/app/app-modules/nurse-doctor/case-sheet/general-case-sheet/doctor-diagnosis-case-sheet/doctor-diagnosis-case-sheet.component.html
@@ -850,7 +850,7 @@ <h4>{{ current_language_set?.casesheet?.diagnosis }}:</h4>
               {{
                 caseRecords &&
                   caseRecords.diagnosis &&
-                  caseRecords.diagnosis.viewProvisionalDiagnosisProvided
+                  caseRecords.diagnosis.provisionalDiagnosis
               }}
             </div>
           </td>
@@ -1247,7 +1247,7 @@ <h4>{{ current_language_set?.casesheet?.diagnosis }}:</h4>
               {{
                 caseRecords &&
                   caseRecords.diagnosis &&
-                  caseRecords.diagnosis.viewProvisionalDiagnosisProvided
+                  caseRecords.diagnosis.provisionalDiagnosis
               }}
             </div>
           </td>
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 9429352..c78229d 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
@@ -231,7 +231,7 @@ export class DoctorDiagnosisCaseSheetComponent
           findings: temp.findings,
           prescription: temp.prescription,
           diagnosis: {
-            viewProvisionalDiagnosisProvided: temp.diagnosis.diagnosisProvided,
+            provisionalDiagnosis: temp.diagnosis.diagnosisProvided,
             specialistAdvice: temp.diagnosis.instruction,
             externalInvestigation: temp.diagnosis.externalInvestigation,
           },
diff --git a/src/app/app-modules/nurse-doctor/doctor-worklist/doctor-worklist.component.html b/src/app/app-modules/nurse-doctor/doctor-worklist/doctor-worklist.component.html
index f4f9ce0..78a5c3e 100644
--- a/src/app/app-modules/nurse-doctor/doctor-worklist/doctor-worklist.component.html
+++ b/src/app/app-modules/nurse-doctor/doctor-worklist/doctor-worklist.component.html
@@ -283,7 +283,9 @@
                       element.specialist_flag !== 1 && !element.benArrivedFlag
                     "
                   >
-                    <span class="material-icons">voice_chat</span>
+                    <span class="material-icons" style="vertical-align: middle"
+                      >voice_chat</span
+                    >
                   </button>
                 </td>
               </ng-container>
@@ -360,7 +362,7 @@
             <strong>{{ currentLanguageSet?.common?.noRecordsFound }}</strong>
           </div>
           <div class="col-12 row">
-            <div class="col-9">
+            <div class="col-12">
               <ul class="description" *ngIf="dataSource.data.length > 0">
                 <li>
                   <div class="marker-p-f-c"></div>
@@ -413,7 +415,7 @@
               </ul>
             </div>
           </div>
-          <div class="col-12">
+          <div class="col-12" style="margin-top: 10px">
             <mat-paginator
               style="display: unset !important"
               [pageSizeOptions]="[5, 10, 20]"
diff --git a/src/app/app-modules/nurse-doctor/examination/cancer-examination/abdominal-examination/abdominal-examination.component.html b/src/app/app-modules/nurse-doctor/examination/cancer-examination/abdominal-examination/abdominal-examination.component.html
index 6e95084..b282020 100644
--- a/src/app/app-modules/nurse-doctor/examination/cancer-examination/abdominal-examination/abdominal-examination.component.html
+++ b/src/app/app-modules/nurse-doctor/examination/cancer-examination/abdominal-examination/abdominal-examination.component.html
@@ -38,22 +38,24 @@
       </div>
 
       <div class="col-6 custom-cell">
-        <mat-label class="mat-label-text">{{
-          current_language_set?.common?.select
-        }}</mat-label>
-        <mat-select
-          name="liver"
-          floatPlaceholder="never"
-          formControlName="liver"
-        >
-          <mat-option value="Not palpable"> Not palpable </mat-option>
-          <mat-option value="Palpable and smooth">
-            Palpable and smooth
-          </mat-option>
-          <mat-option value="Palpable and nodular"
-            >Palpable and nodular
-          </mat-option>
-        </mat-select>
+        <mat-form-field [style.width]="'100%'">
+          <mat-label class="mat-label-text">{{
+            current_language_set?.common?.select
+          }}</mat-label>
+          <mat-select
+            name="liver"
+            floatPlaceholder="never"
+            formControlName="liver"
+          >
+            <mat-option value="Not palpable"> Not palpable </mat-option>
+            <mat-option value="Palpable and smooth">
+              Palpable and smooth
+            </mat-option>
+            <mat-option value="Palpable and nodular"
+              >Palpable and nodular
+            </mat-option>
+          </mat-select>
+        </mat-form-field>
       </div>
 
       <div class="col-xs-6 custom-cell">
diff --git a/src/app/app-modules/nurse-doctor/examination/cancer-examination/gynecological-examination/gynecological-examination.component.html b/src/app/app-modules/nurse-doctor/examination/cancer-examination/gynecological-examination/gynecological-examination.component.html
index 687ac07..34a1c95 100644
--- a/src/app/app-modules/nurse-doctor/examination/cancer-examination/gynecological-examination/gynecological-examination.component.html
+++ b/src/app/app-modules/nurse-doctor/examination/cancer-examination/gynecological-examination/gynecological-examination.component.html
@@ -8,17 +8,19 @@
         }}
       </div>
       <div class="col-6 box">
-        <mat-label class="mat-label-text">{{
-          current_language_set?.common?.select
-        }}</mat-label>
-        <mat-select
-          name="appearanceOfCervix"
-          formControlName="appearanceOfCervix"
-        >
-          <mat-option value="Negative"> Negative </mat-option>
-          <mat-option value="Positive"> Positive </mat-option>
-          <mat-option value="Suspect"> Suspect </mat-option>
-        </mat-select>
+        <mat-form-field [style.width]="'100%'">
+          <mat-label class="mat-label-text">{{
+            current_language_set?.common?.select
+          }}</mat-label>
+          <mat-select
+            name="appearanceOfCervix"
+            formControlName="appearanceOfCervix"
+          >
+            <mat-option value="Negative"> Negative </mat-option>
+            <mat-option value="Positive"> Positive </mat-option>
+            <mat-option value="Suspect"> Suspect </mat-option>
+          </mat-select>
+        </mat-form-field>
       </div>
     </div>
 
@@ -30,18 +32,20 @@
         }}
       </div>
       <div class="col-6 box">
-        <mat-label class="mat-label-text">{{
-          current_language_set?.common?.select
-        }}</mat-label>
-        <mat-select
-          multiple
-          name="typeOfLesionList"
-          formControlName="typeOfLesionList"
-        >
-          <mat-option value="Proliferative"> Proliferative </mat-option>
-          <mat-option value="Ulcerative"> Ulcerative </mat-option>
-          <mat-option value="Infiltrative"> Infiltrative </mat-option>
-        </mat-select>
+        <mat-form-field [style.width]="'100%'">
+          <mat-label class="mat-label-text">{{
+            current_language_set?.common?.select
+          }}</mat-label>
+          <mat-select
+            multiple
+            name="typeOfLesionList"
+            formControlName="typeOfLesionList"
+          >
+            <mat-option value="Proliferative"> Proliferative </mat-option>
+            <mat-option value="Ulcerative"> Ulcerative </mat-option>
+            <mat-option value="Infiltrative"> Infiltrative </mat-option>
+          </mat-select>
+        </mat-form-field>
       </div>
     </div>
     <div class="col-12 row">
diff --git a/src/app/app-modules/nurse-doctor/examination/cancer-examination/oral-examination/oral-examination.component.html b/src/app/app-modules/nurse-doctor/examination/cancer-examination/oral-examination/oral-examination.component.html
index f19477b..d56239a 100644
--- a/src/app/app-modules/nurse-doctor/examination/cancer-examination/oral-examination/oral-examination.component.html
+++ b/src/app/app-modules/nurse-doctor/examination/cancer-examination/oral-examination/oral-examination.component.html
@@ -8,19 +8,21 @@
     </div>
 
     <div class="col-xs-6 custom-cell">
-      <mat-label class="mat-label-text">{{
-        current_language_set?.common?.select
-      }}</mat-label>
-      <mat-select
-        floatPlaceholder="never"
-        name="limitedMouthOpening"
-        formControlName="limitedMouthOpening"
-      >
-        <mat-option value="none"> None </mat-option>
-        <mat-option value="+"> + </mat-option>
-        <mat-option value="++"> ++ </mat-option>
-        <mat-option value="+++"> +++ </mat-option>
-      </mat-select>
+      <mat-form-field [style.width]="'100%'">
+        <mat-label class="mat-label-text">{{
+          current_language_set?.common?.select
+        }}</mat-label>
+        <mat-select
+          floatPlaceholder="never"
+          name="limitedMouthOpening"
+          formControlName="limitedMouthOpening"
+        >
+          <mat-option value="none"> None </mat-option>
+          <mat-option value="+"> + </mat-option>
+          <mat-option value="++"> ++ </mat-option>
+          <mat-option value="+++"> +++ </mat-option>
+        </mat-select>
+      </mat-form-field>
     </div>
 
     <div class="col-12 row">
@@ -68,27 +70,29 @@
         class="col-6 custom-cell"
         *ngIf="premalignantLesions && premalignantLesions.value"
       >
-        <mat-label class="mat-label-text">{{
-          current_language_set?.common?.select
-        }}</mat-label>
-        <mat-select
-          multiple
-          floatPlaceholder="never"
-          name="preMalignantLesionTypeList"
-          id="preMalignantLesionTypeList"
-          formControlName="preMalignantLesionTypeList"
-        >
-          <mat-option value="Leukoplakia"> Leukoplakia </mat-option>
-          <mat-option value="Sub muscus fibrosis">
-            Sub muscus fibrosis
-          </mat-option>
-          <mat-option value="Melanoplakia"> Melanoplakia </mat-option>
-          <mat-option value="Erythroplakia"> Erythroplakia </mat-option>
-          <mat-option value="Non healing mouth ulcer(>2 weeks)">
-            Non healing mouth ulcer(>2 weeks)</mat-option
+        <mat-form-field [style.width]="'100%'">
+          <mat-label class="mat-label-text">{{
+            current_language_set?.common?.select
+          }}</mat-label>
+          <mat-select
+            multiple
+            floatPlaceholder="never"
+            name="preMalignantLesionTypeList"
+            id="preMalignantLesionTypeList"
+            formControlName="preMalignantLesionTypeList"
           >
-          <mat-option value="Any other lesion"> Any other lesion</mat-option>
-        </mat-select>
+            <mat-option value="Leukoplakia"> Leukoplakia </mat-option>
+            <mat-option value="Sub muscus fibrosis">
+              Sub muscus fibrosis
+            </mat-option>
+            <mat-option value="Melanoplakia"> Melanoplakia </mat-option>
+            <mat-option value="Erythroplakia"> Erythroplakia </mat-option>
+            <mat-option value="Non healing mouth ulcer(>2 weeks)">
+              Non healing mouth ulcer(>2 weeks)</mat-option
+            >
+            <mat-option value="Any other lesion"> Any other lesion</mat-option>
+          </mat-select>
+        </mat-form-field>
       </div>
     </div>
 
diff --git a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/general-examination/general-examination.component.html b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/general-examination/general-examination.component.html
index e241a9b..936c7a1 100644
--- a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/general-examination/general-examination.component.html
+++ b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/general-examination/general-examination.component.html
@@ -1,64 +1,70 @@
 <div class="row m-t-20" [formGroup]="generalExaminationForm">
   <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 box">
     <div class="form-group">
-      <mat-label class="mat-label-text">{{
-        current_language_set?.ExaminationData?.ANC_OPD_PNCExamination
-          ?.genExamination?.consciousness
-      }}</mat-label>
-      <mat-select
-        class="select-full-width"
-        id="consciousness"
-        name="consciousness"
-        formControlName="consciousness"
-      >
-        <mat-option
-          *ngFor="let consciousness of selectConsciousness"
-          [value]="consciousness.name"
+      <mat-form-field [style.width]="'100%'">
+        <mat-label class="mat-label-text">{{
+          current_language_set?.ExaminationData?.ANC_OPD_PNCExamination
+            ?.genExamination?.consciousness
+        }}</mat-label>
+        <mat-select
+          class="select-full-width"
+          id="consciousness"
+          name="consciousness"
+          formControlName="consciousness"
         >
-          {{ consciousness.name }}
-        </mat-option>
-      </mat-select>
+          <mat-option
+            *ngFor="let consciousness of selectConsciousness"
+            [value]="consciousness.name"
+          >
+            {{ consciousness.name }}
+          </mat-option>
+        </mat-select>
+      </mat-form-field>
     </div>
   </div>
 
   <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 box">
     <div class="form-group">
-      <mat-label class="mat-label-text">{{
-        current_language_set?.ExaminationData?.ANC_OPD_PNCExamination
-          ?.genExamination?.cooperation
-      }}</mat-label>
-      <mat-select
-        class="select-full-width"
-        id="cooperation"
-        name="cooperation"
-        formControlName="cooperation"
-      >
-        <mat-option
-          *ngFor="let cooperation of selectCooperation"
-          [value]="cooperation.name"
+      <mat-form-field [style.width]="'100%'">
+        <mat-label class="mat-label-text">{{
+          current_language_set?.ExaminationData?.ANC_OPD_PNCExamination
+            ?.genExamination?.cooperation
+        }}</mat-label>
+        <mat-select
+          class="select-full-width"
+          id="cooperation"
+          name="cooperation"
+          formControlName="cooperation"
         >
-          {{ cooperation.name }}
-        </mat-option>
-      </mat-select>
+          <mat-option
+            *ngFor="let cooperation of selectCooperation"
+            [value]="cooperation.name"
+          >
+            {{ cooperation.name }}
+          </mat-option>
+        </mat-select>
+      </mat-form-field>
     </div>
   </div>
 
   <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 box">
     <div class="form-group">
-      <mat-label class="mat-label-text">{{
-        current_language_set?.ExaminationData?.ANC_OPD_PNCExamination
-          ?.genExamination?.built
-      }}</mat-label>
-      <mat-select
-        class="select-full-width"
-        id="builtAndAppearance"
-        name="builtAndAppearance"
-        formControlName="builtAndAppearance"
-      >
-        <mat-option *ngFor="let built of selectBuilt" [value]="built.name">
-          {{ built.name }}
-        </mat-option>
-      </mat-select>
+      <mat-form-field [style.width]="'100%'">
+        <mat-label class="mat-label-text">{{
+          current_language_set?.ExaminationData?.ANC_OPD_PNCExamination
+            ?.genExamination?.built
+        }}</mat-label>
+        <mat-select
+          class="select-full-width"
+          id="builtAndAppearance"
+          name="builtAndAppearance"
+          formControlName="builtAndAppearance"
+        >
+          <mat-option *ngFor="let built of selectBuilt" [value]="built.name">
+            {{ built.name }}
+          </mat-option>
+        </mat-select>
+      </mat-form-field>
     </div>
   </div>
 
@@ -162,25 +168,27 @@
     [hidden]="dangerSigns !== 'Yes'"
   >
     <div class="form-group">
-      <mat-label class="mat-label-text">{{
-        current_language_set?.ExaminationData?.ANC_OPD_PNCExamination
-          ?.genExamination?.dangersigns
-      }}</mat-label>
-      <mat-select
-        multiple
-        class="select-full-width"
-        id="typeOfDangerSigns"
-        name="typeOfDangerSigns"
-        formControlName="typeOfDangerSigns"
-        [required]="dangerSigns === 'Yes'"
-      >
-        <mat-option
-          *ngFor="let signs of selectDangerSigns"
-          [value]="signs.name"
+      <mat-form-field [style.width]="'100%'">
+        <mat-label class="mat-label-text">{{
+          current_language_set?.ExaminationData?.ANC_OPD_PNCExamination
+            ?.genExamination?.dangersigns
+        }}</mat-label>
+        <mat-select
+          multiple
+          class="select-full-width"
+          id="typeOfDangerSigns"
+          name="typeOfDangerSigns"
+          formControlName="typeOfDangerSigns"
+          [required]="dangerSigns === 'Yes'"
         >
-          {{ signs.name }}
-        </mat-option>
-      </mat-select>
+          <mat-option
+            *ngFor="let signs of selectDangerSigns"
+            [value]="signs.name"
+          >
+            {{ signs.name }}
+          </mat-option>
+        </mat-select>
+      </mat-form-field>
     </div>
   </div>
 
@@ -284,24 +292,26 @@
     [hidden]="lymphadenopathy !== 'Present'"
   >
     <div class="form-group">
-      <mat-label class="mat-label-text">{{
-        current_language_set?.ExaminationData?.ANC_OPD_PNCExamination
-          ?.genExamination?.lymph
-      }}</mat-label>
-      <mat-select
-        class="select-full-width"
-        id="lymphnodesInvolved"
-        name="lymphnodesInvolved"
-        formControlName="lymphnodesInvolved"
-        [required]="lymphadenopathy === 'Present'"
-      >
-        <mat-option
-          *ngFor="let lymphNodes of selectLymphNodes"
-          [value]="lymphNodes.name"
+      <mat-form-field [style.width]="'100%'">
+        <mat-label class="mat-label-text">{{
+          current_language_set?.ExaminationData?.ANC_OPD_PNCExamination
+            ?.genExamination?.lymph
+        }}</mat-label>
+        <mat-select
+          class="select-full-width"
+          id="lymphnodesInvolved"
+          name="lymphnodesInvolved"
+          formControlName="lymphnodesInvolved"
+          [required]="lymphadenopathy === 'Present'"
         >
-          {{ lymphNodes.name }}
-        </mat-option>
-      </mat-select>
+          <mat-option
+            *ngFor="let lymphNodes of selectLymphNodes"
+            [value]="lymphNodes.name"
+          >
+            {{ lymphNodes.name }}
+          </mat-option>
+        </mat-select>
+      </mat-form-field>
     </div>
   </div>
 
@@ -310,24 +320,26 @@
     [hidden]="lymphadenopathy !== 'Present'"
   >
     <div class="form-group">
-      <mat-label class="mat-label-text">{{
-        current_language_set?.ExaminationData?.ANC_OPD_PNCExamination
-          ?.genExamination?.typeofLymphadenopathy
-      }}</mat-label>
-      <mat-select
-        class="select-full-width"
-        id="typeOfLymphadenopathy"
-        name="typeOfLymphadenopathy"
-        formControlName="typeOfLymphadenopathy"
-        [required]="lymphadenopathy === 'Present'"
-      >
-        <mat-option
-          *ngFor="let typeOfLymphadenopathy of selectTypeOfLymphadenopathy"
-          [value]="typeOfLymphadenopathy.name"
+      <mat-form-field [style.width]="'100%'">
+        <mat-label class="mat-label-text">{{
+          current_language_set?.ExaminationData?.ANC_OPD_PNCExamination
+            ?.genExamination?.typeofLymphadenopathy
+        }}</mat-label>
+        <mat-select
+          class="select-full-width"
+          id="typeOfLymphadenopathy"
+          name="typeOfLymphadenopathy"
+          formControlName="typeOfLymphadenopathy"
+          [required]="lymphadenopathy === 'Present'"
         >
-          {{ typeOfLymphadenopathy.name }}
-        </mat-option>
-      </mat-select>
+          <mat-option
+            *ngFor="let typeOfLymphadenopathy of selectTypeOfLymphadenopathy"
+            [value]="typeOfLymphadenopathy.name"
+          >
+            {{ typeOfLymphadenopathy.name }}
+          </mat-option>
+        </mat-select>
+      </mat-form-field>
     </div>
   </div>
 
@@ -359,24 +371,26 @@
     [hidden]="edema !== 'Present'"
   >
     <div class="form-group">
-      <mat-label class="mat-label-text">{{
-        current_language_set?.ExaminationData?.ANC_OPD_PNCExamination
-          ?.genExamination?.extentofEdema
-      }}</mat-label>
-      <mat-select
-        class="select-full-width"
-        id="extentOfEdema"
-        name="extentOfEdema"
-        formControlName="extentOfEdema"
-        [required]="edema === 'Present'"
-      >
-        <mat-option
-          *ngFor="let extentOfEdema of selectExtentOfEdema"
-          [value]="extentOfEdema.name"
+      <mat-form-field [style.width]="'100%'">
+        <mat-label class="mat-label-text">{{
+          current_language_set?.ExaminationData?.ANC_OPD_PNCExamination
+            ?.genExamination?.extentofEdema
+        }}</mat-label>
+        <mat-select
+          class="select-full-width"
+          id="extentOfEdema"
+          name="extentOfEdema"
+          formControlName="extentOfEdema"
+          [required]="edema === 'Present'"
         >
-          {{ extentOfEdema.name }}
-        </mat-option>
-      </mat-select>
+          <mat-option
+            *ngFor="let extentOfEdema of selectExtentOfEdema"
+            [value]="extentOfEdema.name"
+          >
+            {{ extentOfEdema.name }}
+          </mat-option>
+        </mat-select>
+      </mat-form-field>
     </div>
   </div>
 
diff --git a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/central-nervous-system/central-nervous-system.component.html b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/central-nervous-system/central-nervous-system.component.html
index a7dec9b..709da25 100644
--- a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/central-nervous-system/central-nervous-system.component.html
+++ b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/central-nervous-system/central-nervous-system.component.html
@@ -3,22 +3,24 @@
     class="col-xs-12 col-sm-6 col-md-4 col-lg-4 box"
     style="margin-left: 15px"
   >
-    <mat-label class="mat-label-text">{{
-      current_language_set?.ExaminationData?.ANC_OPD_PNCExamination?.systemic
-        ?.centralANC_OPD_PNC?.handedness
-    }}</mat-label>
-    <mat-select
-      class="select-full-width"
-      name="handedness"
-      formControlName="handedness"
-    >
-      <mat-option
-        *ngFor="let handedness of selectHandedness"
-        [value]="handedness.name"
+    <mat-form-field [style.width]="'100%'">
+      <mat-label class="mat-label-text">{{
+        current_language_set?.ExaminationData?.ANC_OPD_PNCExamination?.systemic
+          ?.centralANC_OPD_PNC?.handedness
+      }}</mat-label>
+      <mat-select
+        class="select-full-width"
+        name="handedness"
+        formControlName="handedness"
       >
-        {{ handedness.name }}
-      </mat-option>
-    </mat-select>
+        <mat-option
+          *ngFor="let handedness of selectHandedness"
+          [value]="handedness.name"
+        >
+          {{ handedness.name }}
+        </mat-option>
+      </mat-select>
+    </mat-form-field>
   </div>
 
   <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
diff --git a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/gastro-intestinal-system/gastro-intestinal-system.component.html b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/gastro-intestinal-system/gastro-intestinal-system.component.html
index 95b211c..ccf44ac 100644
--- a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/gastro-intestinal-system/gastro-intestinal-system.component.html
+++ b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/gastro-intestinal-system/gastro-intestinal-system.component.html
@@ -20,52 +20,58 @@
   </div>
 
   <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 box">
-    <mat-label class="mat-label-text">{{
-      current_language_set?.ExaminationData?.genralOPD_PNC?.Gastro
-        ?.abdomenTexture
-    }}</mat-label>
-    <mat-select
-      class="select-full-width"
-      name="palpation_AbdomenTexture"
-      formControlName="palpation_AbdomenTexture"
-    >
-      <mat-option
-        *ngFor="let texture of selectAbdomenTexture"
-        [value]="texture.name"
+    <mat-form-field [style.width]="'100%'">
+      <mat-label class="mat-label-text">{{
+        current_language_set?.ExaminationData?.genralOPD_PNC?.Gastro
+          ?.abdomenTexture
+      }}</mat-label>
+      <mat-select
+        class="select-full-width"
+        name="palpation_AbdomenTexture"
+        formControlName="palpation_AbdomenTexture"
       >
-        {{ texture.name }}
-      </mat-option>
-    </mat-select>
+        <mat-option
+          *ngFor="let texture of selectAbdomenTexture"
+          [value]="texture.name"
+        >
+          {{ texture.name }}
+        </mat-option>
+      </mat-select>
+    </mat-form-field>
   </div>
 
   <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 box">
-    <mat-label class="mat-label-text">{{
-      current_language_set?.ExaminationData?.genralOPD_PNC?.Gastro?.liver
-    }}</mat-label>
-    <mat-select
-      class="select-full-width"
-      name="palpation_Liver"
-      formControlName="palpation_Liver"
-    >
-      <mat-option *ngFor="let liver of selectLiver" [value]="liver.name">
-        {{ liver.name }}
-      </mat-option>
-    </mat-select>
+    <mat-form-field [style.width]="'100%'">
+      <mat-label class="mat-label-text">{{
+        current_language_set?.ExaminationData?.genralOPD_PNC?.Gastro?.liver
+      }}</mat-label>
+      <mat-select
+        class="select-full-width"
+        name="palpation_Liver"
+        formControlName="palpation_Liver"
+      >
+        <mat-option *ngFor="let liver of selectLiver" [value]="liver.name">
+          {{ liver.name }}
+        </mat-option>
+      </mat-select>
+    </mat-form-field>
   </div>
 
   <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 box">
-    <mat-label class="mat-label-text">{{
-      current_language_set?.ExaminationData?.genralOPD_PNC?.Gastro?.spleen
-    }}</mat-label>
-    <mat-select
-      class="select-full-width"
-      name="palpation_Spleen"
-      formControlName="palpation_Spleen"
-    >
-      <mat-option *ngFor="let spleen of selectSpleen" [value]="spleen.name">
-        {{ spleen.name }}
-      </mat-option>
-    </mat-select>
+    <mat-form-field [style.width]="'100%'">
+      <mat-label class="mat-label-text">{{
+        current_language_set?.ExaminationData?.genralOPD_PNC?.Gastro?.spleen
+      }}</mat-label>
+      <mat-select
+        class="select-full-width"
+        name="palpation_Spleen"
+        formControlName="palpation_Spleen"
+      >
+        <mat-option *ngFor="let spleen of selectSpleen" [value]="spleen.name">
+          {{ spleen.name }}
+        </mat-option>
+      </mat-select>
+    </mat-form-field>
   </div>
 
   <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 box">
diff --git a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/musculoskeletal-system/musculoskeletal-system.component.html b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/musculoskeletal-system/musculoskeletal-system.component.html
index 3102836..7e29528 100644
--- a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/musculoskeletal-system/musculoskeletal-system.component.html
+++ b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/musculoskeletal-system/musculoskeletal-system.component.html
@@ -9,60 +9,66 @@ <h5>
       </h5>
       <div class="row">
         <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 box">
-          <mat-label class="mat-label-text">{{
-            current_language_set?.ExaminationData?.ANC_OPD_PNCExamination
-              ?.systemic?.musculoskeletalANC_OPD_PNC?.typeofJoint
-          }}</mat-label>
-          <mat-select
-            class="select-full-width"
-            name="joint_TypeOfJoint"
-            formControlName="joint_TypeOfJoint"
-          >
-            <mat-option
-              *ngFor="let typeOfJoint of selectTypeOfJoint"
-              [value]="typeOfJoint.jointType"
+          <mat-form-field [style.width]="'100%'">
+            <mat-label class="mat-label-text">{{
+              current_language_set?.ExaminationData?.ANC_OPD_PNCExamination
+                ?.systemic?.musculoskeletalANC_OPD_PNC?.typeofJoint
+            }}</mat-label>
+            <mat-select
+              class="select-full-width"
+              name="joint_TypeOfJoint"
+              formControlName="joint_TypeOfJoint"
             >
-              {{ typeOfJoint.jointType }}
-            </mat-option>
-          </mat-select>
+              <mat-option
+                *ngFor="let typeOfJoint of selectTypeOfJoint"
+                [value]="typeOfJoint.jointType"
+              >
+                {{ typeOfJoint.jointType }}
+              </mat-option>
+            </mat-select>
+          </mat-form-field>
         </div>
 
         <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 box">
-          <mat-label class="mat-label-text">{{
-            current_language_set?.ExaminationData?.ANC_OPD_PNCExamination
-              ?.systemic?.musculoskeletalANC_OPD_PNC?.laterality
-          }}</mat-label>
-          <mat-select
-            class="select-full-width"
-            name="joint_Laterality"
-            formControlName="joint_Laterality"
-          >
-            <mat-option
-              *ngFor="let jointLaterality of selectJointLaterality"
-              [value]="jointLaterality.name"
+          <mat-form-field [style.width]="'100%'">
+            <mat-label class="mat-label-text">{{
+              current_language_set?.ExaminationData?.ANC_OPD_PNCExamination
+                ?.systemic?.musculoskeletalANC_OPD_PNC?.laterality
+            }}</mat-label>
+            <mat-select
+              class="select-full-width"
+              name="joint_Laterality"
+              formControlName="joint_Laterality"
             >
-              {{ jointLaterality.name }}
-            </mat-option>
-          </mat-select>
+              <mat-option
+                *ngFor="let jointLaterality of selectJointLaterality"
+                [value]="jointLaterality.name"
+              >
+                {{ jointLaterality.name }}
+              </mat-option>
+            </mat-select>
+          </mat-form-field>
         </div>
 
         <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 box">
-          <mat-label class="mat-label-text">{{
-            current_language_set?.ExaminationData?.ANC_OPD_PNCExamination
-              ?.systemic?.musculoskeletalANC_OPD_PNC?.abnormality
-          }}</mat-label>
-          <mat-select
-            class="select-full-width"
-            name="joint_Abnormality"
-            formControlName="joint_Abnormality"
-          >
-            <mat-option
-              *ngFor="let jointAbnormality of selectJointAbnormality"
-              [value]="jointAbnormality.name"
+          <mat-form-field [style.width]="'100%'">
+            <mat-label class="mat-label-text">{{
+              current_language_set?.ExaminationData?.ANC_OPD_PNCExamination
+                ?.systemic?.musculoskeletalANC_OPD_PNC?.abnormality
+            }}</mat-label>
+            <mat-select
+              class="select-full-width"
+              name="joint_Abnormality"
+              formControlName="joint_Abnormality"
             >
-              {{ jointAbnormality.name }}
-            </mat-option>
-          </mat-select>
+              <mat-option
+                *ngFor="let jointAbnormality of selectJointAbnormality"
+                [value]="jointAbnormality.name"
+              >
+                {{ jointAbnormality.name }}
+              </mat-option>
+            </mat-select>
+          </mat-form-field>
         </div>
       </div>
     </div>
@@ -78,41 +84,47 @@ <h5>
       </h5>
       <div class="row">
         <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 box">
-          <mat-label class="mat-label-text">{{
-            current_language_set?.ExaminationData?.ANC_OPD_PNCExamination
-              ?.systemic?.musculoskeletalANC_OPD_PNC?.laterality
-          }}</mat-label>
-          <mat-select
-            class="select-full-width"
-            name="upperLimb_Laterality"
-            formControlName="upperLimb_Laterality"
-          >
-            <mat-option
-              *ngFor="let upperLimbsLaterality of selectUpperLimbsLaterality"
-              [value]="upperLimbsLaterality.name"
+          <mat-form-field [style.width]="'100%'">
+            <mat-label class="mat-label-text">{{
+              current_language_set?.ExaminationData?.ANC_OPD_PNCExamination
+                ?.systemic?.musculoskeletalANC_OPD_PNC?.laterality
+            }}</mat-label>
+            <mat-select
+              class="select-full-width"
+              name="upperLimb_Laterality"
+              formControlName="upperLimb_Laterality"
             >
-              {{ upperLimbsLaterality.name }}
-            </mat-option>
-          </mat-select>
+              <mat-option
+                *ngFor="let upperLimbsLaterality of selectUpperLimbsLaterality"
+                [value]="upperLimbsLaterality.name"
+              >
+                {{ upperLimbsLaterality.name }}
+              </mat-option>
+            </mat-select>
+          </mat-form-field>
         </div>
 
         <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 box">
-          <mat-label class="mat-label-text">{{
-            current_language_set?.ExaminationData?.ANC_OPD_PNCExamination
-              ?.systemic?.musculoskeletalANC_OPD_PNC?.abnormality
-          }}</mat-label>
-          <mat-select
-            class="select-full-width"
-            name="upperLimb_Abnormality"
-            formControlName="upperLimb_Abnormality"
-          >
-            <mat-option
-              *ngFor="let upperLimbsAbnormality of selectUpperLimbsAbnormality"
-              [value]="upperLimbsAbnormality.name"
+          <mat-form-field [style.width]="'100%'">
+            <mat-label class="mat-label-text">{{
+              current_language_set?.ExaminationData?.ANC_OPD_PNCExamination
+                ?.systemic?.musculoskeletalANC_OPD_PNC?.abnormality
+            }}</mat-label>
+            <mat-select
+              class="select-full-width"
+              name="upperLimb_Abnormality"
+              formControlName="upperLimb_Abnormality"
             >
-              {{ upperLimbsAbnormality.name }}
-            </mat-option>
-          </mat-select>
+              <mat-option
+                *ngFor="
+                  let upperLimbsAbnormality of selectUpperLimbsAbnormality
+                "
+                [value]="upperLimbsAbnormality.name"
+              >
+                {{ upperLimbsAbnormality.name }}
+              </mat-option>
+            </mat-select>
+          </mat-form-field>
         </div>
       </div>
     </div>
@@ -128,41 +140,47 @@ <h5>
       </h5>
       <div class="row">
         <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 box">
-          <mat-label class="mat-label-text">{{
-            current_language_set?.ExaminationData?.ANC_OPD_PNCExamination
-              ?.systemic?.musculoskeletalANC_OPD_PNC?.laterality
-          }}</mat-label>
-          <mat-select
-            class="select-full-width"
-            name="lowerLimb_Laterality"
-            formControlName="lowerLimb_Laterality"
-          >
-            <mat-option
-              *ngFor="let lowerLimbsLaterality of selectLowerLimbsLaterality"
-              [value]="lowerLimbsLaterality.name"
+          <mat-form-field [style.width]="'100%'">
+            <mat-label class="mat-label-text">{{
+              current_language_set?.ExaminationData?.ANC_OPD_PNCExamination
+                ?.systemic?.musculoskeletalANC_OPD_PNC?.laterality
+            }}</mat-label>
+            <mat-select
+              class="select-full-width"
+              name="lowerLimb_Laterality"
+              formControlName="lowerLimb_Laterality"
             >
-              {{ lowerLimbsLaterality.name }}
-            </mat-option>
-          </mat-select>
+              <mat-option
+                *ngFor="let lowerLimbsLaterality of selectLowerLimbsLaterality"
+                [value]="lowerLimbsLaterality.name"
+              >
+                {{ lowerLimbsLaterality.name }}
+              </mat-option>
+            </mat-select>
+          </mat-form-field>
         </div>
 
         <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 box">
-          <mat-label class="mat-label-text">{{
-            current_language_set?.ExaminationData?.ANC_OPD_PNCExamination
-              ?.systemic?.musculoskeletalANC_OPD_PNC?.abnormality
-          }}</mat-label>
-          <mat-select
-            class="select-full-width"
-            name="lowerLimb_Abnormality"
-            formControlName="lowerLimb_Abnormality"
-          >
-            <mat-option
-              *ngFor="let lowerLimbsAbnormality of selectLowerLimbsAbnormality"
-              [value]="lowerLimbsAbnormality.name"
+          <mat-form-field [style.width]="'100%'">
+            <mat-label class="mat-label-text">{{
+              current_language_set?.ExaminationData?.ANC_OPD_PNCExamination
+                ?.systemic?.musculoskeletalANC_OPD_PNC?.abnormality
+            }}</mat-label>
+            <mat-select
+              class="select-full-width"
+              name="lowerLimb_Abnormality"
+              formControlName="lowerLimb_Abnormality"
             >
-              {{ lowerLimbsAbnormality.name }}
-            </mat-option>
-          </mat-select>
+              <mat-option
+                *ngFor="
+                  let lowerLimbsAbnormality of selectLowerLimbsAbnormality
+                "
+                [value]="lowerLimbsAbnormality.name"
+              >
+                {{ lowerLimbsAbnormality.name }}
+              </mat-option>
+            </mat-select>
+          </mat-form-field>
         </div>
       </div>
     </div>
diff --git a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/obstetric-examination/obstetric-examination.component.html b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/obstetric-examination/obstetric-examination.component.html
index 4efec28..3db6585 100644
--- a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/obstetric-examination/obstetric-examination.component.html
+++ b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/obstetric-examination/obstetric-examination.component.html
@@ -1,58 +1,64 @@
 <div class="row m-t-20" [formGroup]="obstetricExaminationForANCForm">
   <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 box m-t-10">
-    <mat-label class="mat-label-text">{{
-      current_language_set?.ExaminationData?.ANC_OPD_PNCExamination?.systemic
-        ?.obstetric?.fundalHeight
-    }}</mat-label>
-    <mat-select
-      class="select-full-width"
-      name="fundalHeight"
-      formControlName="fundalHeight"
-    >
-      <mat-option
-        *ngFor="let fundalHeight of selectFundalHeight"
-        [value]="fundalHeight.name"
+    <mat-form-field [style.width]="'100%'">
+      <mat-label class="mat-label-text">{{
+        current_language_set?.ExaminationData?.ANC_OPD_PNCExamination?.systemic
+          ?.obstetric?.fundalHeight
+      }}</mat-label>
+      <mat-select
+        class="select-full-width"
+        name="fundalHeight"
+        formControlName="fundalHeight"
       >
-        {{ fundalHeight.name }}
-      </mat-option>
-    </mat-select>
+        <mat-option
+          *ngFor="let fundalHeight of selectFundalHeight"
+          [value]="fundalHeight.name"
+        >
+          {{ fundalHeight.name }}
+        </mat-option>
+      </mat-select>
+    </mat-form-field>
   </div>
 
   <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 box m-t-10">
-    <mat-label class="mat-label-text">{{
-      current_language_set?.ExaminationData?.ANC_OPD_PNCExamination?.systemic
-        ?.obstetric?.fHandPOAStatus
-    }}</mat-label>
-    <mat-select
-      class="select-full-width"
-      name="fHAndPOA_Status"
-      formControlName="fHAndPOA_Status"
-    >
-      <mat-option
-        *ngFor="let FHPOAStatus of selectFHPOAStatus"
-        [value]="FHPOAStatus.name"
+    <mat-form-field [style.width]="'100%'">
+      <mat-label class="mat-label-text">{{
+        current_language_set?.ExaminationData?.ANC_OPD_PNCExamination?.systemic
+          ?.obstetric?.fHandPOAStatus
+      }}</mat-label>
+      <mat-select
+        class="select-full-width"
+        name="fHAndPOA_Status"
+        formControlName="fHAndPOA_Status"
       >
-        {{ FHPOAStatus.name }}
-      </mat-option>
-    </mat-select>
+        <mat-option
+          *ngFor="let FHPOAStatus of selectFHPOAStatus"
+          [value]="FHPOAStatus.name"
+        >
+          {{ FHPOAStatus.name }}
+        </mat-option>
+      </mat-select>
+    </mat-form-field>
   </div>
   <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 box m-t-10">
-    <mat-label class="mat-label-text">{{
-      current_language_set?.ExaminationData?.ANC_OPD_PNCExamination?.systemic
-        ?.obstetric?.interpretationFHandPOA
-    }}</mat-label>
-    <mat-select
-      class="select-full-width"
-      name="fHAndPOA_Interpretation"
-      formControlName="fHAndPOA_Interpretation"
-    >
-      <mat-option
-        *ngFor="let interpretationFHAndPOA of selectInterpretationFHAndPOA"
-        [value]="interpretationFHAndPOA.name"
+    <mat-form-field [style.width]="'100%'">
+      <mat-label class="mat-label-text">{{
+        current_language_set?.ExaminationData?.ANC_OPD_PNCExamination?.systemic
+          ?.obstetric?.interpretationFHandPOA
+      }}</mat-label>
+      <mat-select
+        class="select-full-width"
+        name="fHAndPOA_Interpretation"
+        formControlName="fHAndPOA_Interpretation"
       >
-        {{ interpretationFHAndPOA.name }}
-      </mat-option>
-    </mat-select>
+        <mat-option
+          *ngFor="let interpretationFHAndPOA of selectInterpretationFHAndPOA"
+          [value]="interpretationFHAndPOA.name"
+        >
+          {{ interpretationFHAndPOA.name }}
+        </mat-option>
+      </mat-select>
+    </mat-form-field>
   </div>
 
   <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 box m-t-10">
@@ -99,79 +105,87 @@
     class="col-xs-12 col-sm-6 col-md-4 col-lg-4 box m-t-10"
     *ngIf="fetalHeartSounds === 'Audible'"
   >
-    <mat-label class="mat-label-text">{{
-      current_language_set?.ExaminationData?.ANC_OPD_PNCExamination?.systemic
-        ?.obstetric?.fetalHeartRate
-    }}</mat-label>
-    <mat-select
-      class="select-full-width"
-      name="fetalHeartRate_BeatsPerMinute"
-      formControlName="fetalHeartRate_BeatsPerMinute"
-    >
-      <mat-option
-        *ngFor="let fetalHeartRate of selectFetalHeartRate"
-        [value]="fetalHeartRate.name"
+    <mat-form-field [style.width]="'100%'">
+      <mat-label class="mat-label-text">{{
+        current_language_set?.ExaminationData?.ANC_OPD_PNCExamination?.systemic
+          ?.obstetric?.fetalHeartRate
+      }}</mat-label>
+      <mat-select
+        class="select-full-width"
+        name="fetalHeartRate_BeatsPerMinute"
+        formControlName="fetalHeartRate_BeatsPerMinute"
       >
-        {{ fetalHeartRate.name }}
-      </mat-option>
-    </mat-select>
+        <mat-option
+          *ngFor="let fetalHeartRate of selectFetalHeartRate"
+          [value]="fetalHeartRate.name"
+        >
+          {{ fetalHeartRate.name }}
+        </mat-option>
+      </mat-select>
+    </mat-form-field>
   </div>
 
   <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 box m-t-10">
-    <mat-label class="mat-label-text">{{
-      current_language_set?.ExaminationData?.ANC_OPD_PNCExamination?.systemic
-        ?.obstetric?.fetalposition
-    }}</mat-label>
-    <mat-select
-      class="select-full-width"
-      name="fetalPositionOrLie"
-      formControlName="fetalPositionOrLie"
-    >
-      <mat-option
-        *ngFor="let fetalPositionOrLie of selectFetalPositionOrLie"
-        [value]="fetalPositionOrLie.name"
+    <mat-form-field [style.width]="'100%'">
+      <mat-label class="mat-label-text">{{
+        current_language_set?.ExaminationData?.ANC_OPD_PNCExamination?.systemic
+          ?.obstetric?.fetalposition
+      }}</mat-label>
+      <mat-select
+        class="select-full-width"
+        name="fetalPositionOrLie"
+        formControlName="fetalPositionOrLie"
       >
-        {{ fetalPositionOrLie.name }}
-      </mat-option>
-    </mat-select>
+        <mat-option
+          *ngFor="let fetalPositionOrLie of selectFetalPositionOrLie"
+          [value]="fetalPositionOrLie.name"
+        >
+          {{ fetalPositionOrLie.name }}
+        </mat-option>
+      </mat-select>
+    </mat-form-field>
   </div>
 
   <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 box m-t-10">
-    <mat-label class="mat-label-text">{{
-      current_language_set?.ExaminationData?.ANC_OPD_PNCExamination?.systemic
-        ?.obstetric?.fetalPresentation
-    }}</mat-label>
-    <mat-select
-      class="select-full-width"
-      name="fetalPresentation"
-      formControlName="fetalPresentation"
-    >
-      <mat-option
-        *ngFor="let fetalPresentation of selectFetalPresentation"
-        [value]="fetalPresentation.name"
+    <mat-form-field [style.width]="'100%'">
+      <mat-label class="mat-label-text">{{
+        current_language_set?.ExaminationData?.ANC_OPD_PNCExamination?.systemic
+          ?.obstetric?.fetalPresentation
+      }}</mat-label>
+      <mat-select
+        class="select-full-width"
+        name="fetalPresentation"
+        formControlName="fetalPresentation"
       >
-        {{ fetalPresentation.name }}
-      </mat-option>
-    </mat-select>
+        <mat-option
+          *ngFor="let fetalPresentation of selectFetalPresentation"
+          [value]="fetalPresentation.name"
+        >
+          {{ fetalPresentation.name }}
+        </mat-option>
+      </mat-select>
+    </mat-form-field>
   </div>
 
   <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 box m-t-10">
-    <mat-label class="mat-label-text">{{
-      current_language_set?.ExaminationData?.ANC_OPD_PNCExamination?.systemic
-        ?.obstetric?.abdominalScars
-    }}</mat-label>
-    <mat-select
-      class="select-full-width"
-      name="abdominalScars"
-      formControlName="abdominalScars"
-    >
-      <mat-option
-        *ngFor="let abdominalScars of selectAbdominalScars"
-        [value]="abdominalScars.name"
+    <mat-form-field [style.width]="'100%'">
+      <mat-label class="mat-label-text">{{
+        current_language_set?.ExaminationData?.ANC_OPD_PNCExamination?.systemic
+          ?.obstetric?.abdominalScars
+      }}</mat-label>
+      <mat-select
+        class="select-full-width"
+        name="abdominalScars"
+        formControlName="abdominalScars"
       >
-        {{ abdominalScars.name }}
-      </mat-option>
-    </mat-select>
+        <mat-option
+          *ngFor="let abdominalScars of selectAbdominalScars"
+          [value]="abdominalScars.name"
+        >
+          {{ abdominalScars.name }}
+        </mat-option>
+      </mat-select>
+    </mat-form-field>
   </div>
 
   <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 box m-t-10">
diff --git a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/respiratory-system/respiratory-system.component.html b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/respiratory-system/respiratory-system.component.html
index d78e0ca..763d460 100644
--- a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/respiratory-system/respiratory-system.component.html
+++ b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/respiratory-system/respiratory-system.component.html
@@ -1,18 +1,23 @@
 <div class="row m-t-20" [formGroup]="respiratorySystemForm">
   <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 box">
-    <mat-label class="mat-label-text">{{
-      current_language_set?.ExaminationData?.ANC_OPD_PNCExamination?.systemic
-        ?.respiratoryANC_OPD_PNC?.trachea
-    }}</mat-label>
-    <mat-select
-      class="select-full-width"
-      name="trachea"
-      formControlName="trachea"
-    >
-      <mat-option *ngFor="let trachea of selectTrachea" [value]="trachea.name">
-        {{ trachea.name }}
-      </mat-option>
-    </mat-select>
+    <mat-form-field [style.width]="'100%'">
+      <mat-label class="mat-label-text">{{
+        current_language_set?.ExaminationData?.ANC_OPD_PNCExamination?.systemic
+          ?.respiratoryANC_OPD_PNC?.trachea
+      }}</mat-label>
+      <mat-select
+        class="select-full-width"
+        name="trachea"
+        formControlName="trachea"
+      >
+        <mat-option
+          *ngFor="let trachea of selectTrachea"
+          [value]="trachea.name"
+        >
+          {{ trachea.name }}
+        </mat-option>
+      </mat-select>
+    </mat-form-field>
   </div>
 
   <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
@@ -79,22 +84,24 @@
   </div>
 
   <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 box">
-    <mat-label class="mat-label-text">{{
-      current_language_set?.ExaminationData?.ANC_OPD_PNCExamination?.systemic
-        ?.respiratoryANC_OPD_PNC?.breathsounds
-    }}</mat-label>
-    <mat-select
-      class="select-full-width"
-      name="auscultation_BreathSounds"
-      formControlName="auscultation_BreathSounds"
-    >
-      <mat-option
-        *ngFor="let breathSound of selectBreathSounds"
-        [value]="breathSound.name"
+    <mat-form-field [style.width]="'100%'">
+      <mat-label class="mat-label-text">{{
+        current_language_set?.ExaminationData?.ANC_OPD_PNCExamination?.systemic
+          ?.respiratoryANC_OPD_PNC?.breathsounds
+      }}</mat-label>
+      <mat-select
+        class="select-full-width"
+        name="auscultation_BreathSounds"
+        formControlName="auscultation_BreathSounds"
       >
-        {{ breathSound.name }}
-      </mat-option>
-    </mat-select>
+        <mat-option
+          *ngFor="let breathSound of selectBreathSounds"
+          [value]="breathSound.name"
+        >
+          {{ breathSound.name }}
+        </mat-option>
+      </mat-select>
+    </mat-form-field>
   </div>
 
   <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 box">
@@ -193,21 +200,23 @@
   </div>
 
   <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 box">
-    <mat-label class="mat-label-text">{{
-      current_language_set?.ExaminationData?.ANC_OPD_PNCExamination?.systemic
-        ?.respiratoryANC_OPD_PNC?.percussion
-    }}</mat-label>
-    <mat-select
-      class="select-full-width"
-      name="percussion"
-      formControlName="percussion"
-    >
-      <mat-option
-        *ngFor="let percussion of selectPercussion"
-        [value]="percussion.name"
+    <mat-form-field [style.width]="'100%'">
+      <mat-label class="mat-label-text">{{
+        current_language_set?.ExaminationData?.ANC_OPD_PNCExamination?.systemic
+          ?.respiratoryANC_OPD_PNC?.percussion
+      }}</mat-label>
+      <mat-select
+        class="select-full-width"
+        name="percussion"
+        formControlName="percussion"
       >
-        {{ percussion.name }}
-      </mat-option>
-    </mat-select>
+        <mat-option
+          *ngFor="let percussion of selectPercussion"
+          [value]="percussion.name"
+        >
+          {{ percussion.name }}
+        </mat-option>
+      </mat-select>
+    </mat-form-field>
   </div>
 </div>
diff --git a/src/app/app-modules/nurse-doctor/history/general-opd-history/family-history/family-history.component.html b/src/app/app-modules/nurse-doctor/history/general-opd-history/family-history/family-history.component.html
index b26ede5..e1a9a05 100644
--- a/src/app/app-modules/nurse-doctor/history/general-opd-history/family-history/family-history.component.html
+++ b/src/app/app-modules/nurse-doctor/history/general-opd-history/family-history/family-history.component.html
@@ -30,25 +30,27 @@
     >
       <ng-container [formGroupName]="i">
         <div class="col-3 box">
-          <mat-label class="mat-label-text">{{
-            currentLanguageSet?.historyData?.ancHistory
-              ?.familyHistoryDataANC_OPD_NCD_PNC?.diseaseType
-          }}</mat-label>
-          <mat-select
-            class="select-full-width"
-            name="diseaseType"
-            formControlName="diseaseType"
-            (selectionChange)="
-              filterFamilyDiseaseList($event, i, familyDisease)
-            "
-          >
-            <mat-option
-              *ngFor="let disease of diseaseSelectList[i]"
-              [value]="disease"
+          <mat-form-field [style.width]="'100%'">
+            <mat-label class="mat-label-text">{{
+              currentLanguageSet?.historyData?.ancHistory
+                ?.familyHistoryDataANC_OPD_NCD_PNC?.diseaseType
+            }}</mat-label>
+            <mat-select
+              class="select-full-width"
+              name="diseaseType"
+              formControlName="diseaseType"
+              (selectionChange)="
+                filterFamilyDiseaseList($event, i, familyDisease)
+              "
             >
-              {{ disease.diseaseType }}
-            </mat-option>
-          </mat-select>
+              <mat-option
+                *ngFor="let disease of diseaseSelectList[i]"
+                [value]="disease"
+              >
+                {{ disease.diseaseType }}
+              </mat-option>
+            </mat-select>
+          </mat-form-field>
         </div>
 
         <div
diff --git a/src/app/app-modules/nurse-doctor/history/general-opd-history/past-history/past-history.component.html b/src/app/app-modules/nurse-doctor/history/general-opd-history/past-history/past-history.component.html
index 569b52c..525b325 100644
--- a/src/app/app-modules/nurse-doctor/history/general-opd-history/past-history/past-history.component.html
+++ b/src/app/app-modules/nurse-doctor/history/general-opd-history/past-history/past-history.component.html
@@ -63,7 +63,7 @@ <h4 style="font-size: 18px">
           </div>
 
           <div
-            class="col-3 box"
+            class="col-2 box"
             *ngIf="pastIllness.value.illnessType?.illnessType === 'Other'"
           >
             <mat-form-field class="input-full-width">
@@ -84,7 +84,7 @@ <h4 style="font-size: 18px">
           </div>
 
           <div
-            class="col-3 box"
+            class="col-2 box"
             *ngIf="
               (pastIllness?.value?.illnessType !== null &&
                 pastIllness?.value?.illnessType !== '') ||
diff --git a/src/app/app-modules/nurse-doctor/pnc/pnc.component.html b/src/app/app-modules/nurse-doctor/pnc/pnc.component.html
index 4dccf39..87fb6e0 100644
--- a/src/app/app-modules/nurse-doctor/pnc/pnc.component.html
+++ b/src/app/app-modules/nurse-doctor/pnc/pnc.component.html
@@ -4,29 +4,31 @@ <h5>{{ currentLanguageSet?.pncData?.pnc }}</h5>
   </mat-expansion-panel-header>
   <div [formGroup]="patientPNCForm" class="row m-t-20">
     <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 box">
-      <mat-label class="mat-label-text">{{
-        currentLanguageSet?.pncData?.placeofDelivery
-      }}</mat-label>
-      <mat-select
-        class="select-full-width"
-        name="placeOfDelivery"
-        formControlName="deliveryPlace"
-        (selectionChange)="resetOtherPlaceOfDelivery()"
-        required
-      >
-        <mat-option
-          *ngFor="let place of masterData?.deliveryPlaces"
-          [value]="place"
-          >{{ place.deliveryPlace }}</mat-option
+      <mat-form-field [style.width]="'100%'">
+        <mat-label class="mat-label-text">{{
+          currentLanguageSet?.pncData?.placeofDelivery
+        }}</mat-label>
+        <mat-select
+          class="select-full-width"
+          name="placeOfDelivery"
+          formControlName="deliveryPlace"
+          (selectionChange)="resetOtherPlaceOfDelivery()"
+          [required]="true"
         >
-      </mat-select>
+          <mat-option
+            *ngFor="let place of masterData?.deliveryPlaces"
+            [value]="place"
+            >{{ place.deliveryPlace }}</mat-option
+          >
+        </mat-select>
+      </mat-form-field>
     </div>
 
     <div
       class="col-xs-12 col-sm-6 col-md-4 col-lg-4 box"
       *ngIf="deliveryPlace?.deliveryPlace === 'Other'"
     >
-      <mat-form-field class="input-full-width">
+      <mat-form-field [style.width]="'100%'" class="input-full-width">
         <mat-label class="mat-label-text">{{
           currentLanguageSet?.pncData?.others
         }}</mat-label>
@@ -42,24 +44,26 @@ <h5>{{ currentLanguageSet?.pncData?.pnc }}</h5>
     </div>
 
     <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 box">
-      <mat-label class="mat-label-text">{{
-        currentLanguageSet?.pncData?.typeofDelivery
-      }}</mat-label>
-      <mat-select
-        class="select-full-width"
-        name="typeOfDelivery"
-        formControlName="deliveryType"
-        [disabled]="!patientPNCForm.value.deliveryPlace"
-        [required]="patientPNCForm.value.deliveryPlace"
-      >
-        <mat-option *ngFor="let type of selectDeliveryTypes" [value]="type">
-          {{ type.deliveryType }}
-        </mat-option>
-      </mat-select>
+      <mat-form-field [style.width]="'100%'">
+        <mat-label class="mat-label-text">{{
+          currentLanguageSet?.pncData?.typeofDelivery
+        }}</mat-label>
+        <mat-select
+          class="select-full-width"
+          name="typeOfDelivery"
+          formControlName="deliveryType"
+          [disabled]="!patientPNCForm.value.deliveryPlace"
+          [required]="patientPNCForm.value.deliveryPlace"
+        >
+          <mat-option *ngFor="let type of selectDeliveryTypes" [value]="type">
+            {{ type.deliveryType }}
+          </mat-option>
+        </mat-select>
+      </mat-form-field>
     </div>
 
     <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4">
-      <mat-form-field class="fieldAlignment fontStyle">
+      <mat-form-field [style.width]="'100%'" class="fieldAlignment fontStyle">
         <mat-label class="mat-label-text" class="fontStyle">{{
           currentLanguageSet?.pncData?.dateofDelivery
         }}</mat-label>
@@ -82,30 +86,32 @@ <h5>{{ currentLanguageSet?.pncData?.pnc }}</h5>
     </div>
 
     <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 box">
-      <mat-label class="mat-label-text">{{
-        currentLanguageSet?.historyData?.obstetrichistory
-          ?.deliverycomplicationtype
-      }}</mat-label>
-      <mat-select
-        class="select-full-width"
-        name="deliveryComplication"
-        formControlName="deliveryComplication"
-        (selectionChange)="resetOtherDeliveryComplication()"
-      >
-        <mat-option
-          *ngFor="let complication of masterData?.deliveryComplicationTypes"
-          [value]="complication"
+      <mat-form-field [style.width]="'100%'">
+        <mat-label class="mat-label-text">{{
+          currentLanguageSet?.historyData?.obstetrichistory
+            ?.deliverycomplicationtype
+        }}</mat-label>
+        <mat-select
+          class="select-full-width"
+          name="deliveryComplication"
+          formControlName="deliveryComplication"
+          (selectionChange)="resetOtherDeliveryComplication()"
         >
-          {{ complication.deliveryComplicationType }}
-        </mat-option>
-      </mat-select>
+          <mat-option
+            *ngFor="let complication of masterData?.deliveryComplicationTypes"
+            [value]="complication"
+          >
+            {{ complication.deliveryComplicationType }}
+          </mat-option>
+        </mat-select>
+      </mat-form-field>
     </div>
 
     <div
       class="col-xs-12 col-sm-6 col-md-4 col-lg-4 box"
       *ngIf="deliveryComplication?.deliveryComplicationType === 'Other'"
     >
-      <mat-form-field class="input-full-width">
+      <mat-form-field [style.width]="'100%'" class="input-full-width">
         <mat-label class="mat-label-text">{{
           currentLanguageSet?.pncData?.others
         }}</mat-label>
@@ -121,47 +127,51 @@ <h5>{{ currentLanguageSet?.pncData?.pnc }}</h5>
     </div>
 
     <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 box">
-      <mat-label class="mat-label-text">{{
-        currentLanguageSet?.pncData?.outcomeofpregnancy
-      }}</mat-label>
-      <mat-select
-        class="select-full-width"
-        name="outcomeOfPregnancy"
-        formControlName="pregOutcome"
-      >
-        <mat-option
-          *ngFor="let outcome of masterData?.pregOutcomes"
-          [value]="outcome"
+      <mat-form-field [style.width]="'100%'">
+        <mat-label class="mat-label-text">{{
+          currentLanguageSet?.pncData?.outcomeofpregnancy
+        }}</mat-label>
+        <mat-select
+          class="select-full-width"
+          name="outcomeOfPregnancy"
+          formControlName="pregOutcome"
         >
-          {{ outcome.pregOutcome }}
-        </mat-option>
-      </mat-select>
+          <mat-option
+            *ngFor="let outcome of masterData?.pregOutcomes"
+            [value]="outcome"
+          >
+            {{ outcome.pregOutcome }}
+          </mat-option>
+        </mat-select>
+      </mat-form-field>
     </div>
 
     <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 box">
-      <mat-label class="mat-label-text">{{
-        currentLanguageSet?.pncData?.postNatalComplication
-      }}</mat-label>
-      <mat-select
-        class="select-full-width"
-        name="postNatalComplication"
-        formControlName="postNatalComplication"
-        (selectionChange)="resetOtherPostNatalComplication()"
-      >
-        <mat-option
-          *ngFor="let complication of masterData?.postNatalComplications"
-          [value]="complication"
+      <mat-form-field [style.width]="'100%'">
+        <mat-label class="mat-label-text">{{
+          currentLanguageSet?.pncData?.postNatalComplication
+        }}</mat-label>
+        <mat-select
+          class="select-full-width"
+          name="postNatalComplication"
+          formControlName="postNatalComplication"
+          (selectionChange)="resetOtherPostNatalComplication()"
         >
-          {{ complication.complicationValue }}
-        </mat-option>
-      </mat-select>
+          <mat-option
+            *ngFor="let complication of masterData?.postNatalComplications"
+            [value]="complication"
+          >
+            {{ complication.complicationValue }}
+          </mat-option>
+        </mat-select>
+      </mat-form-field>
     </div>
 
     <div
       class="col-xs-12 col-sm-6 col-md-4 col-lg-4 box"
       *ngIf="postNatalComplication?.complicationValue === 'Other'"
     >
-      <mat-form-field class="input-full-width">
+      <mat-form-field [style.width]="'100%'" class="input-full-width">
         <mat-label class="mat-label-text">{{
           currentLanguageSet?.pncData?.others
         }}</mat-label>
@@ -177,24 +187,26 @@ <h5>{{ currentLanguageSet?.pncData?.pnc }}</h5>
     </div>
 
     <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 box">
-      <mat-label class="mat-label-text">{{
-        currentLanguageSet?.pncData?.gestationalAgeofNewborn
-      }}</mat-label>
-      <mat-select
-        class="select-full-width"
-        name="gestation"
-        formControlName="gestationName"
-      >
-        <mat-option
-          *ngFor="let gestation of masterData?.gestation"
-          [value]="gestation"
-          >{{ gestation.name }}</mat-option
+      <mat-form-field [style.width]="'100%'">
+        <mat-label class="mat-label-text">{{
+          currentLanguageSet?.pncData?.gestationalAgeofNewborn
+        }}</mat-label>
+        <mat-select
+          class="select-full-width"
+          name="gestation"
+          formControlName="gestationName"
         >
-      </mat-select>
+          <mat-option
+            *ngFor="let gestation of masterData?.gestation"
+            [value]="gestation"
+            >{{ gestation.name }}</mat-option
+          >
+        </mat-select>
+      </mat-form-field>
     </div>
 
     <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 box">
-      <mat-form-field class="input-full-width">
+      <mat-form-field [style.width]="'100%'" class="input-full-width">
         <mat-label class="mat-label-text">{{
           currentLanguageSet?.pncData?.birthWeight
         }}</mat-label>
@@ -213,21 +225,25 @@ <h5>{{ currentLanguageSet?.pncData?.pnc }}</h5>
     </div>
 
     <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 box">
-      <mat-label class="mat-label-text">{{
-        currentLanguageSet?.pncData?.newBornHealthStatus
-      }}</mat-label>
-      <mat-select
-        class="input-full-width"
-        name="newBornHealthStatus"
-        formControlName="newBornHealthStatus"
-      >
-        <mat-option
-          *ngFor="let newBornHealthStatus of masterData?.newbornHealthStatuses"
-          [value]="newBornHealthStatus"
+      <mat-form-field [style.width]="'100%'">
+        <mat-label class="mat-label-text">{{
+          currentLanguageSet?.pncData?.newBornHealthStatus
+        }}</mat-label>
+        <mat-select
+          class="input-full-width"
+          name="newBornHealthStatus"
+          formControlName="newBornHealthStatus"
         >
-          {{ newBornHealthStatus.newBornHealthStatus }}
-        </mat-option>
-      </mat-select>
+          <mat-option
+            *ngFor="
+              let newBornHealthStatus of masterData?.newbornHealthStatuses
+            "
+            [value]="newBornHealthStatus"
+          >
+            {{ newBornHealthStatus.newBornHealthStatus }}
+          </mat-option>
+        </mat-select>
+      </mat-form-field>
     </div>
   </div>
 </mat-expansion-panel>
diff --git a/src/app/app-modules/nurse-doctor/quick-consult/quick-consult.component.html b/src/app/app-modules/nurse-doctor/quick-consult/quick-consult.component.html
index 7097766..83d419d 100644
--- a/src/app/app-modules/nurse-doctor/quick-consult/quick-consult.component.html
+++ b/src/app/app-modules/nurse-doctor/quick-consult/quick-consult.component.html
@@ -19,7 +19,7 @@ <h4>
           </h4>
         </header>
         <ng-container formArrayName="chiefComplaintList">
-          <div class="row m-t-10" *ngIf="benChiefComplaints.length >= 1">
+          <div class="row m-t-10" *ngIf="dataSource.data.length >= 1">
             <div class="col-xs-12">
               <table
                 class="table table-bordered"
@@ -542,44 +542,48 @@ <h4>
 
           <div class="row">
             <div class="col-xs-12 col-sm-6 m-t-10">
-              <mat-label class="mat-label-text">{{
-                currentLanguageSet?.common?.SelectTestname
-              }}</mat-label>
-              <mat-select
-                class="input-full-width"
-                multiple
-                name="test"
-                formControlName="test"
-                (selectionChange)="checkTestName($event)"
-              >
-                <mat-option
-                  *ngFor="let nonRadiology of nonRadiologyMaster"
-                  [value]="nonRadiology"
-                  [disabled]="canDisableTest(nonRadiology)"
+              <mat-form-field [style.width]="'100%'">
+                <mat-label class="mat-label-text">{{
+                  currentLanguageSet?.common?.SelectTestname
+                }}</mat-label>
+                <mat-select
+                  class="input-full-width"
+                  multiple
+                  name="test"
+                  formControlName="test"
+                  (selectionChange)="checkTestName($event)"
                 >
-                  {{ nonRadiology.procedureName }}
-                </mat-option>
-              </mat-select>
+                  <mat-option
+                    *ngFor="let nonRadiology of nonRadiologyMaster"
+                    [value]="nonRadiology"
+                    [disabled]="canDisableTest(nonRadiology)"
+                  >
+                    {{ nonRadiology.procedureName }}
+                  </mat-option>
+                </mat-select>
+              </mat-form-field>
             </div>
 
             <div class="col-xs-12 col-sm-6 m-t-10">
-              <mat-label class="mat-label-text">{{
-                currentLanguageSet?.labTechnicianData?.radiologyimaging
-              }}</mat-label>
-              <mat-select
-                class="input-full-width"
-                multiple
-                name="radiology"
-                formControlName="radiology"
-              >
-                <mat-option
-                  *ngFor="let radiology of radiologyMaster"
-                  [value]="radiology"
-                  [disabled]="canDisableTest(radiology)"
+              <mat-form-field [style.width]="'100%'">
+                <mat-label class="mat-label-text">{{
+                  currentLanguageSet?.labTechnicianData?.radiologyimaging
+                }}</mat-label>
+                <mat-select
+                  class="input-full-width"
+                  multiple
+                  name="radiology"
+                  formControlName="radiology"
                 >
-                  {{ radiology.procedureName }}
-                </mat-option>
-              </mat-select>
+                  <mat-option
+                    *ngFor="let radiology of radiologyMaster"
+                    [value]="radiology"
+                    [disabled]="canDisableTest(radiology)"
+                  >
+                    {{ radiology.procedureName }}
+                  </mat-option>
+                </mat-select>
+              </mat-form-field>
             </div>
 
             <div class="col-sm-12 col-md-12 m-t-10">
@@ -622,29 +626,29 @@ <h4>
                     style="display: flex"
                   >
                     <ng-container [formGroupName]="i">
-                      <div class="col-xs-12 col-sm-9 col-md-9 m-t-10">
+                      <div class="col-xs-12 col-sm-9 m-t-10">
                         <mat-form-field class="input-full-width">
                           <input
                             matInput
                             allowText="inputFieldValidator"
-                            appOpenModal
+                            appDiagnosisSearch
                             [diagnosisListForm]="diagnosis"
                             formControlName="viewProvisionalDiagnosisProvided"
-                            name="diagnosisProvided"
+                            name="viewProvisionalDiagnosisProvided"
                             maxlength="100"
                             minlength="3"
-                            [previousSelected]="
+                            [addedDiagnosis]="
                               patientQuickConsultForm.value
-                                .provisionalDiagnosisList
+                                ?.provisionalDiagnosisList
                             "
                             required
                           />
                           <mat-icon
                             class="search-btn"
                             matSuffix
-                            appOpenModal
+                            appDiagnosisSearch
                             [diagnosisListForm]="diagnosis"
-                            [previousSelected]="
+                            [addedDiagnosis]="
                               patientQuickConsultForm.value
                                 ?.provisionalDiagnosisList
                             "
@@ -957,7 +961,7 @@ <h4>
                 </div>
               </section>
               <section class="row no-row" style="margin-top: 10px !important">
-                <div class="col-md-10">
+                <div class="col-md-10" style="margin-left: -20px">
                   <mat-form-field class="input-full-width">
                     <mat-label class="mat-label-text">{{
                       currentLanguageSet?.Prescription?.instructions
diff --git a/src/app/app-modules/nurse-doctor/quick-consult/quick-consult.component.ts b/src/app/app-modules/nurse-doctor/quick-consult/quick-consult.component.ts
index bde160e..97164dd 100644
--- a/src/app/app-modules/nurse-doctor/quick-consult/quick-consult.component.ts
+++ b/src/app/app-modules/nurse-doctor/quick-consult/quick-consult.component.ts
@@ -614,7 +614,8 @@ export class QuickConsultComponent
       const complaintDetails = response.findings;
       if (complaintDetails && complaintDetails.complaints) {
         this.benChiefComplaints = complaintDetails.complaints;
-        this.benChiefComplaints.forEach((chiefComplaint: any) => {
+        this.dataSource.data = complaintDetails.complaints;
+        this.dataSource.data.forEach((chiefComplaint) => {
           this.filterInitialComplaints(chiefComplaint);
         });
       }
@@ -1318,8 +1319,8 @@ export class QuickConsultComponent
       }
     }
   }
-  checkProvisionalDiagnosisValidity(viewProvisionalDiagnosisProvided: any) {
-    const temp = viewProvisionalDiagnosisProvided.value;
+  checkProvisionalDiagnosisValidity(provisionalDiagnosis: any) {
+    const temp = provisionalDiagnosis.value;
     if (temp.term && temp.conceptID) {
       return false;
     } else {
diff --git a/src/app/app-modules/nurse-doctor/refer/cancer-refer/cancer-refer.component.html b/src/app/app-modules/nurse-doctor/refer/cancer-refer/cancer-refer.component.html
index 6e8dcdc..14f11cd 100644
--- a/src/app/app-modules/nurse-doctor/refer/cancer-refer/cancer-refer.component.html
+++ b/src/app/app-modules/nurse-doctor/refer/cancer-refer/cancer-refer.component.html
@@ -6,97 +6,111 @@ <h5>{{ currentLanguageSet?.Referdetails?.refer }}</h5>
   <div class="row m-t-20">
     <!-- Save Institute ID and serviceName-->
 
-    <div class="col-xs-6 tcell">
-      <span class="align-middle">
-        {{ currentLanguageSet?.Referdetails?.higherhealthcarecenter }}</span
-      >
-    </div>
-    <div class="col-xs-6 tcell">
-      <mat-form-field>
-        <mat-label class="mat-label-text">{{
-          currentLanguageSet?.common?.select
-        }}</mat-label>
-        <mat-select
-          name="referredToInstituteID"
-          (ngModelChange)="higherhealthcarecenter($event)"
-          formControlName="referredToInstituteID"
+    <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12" style="display: flex">
+      <div class="col-xs-6 col-sm-6 col-md-6 col-lg-6 tcell">
+        <span class="align-middle">
+          {{ currentLanguageSet?.Referdetails?.higherhealthcarecenter }}</span
         >
-          <mat-option
-            *ngFor="let center of higherHealthcareCenter"
-            [value]="center.institutionID"
-            >{{ center.institutionName }}</mat-option
+      </div>
+      <div class="col-sm-6 col-md-3 box">
+        <mat-form-field [style.width]="'100%'">
+          <mat-label class="mat-label-text">{{
+            currentLanguageSet?.common?.select
+          }}</mat-label>
+          <mat-select
+            name="referredToInstituteID"
+            (ngModelChange)="higherhealthcarecenter($event)"
+            formControlName="referredToInstituteID"
           >
-        </mat-select>
-      </mat-form-field>
-    </div>
-    <div class="col-xs-6 tcell">
-      <span class="align-middle">
-        {{ currentLanguageSet?.Referdetails?.additionalservices }}</span
-      >
+            <mat-option
+              *ngFor="let center of higherHealthcareCenter"
+              [value]="center.institutionID"
+              >{{ center.institutionName }}</mat-option
+            >
+          </mat-select>
+        </mat-form-field>
+      </div>
     </div>
-    <div class="col-xs-6 tcell">
-      <mat-form-field>
-        <mat-label class="mat-label-text">{{
-          currentLanguageSet?.common?.select
-        }}</mat-label>
-        <mat-select
-          (ngModelChange)="additionalservices($event)"
-          multiple="true"
-          name="refrredToAdditionalServiceList"
-          formControlName="refrredToAdditionalServiceList"
+
+    <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12" style="display: flex">
+      <div class="col-xs-6 col-sm-6 col-md-6 col-lg-6 tcell">
+        <span class="align-middle">
+          {{ currentLanguageSet?.Referdetails?.additionalservices }}</span
         >
-          <mat-option
-            *ngFor="let service of additionalServices"
-            [value]="service.serviceName"
-            [disabled]="canDisable(service)"
-          >
-            {{ service.serviceName }}</mat-option
+      </div>
+      <div class="col-sm-6 col-md-3 box">
+        <mat-form-field [style.width]="'100%'">
+          <mat-label class="mat-label-text">{{
+            currentLanguageSet?.common?.select
+          }}</mat-label>
+          <mat-select
+            (ngModelChange)="additionalservices($event)"
+            multiple="true"
+            name="refrredToAdditionalServiceList"
+            formControlName="refrredToAdditionalServiceList"
           >
-        </mat-select>
-      </mat-form-field>
+            <mat-option
+              *ngFor="let service of additionalServices"
+              [value]="service.serviceName"
+              [disabled]="canDisable(service)"
+            >
+              {{ service.serviceName }}</mat-option
+            >
+          </mat-select>
+        </mat-form-field>
+      </div>
     </div>
-    <div *ngIf="selectValue > 0; else elseBlock" class="col-xs-6 tcell">
-      <span class="align-middle">
-        {{ currentLanguageSet?.Referdetails?.referralReason }}*</span
+
+    <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12" style="display: flex">
+      <div
+        *ngIf="selectValue > 0; else elseBlock"
+        class="col-xs-6 col-sm-6 col-md-6 col-lg-6 tcell"
       >
-    </div>
-    <ng-template #elseBlock>
-      <div class="col-xs-6 tcell">
         <span class="align-middle">
-          {{ currentLanguageSet?.Referdetails?.referralReason }}</span
+          {{ currentLanguageSet?.Referdetails?.referralReason }}*</span
         >
       </div>
-    </ng-template>
-
-    <div *ngIf="selectValue > 0; else elseBlockText" class="col-xs-6">
-      <mat-form-field class="referreason" [style.width]="'100%'">
-        <textarea
-          matInput
-          allowText="textAreaValidator"
-          matTextareaAutosize
-          required="true"
-          formControlName="referralReason"
-          name="Remarks"
-          maxLength="300"
-        ></textarea>
-      </mat-form-field>
-    </div>
+      <ng-template #elseBlock>
+        <div class="col-xs-6 col-sm-6 col-md-6 col-lg-6 tcell">
+          <span class="align-middle">
+            {{ currentLanguageSet?.Referdetails?.referralReason }}</span
+          >
+        </div>
+      </ng-template>
 
-    <ng-template #elseBlockText>
-      <div class="col-xs-6">
+      <div
+        *ngIf="selectValue > 0; else elseBlockText"
+        class="col-xs-6 col-sm-6 col-md-6 col-lg-6"
+      >
         <mat-form-field class="referreason" [style.width]="'100%'">
           <textarea
             matInput
             allowText="textAreaValidator"
             matTextareaAutosize
+            required="true"
             formControlName="referralReason"
             name="Remarks"
             maxLength="300"
           ></textarea>
         </mat-form-field>
       </div>
-    </ng-template>
-    <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
+
+      <ng-template #elseBlockText>
+        <div class="col-xs-6 col-sm-6 col-md-6 col-lg-6">
+          <mat-form-field class="referreason" [style.width]="'100%'">
+            <textarea
+              matInput
+              allowText="textAreaValidator"
+              matTextareaAutosize
+              formControlName="referralReason"
+              name="Remarks"
+              maxLength="300"
+            ></textarea>
+          </mat-form-field>
+        </div>
+      </ng-template>
+    </div>
+    <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12" style="display: flex">
       <div class="col-xs-6 col-sm-6 col-md-6 col-lg-6 alignment">
         {{ currentLanguageSet?.Referdetails?.revisitDate }}
       </div>
diff --git a/src/app/app-modules/nurse-doctor/scheduler/scheduler.component.css b/src/app/app-modules/nurse-doctor/scheduler/scheduler.component.css
index dc3b746..60da3bd 100644
--- a/src/app/app-modules/nurse-doctor/scheduler/scheduler.component.css
+++ b/src/app/app-modules/nurse-doctor/scheduler/scheduler.component.css
@@ -33,7 +33,7 @@
 }
 
 .available {
-  background: white;
+  background: white !important;
   border: 1px solid green;
 }
 
@@ -54,4 +54,9 @@
 .step-btn button {
   float: right;
   margin-left: 5px;
+}
+
+.mat-chip-option.mat-chip-option-selected.mat-primary {
+  background-color: #0277bd !important;
+  color: white !important;
 }
\ No newline at end of file
diff --git a/src/app/app-modules/nurse-doctor/scheduler/scheduler.component.html b/src/app/app-modules/nurse-doctor/scheduler/scheduler.component.html
index cc2501a..abd7f80 100644
--- a/src/app/app-modules/nurse-doctor/scheduler/scheduler.component.html
+++ b/src/app/app-modules/nurse-doctor/scheduler/scheduler.component.html
@@ -121,40 +121,46 @@ <h4>{{ currentLanguageSet?.common?.scheduler }}</h4>
         </mat-form-field>
       </div>
       <div class="col-xs-12 box" style="margin-top: 23px">
-        <mat-label>{{ currentLanguageSet?.common?.specialization }}</mat-label>
-        <mat-select
-          class="input-full-width"
-          name="specialization"
-          formControlName="specialization"
-          (selectionChange)="getSpecialist()"
-          required
-        >
-          <mat-option
-            *ngFor="let specialization of masterSpecialization"
-            [value]="specialization"
+        <mat-form-field style="width: 100%">
+          <mat-label>{{
+            currentLanguageSet?.common?.specialization
+          }}</mat-label>
+          <mat-select
+            class="input-full-width"
+            name="specialization"
+            formControlName="specialization"
+            (selectionChange)="getSpecialist()"
+            required
           >
-            {{ specialization.specialization }}
-          </mat-option>
-        </mat-select>
+            <mat-option
+              *ngFor="let specialization of masterSpecialization"
+              [value]="specialization"
+            >
+              {{ specialization.specialization }}
+            </mat-option>
+          </mat-select>
+        </mat-form-field>
       </div>
       <div class="col-xs-12 box">
-        <mat-label>{{
-          currentLanguageSet?.common?.specialistDetails
-        }}</mat-label>
-        <mat-select
-          class="input-full-width"
-          name="specialistDetails"
-          formControlName="specialistDetails"
-          required
-          (selectionChange)="getAvailableSlot(specialistDetails)"
-        >
-          <mat-option
-            *ngFor="let specialistDetails of masterSpecialistDetails"
-            [value]="specialistDetails"
+        <mat-form-field style="width: 100%">
+          <mat-label>{{
+            currentLanguageSet?.common?.specialistDetails
+          }}</mat-label>
+          <mat-select
+            class="input-full-width"
+            name="specialistDetails"
+            formControlName="specialistDetails"
+            required
+            (selectionChange)="getAvailableSlot(specialistDetails)"
           >
-            {{ specialistDetails.userName }}
-          </mat-option>
-        </mat-select>
+            <mat-option
+              *ngFor="let specialistDetails of masterSpecialistDetails"
+              [value]="specialistDetails"
+            >
+              {{ specialistDetails.userName }}
+            </mat-option>
+          </mat-select>
+        </mat-form-field>
       </div>
     </div>
   </form>
@@ -186,8 +192,8 @@ <h4>{{ currentLanguageSet?.common?.scheduler }}</h4>
     <div class="col-xs-12" *ngIf="selectedSlot && selectedSlot !== null">
       <button
         mat-raised-button
-        class="pull-right btn-green"
-        color="primary"
+        class="mat_blue"
+        style="float: right"
         id="slot"
         (click)="saveScheduledSlot()"
       >
diff --git a/src/app/app-modules/nurse-doctor/scheduler/scheduler.component.ts b/src/app/app-modules/nurse-doctor/scheduler/scheduler.component.ts
index b6b7ee6..e04bab0 100644
--- a/src/app/app-modules/nurse-doctor/scheduler/scheduler.component.ts
+++ b/src/app/app-modules/nurse-doctor/scheduler/scheduler.component.ts
@@ -114,6 +114,7 @@ export class SchedulerComponent implements OnInit, DoCheck {
       });
       this.schedulerDate = checkdate;
       this.today = today;
+      this.getMasterSpecializationSchedule();
     }
   }
 
@@ -158,6 +159,28 @@ export class SchedulerComponent implements OnInit, DoCheck {
     );
   }
 
+  getMasterSpecializationSchedule() {
+    this.availableSlotList = null;
+    this.masterSpecialization = [];
+    this.masterSpecialistDetails = [];
+    this.schedulerForm.patchValue({
+      specialization: null,
+      specialistDetails: null,
+    });
+    this.doctorService.getMasterSpecialization().subscribe(
+      (response: any) => {
+        if (response && response.statusCode === 200) {
+          this.masterSpecialization = response.data;
+        } else {
+          this.confirmationService.alert(response.errorMessage, 'error');
+        }
+      },
+      (err) => {
+        this.confirmationService.alert(err, 'error');
+      },
+    );
+  }
+
   masterSpecialistDetails: any = [];
   getSpecialist() {
     this.availableSlotList = null;
diff --git a/src/app/app-modules/nurse-doctor/shared/utility/general-utility.ts b/src/app/app-modules/nurse-doctor/shared/utility/general-utility.ts
index c8c7ea3..f3289ac 100644
--- a/src/app/app-modules/nurse-doctor/shared/utility/general-utility.ts
+++ b/src/app/app-modules/nurse-doctor/shared/utility/general-utility.ts
@@ -814,9 +814,9 @@ export class GeneralUtils {
   createPatientPNCForm() {
     const serviceLineDetails: any = localStorage.getItem('serviceLineDetails');
     return this.fb.group({
-      deliveryPlace: [null, Validators.required],
+      deliveryPlace: null,
       otherDeliveryPlace: null,
-      deliveryType: [null, Validators.required],
+      deliveryType: null,
       dDate: null,
       deliveryComplication: null,
       otherDeliveryComplication: null,
diff --git a/src/app/app-modules/nurse-doctor/tc-specialist-worklist/tc-specialist-worklist.component.html b/src/app/app-modules/nurse-doctor/tc-specialist-worklist/tc-specialist-worklist.component.html
index f6e4ee9..f64863b 100644
--- a/src/app/app-modules/nurse-doctor/tc-specialist-worklist/tc-specialist-worklist.component.html
+++ b/src/app/app-modules/nurse-doctor/tc-specialist-worklist/tc-specialist-worklist.component.html
@@ -232,7 +232,7 @@
                     *ngIf="element.benArrivedFlag"
                     mat-mini-fab
                     color="accent"
-                    class="mat_green"
+                    class="mat_green_circle"
                   >
                     <span color="accent" class="material-icons">done</span>
                   </button>
@@ -286,7 +286,7 @@
                     [disabled]="element.specialist_flag !== 1"
                     mat-raised-button
                     color="warn"
-                    class="mat_blue"
+                    class="mat_red"
                   >
                     {{ currentLanguageSet?.common?.cancel }}
                   </button>
@@ -325,7 +325,7 @@
                   <li>
                     <div class="marker-c-d"></div>
                     <p>
-                      {{ currentLanguageSet?.alerts?.info?.consultationDone }}
+                      {{ currentLanguageSet?.alerts?.info?.consultation_done }}
                     </p>
                   </li>
                   <li>
@@ -356,7 +356,7 @@
             <strong>{{ currentLanguageSet?.common?.noRecordsFound }}</strong>
           </div>
           <div class="col-12 row">
-            <div class="col-6">
+            <div class="col-12">
               <ul class="description" *ngIf="dataSource.data.length > 0">
                 <li>
                   <div class="marker-p-f-c"></div>
@@ -381,7 +381,7 @@
                 <li>
                   <div class="marker-c-d"></div>
                   <p>
-                    {{ currentLanguageSet?.alerts?.info?.consultationDone }}
+                    {{ currentLanguageSet?.alerts?.info?.consultation_done }}
                   </p>
                 </li>
                 <li>
@@ -400,7 +400,7 @@
                 </li>
               </ul>
             </div>
-            <div class="col-6">
+            <div class="col-12" style="margin-top: 40px !important">
               <mat-paginator
                 style="display: unset !important"
                 [pageSizeOptions]="[5, 10, 20]"
diff --git a/src/app/app-modules/nurse-doctor/visit-details/chief-complaints/chief-complaints.component.html b/src/app/app-modules/nurse-doctor/visit-details/chief-complaints/chief-complaints.component.html
index f07876f..4b7da72 100644
--- a/src/app/app-modules/nurse-doctor/visit-details/chief-complaints/chief-complaints.component.html
+++ b/src/app/app-modules/nurse-doctor/visit-details/chief-complaints/chief-complaints.component.html
@@ -243,5 +243,14 @@
       <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
       <tr mat-row *matRowDef="let row; columns: displayedColumns"></tr>
     </table>
+    <div
+      class="pull-center"
+      style="margin-top: 5px; text-align: center"
+      *ngIf="dataSource.data.length === 0"
+    >
+      <strong>{{
+        currentLanguageSet?.nurseData?.chiefComplaintsDetails?.noCheifComplaint
+      }}</strong>
+    </div>
   </div>
 </div>
diff --git a/src/app/app-modules/nurse-doctor/visit-details/investigations/investigations.component.html b/src/app/app-modules/nurse-doctor/visit-details/investigations/investigations.component.html
index 44e0b1a..90f7b3f 100644
--- a/src/app/app-modules/nurse-doctor/visit-details/investigations/investigations.component.html
+++ b/src/app/app-modules/nurse-doctor/visit-details/investigations/investigations.component.html
@@ -1,22 +1,24 @@
 <div class="row m-t-20" [formGroup]="patientInvestigationsForm">
   <div class="col-xs-12 col-sm-6 col-md-6 col-lg-6 box">
-    <mat-label class="mat-label-text">{{
-      currentLanguageSet?.nurseData?.investigationsDetails?.laboratory
-    }}</mat-label>
-    <mat-select
-      class="input-full-width"
-      multiple
-      name="laboratoryList"
-      formControlName="laboratoryList"
-      (selectionChange)="checkTestName($event)"
-    >
-      <mat-option
-        *ngFor="let laboratary of selectLabTest"
-        [value]="laboratary"
-        [disabled]="canDisable(laboratary)"
+    <mat-form-field [style.width]="'100%'">
+      <mat-label class="mat-label-text">{{
+        currentLanguageSet?.nurseData?.investigationsDetails?.laboratory
+      }}</mat-label>
+      <mat-select
+        class="input-full-width"
+        multiple
+        name="laboratoryList"
+        formControlName="laboratoryList"
+        (selectionChange)="checkTestName($event)"
       >
-        {{ laboratary.procedureName }}
-      </mat-option>
-    </mat-select>
+        <mat-option
+          *ngFor="let laboratary of selectLabTest"
+          [value]="laboratary"
+          [disabled]="canDisable(laboratary)"
+        >
+          {{ laboratary.procedureName }}
+        </mat-option>
+      </mat-select>
+    </mat-form-field>
   </div>
 </div>
diff --git a/src/app/app-modules/nurse-doctor/visit-details/symptoms/symptoms.component.html b/src/app/app-modules/nurse-doctor/visit-details/symptoms/symptoms.component.html
index cab2a06..957053d 100644
--- a/src/app/app-modules/nurse-doctor/visit-details/symptoms/symptoms.component.html
+++ b/src/app/app-modules/nurse-doctor/visit-details/symptoms/symptoms.component.html
@@ -1,25 +1,23 @@
 <div class="row m-t-20" [formGroup]="patientCovidForm">
   <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 box">
-    <mat-label class="mat-label-text">{{
-      currentLanguageSet?.ExaminationData?.cancerScreeningExamination?.symptoms
-        ?.symptoms
-    }}</mat-label>
-    <mat-select
-      [style.width]="'50%'"
-      multiple
-      (selectionChange)="symptomSelected()"
-      id="symptom"
-      placeholder="{{
+    <mat-form-field [style.width]="'100%'">
+      <mat-label class="mat-label-text">{{
         currentLanguageSet?.ExaminationData?.cancerScreeningExamination
           ?.symptoms?.symptoms
-      }}"
-      name="symptom"
-      formControlName="symptom"
-      required="true"
-    >
-      <mat-option *ngFor="let symp of symptomsList" [value]="symp">
-        {{ symp }}
-      </mat-option>
-    </mat-select>
+      }}</mat-label>
+      <mat-select
+        [style.width]="'50%'"
+        multiple
+        (selectionChange)="symptomSelected()"
+        id="symptom"
+        name="symptom"
+        formControlName="symptom"
+        required="true"
+      >
+        <mat-option *ngFor="let symp of symptomsList" [value]="symp">
+          {{ symp }}
+        </mat-option>
+      </mat-select>
+    </mat-form-field>
   </div>
 </div>
diff --git a/src/app/app-modules/nurse-doctor/visit-details/travel-history/travel-history.component.html b/src/app/app-modules/nurse-doctor/visit-details/travel-history/travel-history.component.html
index c7b4af9..1729b6b 100644
--- a/src/app/app-modules/nurse-doctor/visit-details/travel-history/travel-history.component.html
+++ b/src/app/app-modules/nurse-doctor/visit-details/travel-history/travel-history.component.html
@@ -94,9 +94,6 @@ <h4 style="text-align: center; color: black; size: 40px">
                           class="test"
                           name="modeOfTravelDomestic"
                           formControlName="modeOfTravelDomestic"
-                          placeholder="{{
-                            currentLanguageSet?.travel?.modeofTravel
-                          }}"
                           id="modeOfTravelDomestic"
                           (selectionChange)="
                             traveldomesticStatuschange(modeOfTravelDomestic)
@@ -124,7 +121,6 @@ <h5>
                           [style.width]="'70%'"
                           name="fromStateDom"
                           id="fromStateDom"
-                          placeholder="{{ currentLanguageSet?.travel?.state }}"
                           formControlName="fromStateDom"
                           (selectionChange)="GetDistrictsFromDom(fromStateDom)"
                         >
@@ -147,9 +143,6 @@ <h5>
                           [style.width]="'70%'"
                           id="fromDistrictDom"
                           name="fromDistrictDom"
-                          placeholder="{{
-                            currentLanguageSet?.travel?.district
-                          }}"
                           formControlName="fromDistrictDom"
                           (selectionChange)="
                             GetSubDistrictFromDom(fromDistrictDom)
@@ -174,9 +167,6 @@ <h5>
                           [style.width]="'70%'"
                           id="fromSubDistrictDom"
                           formControlName="fromSubDistrictDom"
-                          placeholder="{{
-                            currentLanguageSet?.travel?.subDistrict
-                          }}"
                           name="fromSubDistrictDom"
                           (selectionChange)="getVillage(fromSubDistrictDom)"
                         >
@@ -203,7 +193,6 @@ <h5>
                           [style.width]="'70%'"
                           name="toStateDom"
                           formControlName="toStateDom"
-                          placeholder="{{ currentLanguageSet?.travel?.state }}"
                           id="toStateDom"
                           (selectionChange)="GetDistrictsToDom(toStateDom)"
                         >
@@ -226,9 +215,6 @@ <h5>
                           [style.width]="'70%'"
                           name="toDistrictDom"
                           formControlName="toDistrictDom"
-                          placeholder="{{
-                            currentLanguageSet?.travel?.district
-                          }}"
                           id="toDistrictDom"
                           (selectionChange)="getSubDistrictToDom(toDistrictDom)"
                         >
@@ -250,9 +236,6 @@ <h5>
                         <mat-select
                           [style.width]="'70%'"
                           name="toSubDistrictDom"
-                          placeholder="{{
-                            currentLanguageSet?.travel?.subDistrict
-                          }}"
                           id="toSubDistrictDom"
                           formControlName="toSubDistrictDom"
                           (selectionChange)="
@@ -314,9 +297,6 @@ <h4 style="text-align: center; color: black; size: 30px">
                           class="test"
                           id="modeOfTravelInter"
                           formControlName="modeOfTravelInter"
-                          placeholder="{{
-                            currentLanguageSet?.travel?.modeofTravel
-                          }}"
                           name="modeOfTravelInter"
                           (selectionChange)="
                             travelinternationalStatuschange(modeOfTravelInter)
@@ -345,9 +325,6 @@ <h5>
                         <mat-select
                           [style.width]="'70%'"
                           id="fromCountryInter"
-                          placeholder="{{
-                            currentLanguageSet?.travel?.country
-                          }}"
                           formControlName="fromCountryInter"
                           name="fromCountryInter"
                           (selectionChange)="
@@ -371,7 +348,6 @@ <h5>
                         }}</mat-label>
                         <mat-select
                           [style.width]="'70%'"
-                          placeholder="{{ currentLanguageSet?.travel?.city }}"
                           formControlName="fromCityInter"
                           id="fromCityInter"
                           name="fromCityInter"
@@ -400,9 +376,6 @@ <h5>
                         }}</mat-label>
                         <mat-select
                           [style.width]="'70%'"
-                          placeholder="{{
-                            currentLanguageSet?.travel?.country
-                          }}"
                           formControlName="toCountryInter"
                           name="toCountryInter"
                           id="toCountryInter"
@@ -425,7 +398,6 @@ <h5>
                         }}</mat-label>
                         <mat-select
                           [style.width]="'70%'"
-                          placeholder="{{ currentLanguageSet?.travel?.city }}"
                           name="toCityInter"
                           id="toCityInter"
                           formControlName="toCityInter"
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 ac85bad..41624c7 100644
--- a/src/app/app-modules/nurse-doctor/workarea/workarea.component.ts
+++ b/src/app/app-modules/nurse-doctor/workarea/workarea.component.ts
@@ -288,7 +288,7 @@ export class WorkareaComponent
     if (this.attendant === 'tcspecialist') {
       this.isSpecialist = true;
       if (this.doctorFlag === '1') {
-        if (this.specialistFlag === '1') {
+        if (this.specialistFlag === 1) {
           this.doctorSaveAndTCSave = this.current_language_set.common.submit;
           this.isDoctorSave = true;
           console.log(
@@ -964,6 +964,7 @@ export class WorkareaComponent
                 ),
               );
               this.patientMedicalForm.reset();
+              this.router.navigate(['/nurse-doctor/doctor-worklist']);
               sessionStorage.removeItem('instFlag');
               sessionStorage.removeItem('suspectFlag');
               if (this.isSpecialist) {
@@ -1159,7 +1160,6 @@ export class WorkareaComponent
                   }
                 }
                 this.patientMedicalForm.reset();
-                this.confirmationService.alert(res.data.response, 'success');
               } else {
                 this.resetSpinnerandEnableTheSubmitButton();
                 this.confirmationService.alert(res.errorMessage, 'error');
@@ -1318,6 +1318,8 @@ export class WorkareaComponent
                   );
                 }
               }
+              this.patientMedicalForm.reset();
+              this.router.navigate(['/nurse-doctor/doctor-worklist']);
             } else {
               this.resetSpinnerandEnableTheSubmitButton();
               this.confirmationService.alert(res.errorMessage, 'error');
@@ -1523,8 +1525,7 @@ export class WorkareaComponent
 
       if (diagForm3.controls['viewProvisionalDiagnosisProvided'].errors) {
         required.push(
-          this.current_language_set.DiagnosisDetails
-            .viewProvisionalDiagnosisProvided,
+          this.current_language_set.DiagnosisDetails.provisionaldiagnosis,
         );
       }
 
@@ -1596,8 +1597,7 @@ export class WorkareaComponent
       const diagForm3 = <FormGroup>diagForm2.controls[0];
       if (diagForm3.controls['viewProvisionalDiagnosisProvided'].errors) {
         required.push(
-          this.current_language_set.DiagnosisDetails
-            .viewProvisionalDiagnosisProvided,
+          this.current_language_set.DiagnosisDetails.provisionaldiagnosis,
         );
       }
 
@@ -1643,8 +1643,7 @@ export class WorkareaComponent
 
       if (diagForm1.controls['provisionalDiagnosisPrimaryDoctor'].errors) {
         required.push(
-          this.current_language_set.DiagnosisDetails
-            .viewProvisionalDiagnosisProvided,
+          this.current_language_set.DiagnosisDetails.provisionaldiagnosis,
         );
       }
     }
@@ -1658,8 +1657,7 @@ export class WorkareaComponent
       const diagForm1 = <FormGroup>diagForm.controls['diagnosisForm'];
       if (diagForm1.controls['provisionalDiagnosisPrimaryDoctor'].errors) {
         required.push(
-          this.current_language_set.DiagnosisDetails
-            .viewProvisionalDiagnosisProvided,
+          this.current_language_set.DiagnosisDetails.provisionaldiagnosis,
         );
       }
     }
@@ -2032,8 +2030,7 @@ export class WorkareaComponent
 
       if (diagForm.controls['provisionalDiagnosisPrimaryDoctor'].errors) {
         required.push(
-          this.current_language_set.DiagnosisDetails
-            .viewProvisionalDiagnosisProvided,
+          this.current_language_set.DiagnosisDetails.provisionaldiagnosis,
         );
       }
     }
@@ -2048,8 +2045,7 @@ export class WorkareaComponent
 
       if (diagForm.controls['provisionalDiagnosisPrimaryDoctor'].errors) {
         required.push(
-          this.current_language_set.DiagnosisDetails
-            .viewProvisionalDiagnosisProvided,
+          this.current_language_set.DiagnosisDetails.provisionaldiagnosis,
         );
       }
     }
@@ -2311,8 +2307,7 @@ export class WorkareaComponent
         this.enableProvisionalDiag === true
       ) {
         required.push(
-          this.current_language_set.DiagnosisDetails
-            .viewProvisionalDiagnosisProvided,
+          this.current_language_set.DiagnosisDetails.provisionaldiagnosis,
         );
       }
 
@@ -2447,8 +2442,7 @@ export class WorkareaComponent
       const diagForm3 = <FormGroup>diagForm2.controls[0];
       if (diagForm3.controls['viewProvisionalDiagnosisProvided'].errors) {
         required.push(
-          this.current_language_set.DiagnosisDetails
-            .viewProvisionalDiagnosisProvided,
+          this.current_language_set.DiagnosisDetails.provisionaldiagnosis,
         );
       }
 
@@ -2480,8 +2474,7 @@ export class WorkareaComponent
       const diagForm3 = <FormGroup>diagForm2.controls[0];
       if (diagForm3.controls['viewProvisionalDiagnosisProvided'].errors) {
         required.push(
-          this.current_language_set.DiagnosisDetails
-            .viewProvisionalDiagnosisProvided,
+          this.current_language_set.DiagnosisDetails.provisionaldiagnosis,
         );
       }
 
@@ -2506,8 +2499,7 @@ export class WorkareaComponent
 
     if (form.controls['provisionalDiagnosisList'].errors) {
       required.push(
-        this.current_language_set.DiagnosisDetails
-          .viewProvisionalDiagnosisProvided,
+        this.current_language_set.DiagnosisDetails.provisionaldiagnosis,
       );
     }
 
@@ -2620,6 +2612,7 @@ export class WorkareaComponent
                   );
                 }
               }
+              this.router.navigate(['/nurse-doctor/doctor-worklist']);
             } else {
               this.resetSpinnerandEnableTheSubmitButton();
               this.confirmationService.alert(res.errorMessage, 'error');
@@ -2652,7 +2645,6 @@ export class WorkareaComponent
                   patientQuickConsultDetails.labTestOrders !== null &&
                   patientQuickConsultDetails.labTestOrders.length > 0
                 ) {
-                  this.confirmationService.alert(res.data.response, 'success');
                   this.navigateToSpecialistWorklist();
                 } else {
                   this.getHealthIDDetails(res.data.response);
@@ -2665,7 +2657,6 @@ export class WorkareaComponent
                   (this.schedulerData !== undefined &&
                     this.schedulerData !== null)
                 ) {
-                  this.confirmationService.alert(res.data.response, 'success');
                   this.navigateToDoctorWorklist();
                 } else {
                   this.getHealthIDDetails(res.data.response);
@@ -2790,6 +2781,8 @@ export class WorkareaComponent
               } else {
                 this.linkCareContextBasedOnTestsPrescribed();
               }
+              this.patientMedicalForm.reset();
+              this.router.navigate(['/nurse-doctor/doctor-worklist']);
             } else {
               this.resetSpinnerandEnableTheSubmitButton();
               this.confirmationService.alert(res.errorMessage, 'error');
@@ -2956,6 +2949,8 @@ export class WorkareaComponent
                   );
                 }
               }
+              this.patientMedicalForm.reset();
+              this.router.navigate(['/nurse-doctor/doctor-worklist']);
             } else {
               this.resetSpinnerandEnableTheSubmitButton();
               this.confirmationService.alert(res.errorMessage, 'error');
@@ -2995,6 +2990,8 @@ export class WorkareaComponent
               } else {
                 this.linkCareContextBasedOnTestsPrescribed();
               }
+              this.patientMedicalForm.reset();
+              this.router.navigate(['/nurse-doctor/doctor-worklist']);
             } else {
               this.resetSpinnerandEnableTheSubmitButton();
               this.confirmationService.alert(res.errorMessage, 'error');
@@ -3223,7 +3220,6 @@ export class WorkareaComponent
                 this.linkCareContextBasedOnTestsPrescribed();
               }
               this.patientMedicalForm.reset();
-              this.confirmationService.alert(res.data.response, 'success');
               this.router.navigate(['/nurse-doctor/doctor-worklist']);
             } else {
               this.resetSpinnerandEnableTheSubmitButton();
@@ -3267,6 +3263,8 @@ export class WorkareaComponent
               } else {
                 this.linkCareContextBasedOnTestsPrescribed();
               }
+              this.patientMedicalForm.reset();
+              this.router.navigate(['/nurse-doctor/doctor-worklist']);
             } else {
               this.resetSpinnerandEnableTheSubmitButton();
               this.confirmationService.alert(res.errorMessage, 'error');
diff --git a/src/css/custom.css b/src/css/custom.css
index eb18474..2b2773c 100644
--- a/src/css/custom.css
+++ b/src/css/custom.css
@@ -1019,6 +1019,7 @@ em {
   display: flex;
   justify-content: flex-end;
   align-items: flex-end;
+  margin-bottom: 30px;
 }
 
 .footer {
diff --git a/src/styles.css b/src/styles.css
index 4baffda..cfd3aaa 100644
--- a/src/styles.css
+++ b/src/styles.css
@@ -70,6 +70,24 @@
   cursor: not-allowed;
 }
 
+.mat_red {
+  background-color: #ff5252 !important;
+  border-color: unset !important;
+  color: white;
+  border: unset;
+  border-radius: 3px;
+  line-height: 36px;
+  min-width: 88px;
+}
+.mat_red:disabled {
+  background-color: #e0e0e0 !important;
+  border-color: unset !important;
+  color: rgba(0, 0, 0, 0.38);
+  border: unset;
+  border-radius: 3px;
+  line-height: 36px;
+  min-width: 88px;
+}
 .mat_blue {
   background-color: #0277bd !important;
   border-color: unset !important;
@@ -149,6 +167,22 @@
   bottom: 50px;
   z-index: 3;
 }
+
+.mat_green_circle {
+  background-color: #43a047 !important;
+  min-width: 0;
+  border-radius: 50%;
+  border-color: unset !important;
+  color: white;
+  border: unset;
+  width: 40px;
+  height: 40px;
+  padding: 0;
+  left: 20px;
+  bottom: 50px;
+  z-index: 3;
+}
+
 .mat_blue_circle:disabled {
   background-color: #e0e0e0;
   min-width: 0;
@@ -595,3 +629,12 @@ input:-internal-autofill-selected {
   background-color: unset !important;
 }
 
+.mat-mdc-tab.mdc-tab--active .mdc-tab__text-label {
+  font-weight: 800 !important;
+  color: rgba(0, 0, 0, 0.87) !important;
+  font-size: 15px !important;
+}
+
+.mat-mdc-table {
+  border: 1px solid #ddd !important;
+}
\ No newline at end of file