second commit

Presentation/Hims.Admin/src/app/app.module.ts

@@ -18,7 +18,7 @@ const components = [AvatarImageComponent, SymptomsViewComponent];
         BrowserModule,
         BrowserAnimationsModule,
         SharedModule.forRoot(),
-        AppRoutingModule
+        AppRoutingModule,
     ],
     declarations: [
         AppComponent,

Presentation/Hims.Admin/src/app/app.routing.module.ts

@@ -52,14 +52,6 @@ const routes: Routes = [
                 path: "ambulance",
                 loadChildren: () => import('./areas/admin/ambulance/ambulance.module').then(m => m.AmbulanceModule)
             },
-            {
-                path: "patients",
-                loadChildren: () => import('./areas/admin/patients/patients.module').then(m => m.PatientsModule)
-            },
-            {
-                path: "patient/:id",
-                loadChildren: () => import('./areas/admin/patient/patient.module').then(m => m.PatientModule)
-            }
         ]
     },
     { path: "**", redirectTo: "not-found" },

Presentation/Hims.Admin/src/app/areas/admin/masters/masters.module.ts

@@ -5,17 +5,72 @@ import { SharedModule } from '@src/app/shared/shared.module';
 import { MastersRoutingModule } from './masters.routing.module';
 import { AppointmentTypePage } from './pages/appointment-types/appointment-types.page';
 import { RolePage } from './pages/roles/roles.page';
+import { ChargeManagementPage } from './pages/charge-management/charge-management.page';
+import { CaseTypePage } from './pages/case-type/case-type.page';
+import { ChargeTypesPage } from './pages/charge-types/charge-types.page';
+import { ChargeCategoryPage } from './pages/charge-category/charge-category.page';
+import { ConsultationTypePage } from './pages/consultation-type/consultation-type.page';
+import { AssessmentTypePage } from './pages/assessment-type/assessment-type.page';
+import { DepartmentPage } from './pages/departments/department.page';
+import { DietGuidLinesPage } from './pages/diet-guidlines/diet-guidlines.page';
+import { SpecializationPage } from './pages/specializations/specializations.page';
+import { DiscountManagementPage } from './pages/discount-management/discount-management.page';
+import { DoctorAppointmentNotice } from './pages/doctor-appointment-notice/doctor-appointment-notice.page';
+import { DoctorUnitPage } from './pages/doctor-unit/doctor-unit.page';
+import { DynamicTemplatePage } from './pages/dynamic-template/dynamic-template.page';
+import { EncounterOrderMasterPage } from './pages/encounter-order-master/encounter-order-master.page';
+import { EncounterOrderTemplatesPage } from './pages/encounter-order-templates/encounter-order-templates.page';
+import { EncounterTypePage } from './pages/encounter-type/encounter-type.page';
+import { DischargeInstructionsPage } from './pages/discharge-instructions/discharge-instructions.page';
+import { PatientImportPage } from './pages/patient-import/patient-import.page';
+import { PatientRegistrationChargePage } from './pages/patient-registration/patient-registration.page';
+import { PayCategoryPage } from './pages/pay-categories/pay-categories.page';
+import { PayTypePage } from './pages/pay-type/pay-type.page';
+import { ProviderScheduleChargesPage } from './pages/provider-schedule-charges/provider-schedule-charges.page';
+import { ProviderScheduleVisitsPage } from './pages/provider-schedule-visits/provider-schedule-visits.page';
+import { ReasonPage } from './pages/reasons/reasons.page';
+import { ReferenceTypePage } from './pages/reference-types/reference-types.page';
 
 @NgModule({
   declarations: [
     MastersPage,
     CubiclePage,
     AppointmentTypePage,
-    RolePage
+        RolePage,
+        CubiclePage,
+        CaseTypePage,
+        AppointmentTypePage,
+        ChargeManagementPage,
+        ChargeTypesPage,
+        ChargeCategoryPage,
+        ConsultationTypePage,
+        AssessmentTypePage,
+        ConsultationTypePage,
+        DepartmentPage,
+        // InsuranceCompanyPage,
+        RolePage,
+        SpecializationPage,
+        DiscountManagementPage,
+        DoctorAppointmentNotice,
+        DoctorUnitPage,
+        DynamicTemplatePage,
+        EncounterOrderMasterPage,
+        EncounterOrderTemplatesPage,
+        EncounterTypePage,
+        DietGuidLinesPage, 
+        DischargeInstructionsPage,
+        PatientImportPage,
+        PatientRegistrationChargePage,
+        PayCategoryPage,
+        PayTypePage,
+        ProviderScheduleChargesPage,
+        ProviderScheduleVisitsPage,
+        ReasonPage,
+        ReferenceTypePage
   ],
   imports: [
     MastersRoutingModule,
-    SharedModule
+      SharedModule,
   ]
 })
 export class MastersModule { }

Presentation/Hims.Admin/src/app/areas/admin/masters/masters.routing.module.ts

@@ -5,6 +5,32 @@ import { MastersPage } from './masters.page';
 import { AuthGuard } from '@src/app/shared/guards';
 import { AppointmentTypePage } from './pages/appointment-types/appointment-types.page';
 import { RolePage } from './pages/roles/roles.page';
+import { CaseTypePage } from './pages/case-type/case-type.page';
+import { ChargeManagementPage } from './pages/charge-management/charge-management.page';
+import { ChargeTypesPage } from './pages/charge-types/charge-types.page';
+import { ChargeCategoryPage } from './pages/charge-category/charge-category.page';
+//import { ConsultationTypePage } from './pages/consultation-type/consultation-type.page';
+import { AssessmentTypePage } from './pages/assessment-type/assessment-type.page';
+import { DepartmentPage } from './pages/departments/department.page';
+import { DietGuidLinesPage } from './pages/diet-guidlines/diet-guidlines.page';
+import { SpecializationPage } from './pages/specializations/specializations.page';
+import { DiscountManagementPage } from './pages/discount-management/discount-management.page';
+import { DoctorAppointmentNotice } from './pages/doctor-appointment-notice/doctor-appointment-notice.page';
+import { DoctorUnitPage } from './pages/doctor-unit/doctor-unit.page';
+import { DynamicTemplatePage } from './pages/dynamic-template/dynamic-template.page';
+import { EncounterOrderMasterPage } from './pages/encounter-order-master/encounter-order-master.page';
+import { EncounterOrderTemplatesPage } from './pages/encounter-order-templates/encounter-order-templates.page';
+import { EncounterTypePage } from './pages/encounter-type/encounter-type.page';
+import { DischargeInstructionsPage } from './pages/discharge-instructions/discharge-instructions.page';
+import { PatientImportPage } from './pages/patient-import/patient-import.page';
+import { PatientRegistrationChargePage } from './pages/patient-registration/patient-registration.page';
+import { PayCategoryPage } from './pages/pay-categories/pay-categories.page';
+import { PayTypePage } from './pages/pay-type/pay-type.page';
+import { ProviderScheduleChargesPage } from './pages/provider-schedule-charges/provider-schedule-charges.page';
+import { ProviderScheduleVisitsPage } from './pages/provider-schedule-visits/provider-schedule-visits.page';
+import { ReasonPage } from './pages/reasons/reasons.page';
+import { ReferenceTypePage } from './pages/reference-types/reference-types.page';
+
 
 const routes: Routes = [
   {
@@ -16,9 +42,34 @@ const routes: Routes = [
     children: [
         { path: "", redirectTo: "cubicle", pathMatch: "full" },
         { path: "cubicle", component: CubiclePage, data: { title: "cubicle" } },
+        { path: "case-type", component: CaseTypePage, data: { title: "Case-Type" } },
         { path: "appointment-types", component: AppointmentTypePage, data: { title: "Appointment Types" } },
+        { path: "charge-management", component: ChargeManagementPage, data: { title: "Charge Management" } },
+        { path: "charge-type", component: ChargeTypesPage, data: { title: "Charge Types" } },
+        { path: "charge-category", component: ChargeCategoryPage, data: { title: "Charge Category" } },
+        { path: "assessment-type", component: AssessmentTypePage, data: { title: "Assessment Management" } },
+        { path: "departments", component: DepartmentPage, data: { title: "Departments" } },
+        // { path: "insurances", component: InsuranceCompanyPage, data: { title: "Insurances" } },
         { path: "role", component: RolePage, data: { title: "Roles" } },
+        { path: "specializations", component: SpecializationPage, data: { title: "Specializations" } },
+        { path: "diet-guidlines", component: DietGuidLinesPage, data: { title: "Diet GuidLines" } },
+        { path: "discharge-instructions", component: DischargeInstructionsPage, data: { title: "Discharge Instructions" } },        
+        { path: "discount-management", component: DiscountManagementPage, data: { title: "Discount Management" } },
+        { path: "doctor-appointment-notice", component: DoctorAppointmentNotice, data: { title: "Doctor Appointment Notice" } },
+        { path: "doctor-unit", component: DoctorUnitPage, data: { title: "Doctor Unit" } },
+        { path: "dynamic-template", component: DynamicTemplatePage, data: { title: "Dynamic Template" } },
+        { path: "encounter-order-master", component: EncounterOrderMasterPage, data: { title: "Order Prescription Master" } },
+        { path: "encounter-type", component: EncounterTypePage, data: { title: "Encounter Type" } },
+        { path: "patient-import", component: PatientImportPage, data: { title: "Patient Import" } },
+        { path: "patient-registration", component: PatientRegistrationChargePage, data: { title: "Patient Registration Charge" } },
+        { path: "pay-categories", component: PayCategoryPage, data: { title: "Pay Categories" } },
+        { path: "pay-type", component: PayTypePage, data: { title: "PayTypes" } },
+        { path: "provider-schedule-charges", component: ProviderScheduleChargesPage, data: { title: "Doctor Charges" } },
+        { path: "Provider-schedule-visits", component: ProviderScheduleVisitsPage, data: { title: "Doctor Visits" } },
+        { path: "reason", component: ReasonPage, data: { title: "Reasons" } },
+        { path: "reference-types", component: ReferenceTypePage, data: { title: "ReferenceTypes" } },
         { path: "**", redirectTo: "cubicle" },
+    
     ]
   }
 ];

Presentation/Hims.Admin/src/app/areas/layout/layout.html

@@ -272,7 +272,7 @@
             <div class="clearfix"></div>
         </div>
     </div>
-    <div class="left-side-menu" [ngClass]="{ 'w-345': menuHolder.subMenus.length }">
+    <div class="left-side-menu" onmouseleave="sos()" [ngClass]="{ 'w-345': menuHolder.subMenus.length }">
         <div class="h-100">
             <div>
                 <div class="sidebar-icon-menu h-100">
@@ -312,7 +312,7 @@
         <ng-container *ngIf="menuHolder.subMenus.length">            
             <div (mouseenter)="dontLeave()"
                  id="submenu"
-                 (mouseleave)="leave();"
+                 (mouseleave)="leave();sos();"
                  class="layout-sidebar-main-menu d-block mt-1 saideNavMt"
                  style=" background-size: 200%; background-repeat: no-repeat; z-index: 10000; border-radius: 0 10px 10px 0; " [ngClass]="menuHolder.subMenus.length ? 'fade-in':'fade-out'">
                 <div id="two-col-menu" class="h-100">
@@ -326,7 +326,7 @@
                                     <ng-container *ngIf="menuType.SubMenu === menu.menuTypeId">
                                         <li class="nav-item w-100">
                                             <a class="text-color text-truncate dropdown-item position-relative"
-                                               (click)="leave();"
+                                               (click)="leave();sos();"
                                                [routerLink]="menu.url"
                                                [class.active]="activeRoute === menu.url"
                                                href="javascript:;">
@@ -353,7 +353,7 @@
                                                     <li class="nav-item"
                                                         *ngFor="let item of menu.categoryMenus">
                                                         <a class="text-color dropdown-item"
-                                                           (click)="leave();"
+                                                           (click)="leave();sos();"
                                                            [routerLink]="item.url"
                                                            [class.active]="activeRoute === item.url"
                                                            href="javascript:;">

Presentation/Hims.Admin/src/app/shared/entities/admission-transfer-request.entity.ts

@@ -4,11 +4,9 @@
     chargeCategoryName: string;
     unitName: string;
     createdByName: string;
-    rejectedByName: string;
     modifiedByName: string;
     modifiedDate: Date;
     createdDate: Date;
-    rejectedDate: Date;
     doctorUnitMasterId: number;
     admissionId: number;
     active: boolean;
@@ -19,4 +17,9 @@
     chargeCategories: string;
     charges: Array<string>;
     changeRequestType: string;
+    rejectedByName: string;
+    rejectedDate: Date;
+    totalItems: number;
+    pageIndex: number;
+    pageSize: number;
 }
\ No newline at end of file

Presentation/Hims.Admin/src/app/shared/entities/admission.entity.ts

@@ -106,11 +106,6 @@
     lunch: object;
     dinner: object;
     unitName: string;
-    isOnline: boolean;
-    isConvertedFromOPtoIp: boolean;
-    departmentName: string;
-    dischargeStatus: any;
-    internalMedicineId: any;
 }
 
 class MedicationContentViewModel {

Presentation/Hims.Admin/src/app/shared/entities/appointment-dashboard.entity.ts

@@ -25,5 +25,8 @@
     providerAvailabilityId: number;
     umrNo: string;
     encryptedPatientId: string;
+    roomName: string;
+    emergencyTriage: string;
 
+    admTime: string;
 }
\ No newline at end of file

Presentation/Hims.Admin/src/app/shared/entities/appointment.entity.ts

@@ -118,7 +118,7 @@ export class Appointment {
     minutes: number;
     queueEndDate: Date;
     queueStartDate: Date;
-    isAdmission: boolean;
+    isAdmission: Boolean;
     appointmentTypeId: number;
     isCc: boolean;
     isFullTranscript: boolean;
@@ -176,7 +176,15 @@ export class Appointment {
     isDraftCounselling: boolean;
     patAmount?: number;
     patDiscount?: number;
-    isHealthCard = false;
+    isHealthCard: boolean = false;
+    addressLine2: string;
+    sessionId: number;
+    providerEmail: string;
+    isEncounterClosed: boolean;
+    roomName: string;
+    admissionTime: string;
+    createdByName: string;
+    modifiedByName: string;
     constructor() {
         this.queue = new PatientQueue();
     }

Presentation/Hims.Admin/src/app/shared/entities/charge-category.entity.ts

@@ -20,7 +20,7 @@
 
     newAmount?: number;
     isNew?: boolean = null;
-    isIncluded = true;
+    isIncluded: boolean = true;
     chargeModuleDetailsId?: number;
     chargeModuleCategoryId?: number;
 }
\ No newline at end of file

Presentation/Hims.Admin/src/app/shared/entities/daily-sales-report.entity.ts

@@ -6,7 +6,7 @@
     categoryName: string;
     companyName: string;
     supplierName: string;
-    saleQuantity: number;
+    saleQuantity: number;;
     mrp: string;
     totalAmount: number;
     discount: string;

Presentation/Hims.Admin/src/app/shared/entities/doctor-revenue-reports.entity.ts

@@ -5,6 +5,7 @@
     appointmentAmount?: number;
     admissionAmount?: number;
     labAmount?: number;
+    scanAmount?: number;
     pharmacyAmount?: number;
     total: number;
     providerId: number;
@@ -70,6 +71,26 @@
     labCashRemoteDepositTotal: number;
     labWalletPaytmDQRTotal: number;
 
+    scanCash: number;
+    scanCard: number;
+    scanUPI: number;
+    scanOnline: number;
+    scanCheque: number;
+    scanPaytm: number;
+    scanNotPaidTotal: number;
+    scanOtherTotal: number;
+    scanCardSwipeTotal: number;
+    scanCardStandAloneTotal: number;
+    scanCardUPITotal: number;
+    scanCardGpayTotal: number;
+    scanCashDrawerTotal: number;
+    scanCashChequeTotal: number;
+    scanCashDDTotal: number;
+    scanWalletPaytmOfflineTotal: number;
+    scanWalletPhonePeOfflineTotal: number;
+    scanCashRemoteDepositTotal: number;
+    scanWalletPaytmDQRTotal: number;
+
     pharmacySaleCash: number;
     pharmacySaleCard: number;
     pharmacySaleUPI: number;

Presentation/Hims.Admin/src/app/shared/entities/employee-revenue-reports.entity.ts

@@ -5,6 +5,7 @@
     appointmentAmount?: number;
     admissionAmount?: number;
     labAmount?: number;
+    scanAmount?: number;
     pharmacyAmount?: number;
     total: number;
     paidVia: string;
@@ -30,9 +31,6 @@
     appointmentCashRemoteDepositTotal: number;
     appointmentWalletPaytmDQRTotal: number;
 
-
-
-
     admissionCashTotal: number;
     admissionCardTotal: number;
     admissionUPITotal: number;
@@ -73,6 +71,26 @@
     labCashRemoteDepositTotal: number;
     labWalletPaytmDQRTotal: number;
 
+    scanCash: number;
+    scanCard: number;
+    scanUPI: number;
+    scanOnline: number;
+    scanCheque: number;
+    scanPaytm: number;
+    scanNotPaidTotal: number;
+    scanOtherTotal: number;
+    scanCardSwipeTotal: number;
+    scanCardStandAloneTotal: number;
+    scanCardUPITotal: number;
+    scanCardGpayTotal: number;
+    scanCashDrawerTotal: number;
+    scanCashChequeTotal: number;
+    scanCashDDTotal: number;
+    scanWalletPaytmOfflineTotal: number;
+    scanWalletPhonePeOfflineTotal: number;
+    scanCashRemoteDepositTotal: number;
+    scanWalletPaytmDQRTotal: number;
+
     pharmacySaleCash: number;
     pharmacySaleCard: number;
     pharmacySaleUPI: number;
@@ -123,7 +141,7 @@
     registrationOtherTotal: number;
     registrationCardSwipeTotal: number;
     registrationCardStandAloneTotal: number;
-    registrationCardUPITotal : number;
+    registrationCardUPITotal: number;
     registrationCardGpayTotal: number;
     registrationCashDrawerTotal: number;
     registrationCashChequeTotal: number;

Presentation/Hims.Admin/src/app/shared/entities/encounter-value.entity.ts

@@ -4,7 +4,9 @@
     GynEncounter,
     PEncounter,
     EmergencyEncounter,
-    DietEncounter
+    DietEncounter,
+    PhysiotherapyEncounter,
+    GeneticSpecialityEncounter,
 
 }
 export class EncounterValue {

Presentation/Hims.Admin/src/app/shared/entities/health-card.entity.ts

@@ -14,7 +14,7 @@ export class HealthCard {
     patientName: string;
     mobile: string;
     validTill: Date;
-    isSelected = false;
+    isSelected: boolean = false;
     patientId: number;
     payTypeId: number;
     paymentNumber: string;

Presentation/Hims.Admin/src/app/shared/entities/lab-monthly-count.entity.ts

@@ -4,5 +4,18 @@ export class LabMonthlyCounts {
     testName: string;
     count: number;
     startDate: Date;
+    jan: number;
+    feb: number;
+    mar: number;
+    apr: number;
+    may: number;
+    jun: number;
+    jul: number;
+    aug: number;
+    sep: number;
+    oct: number;
+    nov: number;
+    dec: number;
+
 
 }
\ No newline at end of file

Presentation/Hims.Admin/src/app/shared/entities/lab-new-tat- report.entity.ts

 export class LabNewTATReport {
     testName: string;
     departmentName: string;
-    startDate: Date;
-    avgMinuts: Date; 
+    startDate: number;
+    avgMinuts: number;
+    labCount: number;
 }
\ No newline at end of file

Presentation/Hims.Admin/src/app/shared/entities/laboratory/boking-lab-header.entity.ts

@@ -37,7 +37,7 @@ export class BookingLabHeader {
 
     locationName: string;
     isSelected: boolean;
-    collectedFlag = true;
+    collectedFlag: boolean = true;
     barcodeGeneratedName: string;
     barcodeGeneratedDate: Date;
 

Presentation/Hims.Admin/src/app/shared/entities/laboratory/lab-in-package-booking.entity.ts

@@ -19,7 +19,7 @@ export class LabInPackageBooking {
     verifiedByName: string;
     labsParameters: Array<LabReportParameter>;
     barcode: string;
-    isSelected = false;
+    isSelected: boolean = false;
     collectedSampleReceivedBy: string;
     verifiedByDoctorName: string;
     sampleReceivedDate: Date;

Presentation/Hims.Admin/src/app/shared/entities/master-bill.entity.ts

@@ -42,5 +42,7 @@ export class MasterBillModel {
     receiptAreaTypeId: number;
     encryptedPatientId: string;
     modulesName: string;
+    removedAmount: number;
+    overallTotal: number;
 }
 

Presentation/Hims.Admin/src/app/shared/entities/module-master.entity.ts

@@ -12,6 +12,7 @@
     packageType: string;
     isChargeCategoryApplicable: boolean;
     isDoctorChargeCategoryApplicable: boolean;
+    isPackageApplicable: boolean;
     loginRoleId: number;
     locationId: number;
 }

Presentation/Hims.Admin/src/app/shared/entities/ob-encounter-full-transcript.entity.ts

-export class ObEncounterFullTranscript {
+
+export class ObEncounterFullTranscript {
     appointmentId: number;
     appointmentNo: string;
     patientId: number;
@@ -85,4 +86,8 @@
     outSideTests: string;
     birthHistory: string;
     surgeries: string;
+    reminder: string;
+    admTime: string;
+    roomName: string;
+    admissionDetails: string;
 }
\ No newline at end of file

Presentation/Hims.Admin/src/app/shared/entities/ot-register.entity.ts

@@ -32,4 +32,7 @@
     roomName: string;
     locationId: number;
     status: string;
+    createdDate: string;
+    startTime: string;
+    endTime: string;
 }
\ No newline at end of file

Presentation/Hims.Admin/src/app/shared/entities/otroom-booking.entity.ts

 export class OTRoomBooking {
+    otRegisterId?: number;
+    surgeryId?: number;
     providerLocationId: number;
     providerName: string;
     providerId: number;

Presentation/Hims.Admin/src/app/shared/entities/out-patient.entity.ts

@@ -64,5 +64,6 @@
     admissionNo?: string;
     admissionTime?: string;
     admissionDate?: string;
-    isHealthCard?: boolean=false;
+    isHealthCard?: boolean = false;
+    reminder: string;
 }
\ No newline at end of file

Presentation/Hims.Admin/src/app/shared/entities/patient-medication.entity.ts

@@ -20,6 +20,7 @@
     isMorning: boolean;
     isAfternoon: boolean;
     isNight: boolean;
+    remark: string;
 }
 
 
@@ -64,6 +65,7 @@ export class PatientMedicationHeader {
     stateName?: string;
     countryName?: string;
     specializationId?: number;
+    remark: string;
     constructor() {
         this.medicines = new Array<PatientMedicationDetail>();
         this.labs = new Array<any>();

Presentation/Hims.Admin/src/app/shared/entities/patient.entity.ts

@@ -81,7 +81,7 @@ export class Patient {
     paymentNumber: string;
     payTypeId: number;
     amount: number;
-
+    tempPatient: boolean;
     howDidYouKnowId?: number;
     educationId?: number;
     occupationId?: number;

Presentation/Hims.Admin/src/app/shared/entities/pediatric-encounter-full-transcript.entity.ts

@@ -58,5 +58,7 @@
     familyHistory: string;
     mChat: string;
     vaccineDetail: string;
+    reminder: string;
+    others: string;
 
 }
\ No newline at end of file

Presentation/Hims.Admin/src/app/shared/entities/pharmacy-purchase-bill.entity.ts

@@ -53,6 +53,7 @@
     returnDate: Date;
     returnNetamount: number;
     dueAmount: number;
+    locationName: string;
 
     purRateIncludeAll: number;
     purRateIncludeAllUnit: number;

Presentation/Hims.Admin/src/app/shared/entities/pharmacy-sale-bill.entity.ts

@@ -60,4 +60,5 @@
     locationId: number;
     paidAmount?: number;
     reasonForDiscount: string;
+    removedAmount: number;
 } 
\ No newline at end of file

Presentation/Hims.Admin/src/app/shared/entities/pharmacy/pharma-purchase-bill.entity.ts

@@ -16,6 +16,7 @@
      free: number;
      mrp: number;
      purchaseRate: number;
+     locationName: string;
 
      total: number;
      taxAmount: number;

Presentation/Hims.Admin/src/app/shared/entities/pharmacy/purchase-order-detail.entity.ts

@@ -42,4 +42,5 @@
     pharmacyPurchaseHeaderId: number | null;
     barcode: string;
     purchaseFree?: number;
+    inventoryItem: boolean;
 }
\ No newline at end of file

Presentation/Hims.Admin/src/app/shared/entities/pharmacy/purchase-order-header.entity.ts

@@ -33,6 +33,7 @@ export class PurchaseOrderHeader {
 
     supplier: any;
     poDetail: Array<PurchaseOrderDetail>;
+    totalBillCount?: number;
 
     constructor() { this.poDetail = new Array<PurchaseOrderDetail>(); }
 }
\ No newline at end of file

Presentation/Hims.Admin/src/app/shared/entities/provider-specialization.entity.ts

@@ -11,4 +11,5 @@
     providerAvailabilityId: number;
     consultationTypeId: number;
     providerSpecializationId: string;
+    doctorType: string;
 }
\ No newline at end of file

Presentation/Hims.Admin/src/app/shared/entities/receipt-reports.entity.ts

@@ -6,7 +6,6 @@
     admissionNo: string;
     providerName: string;
     patientName: string;
-    payTypeName: string;
     paidAmount: number;
     refundAmount: number;
     balanceAmount: number;
@@ -31,4 +30,13 @@
     receipt: string;
     isHealthCard?: boolean = false;
     refId?: string;
+    payTypeName: string;
+}
+
+export class BillDailyReport {
+    payTypeName: string;
+    payTypeCount: number;
+    payTypeAmount: number;
+    visitorName: string;
+    visitTypeCount: number;
 }
\ No newline at end of file

Presentation/Hims.Admin/src/app/shared/entities/scan-booking.entity.ts

@@ -50,6 +50,7 @@
     chargeCategoryName: string;
     amount: number;
     discountAmount: number;
+    amt: number;
     paymentStatus: boolean;
     pndtReport: boolean;
     isDispatched: boolean;
@@ -82,7 +83,13 @@
     tokenNumber?: number;
     isPatRegPaid: boolean;
     regCharges: number;
+    scanAmount: number;
+    totalDiscount: number;
+    netAmount: number;
     paidAmount: number;
+    paidAmt: number;
+    paidScanAmount: number;
+    refundAmount: number;
 }
 
 export class PatientFutureAppointment {

Presentation/Hims.Admin/src/app/shared/entities/timeline.entity.ts

@@ -12,4 +12,10 @@
     timelineDataId: number;
     viewLoading: boolean;
     totalItems: number;
+    providerName: string;
+    specializationName: string;
+    visitorName: string;
+    documentName: string;
+    documentType: string;
+    appointmentDate: Date;
 }
\ No newline at end of file

Presentation/Hims.Admin/src/app/shared/validators/index.ts

@@ -4,7 +4,7 @@ export * from "./password.validator";
 export * from "./mobile.validator";
 export * from "./npi.validator";
 export * from "./zipcode.validator";
-export * from "./uniq-email.validator";
+export * from "./uniq-email.Validator";
 export * from "./uniq-mobile.validator";
 export * from "./uniq-npi.validator";
 export * from "./age.validator";