diff --git a/Back/Back.csproj b/Back/Back.csproj
index 899d7e4..fd97cd7 100644
--- a/Back/Back.csproj
+++ b/Back/Back.csproj
@@ -36,7 +36,7 @@
 
   <ItemGroup>
     <Reference Include="Service">
-      <HintPath>..\..\..\LocalGit\TaxPayerTools\Service\bin\Debug\Service.dll</HintPath>
+      <HintPath>..\..\Dlls\Service.dll</HintPath>
     </Reference>
   </ItemGroup>
 
diff --git a/Back/Services/servUser.cs b/Back/Services/servUser.cs
index 28013aa..e3725d0 100644
--- a/Back/Services/servUser.cs
+++ b/Back/Services/servUser.cs
@@ -206,8 +206,8 @@ namespace Back.Services
                     CalTypeID = item.CalculationTypeID,
                     CalTypeTitle = item.CalculationType.Title,
                     Total = item.CalculationTypeID == 1 ? item.TotalAmount.ToString() : "",
-                    Remaining = item.CalculationTypeID == 1 ? item.RemainingAmount.ToString()
-                    : item.CalculationTypeID == 2 ? "" : item.RemainingAmount.ToString().ShamciToFormatShamci()
+                    Remaining = item.CalculationTypeID == 1 ? item.RemainingAmount
+                    : item.CalculationTypeID == 2 ? 0 : item.RemainingAmount
                 });
             }
             request.LastLoginDate = _RepoUser.Get(w => w.ID == UserID).Select(s => s.DateLastLogin).FirstOrDefault();
diff --git a/Shared/DTOs/DashBoardDTO.cs b/Shared/DTOs/DashBoardDTO.cs
index 2e5432c..e6661ca 100644
--- a/Shared/DTOs/DashBoardDTO.cs
+++ b/Shared/DTOs/DashBoardDTO.cs
@@ -24,6 +24,6 @@ namespace Shared.DTOs
         public int CalTypeID { get; set; }
         public string CalTypeTitle { get; set; }
         public string Total { get; set; }
-        public string Remaining { get; set; }
+        public int Remaining { get; set; }
     }
 }
diff --git a/TaxPayerFull/Pages/UserPanel/Panel.razor b/TaxPayerFull/Pages/UserPanel/Panel.razor
index c53ba01..2bebea0 100644
--- a/TaxPayerFull/Pages/UserPanel/Panel.razor
+++ b/TaxPayerFull/Pages/UserPanel/Panel.razor
@@ -1,5 +1,6 @@
 @page "/Panel"
 @using Front.Services
+@using Shared
 @using Shared.DTOs
 @inject localService localserv;
 @inject NavigationManager nav
@@ -52,7 +53,7 @@
                             <h3 class="card-title mb-1"><span style="font-size: 14px">مانده</span></h3>
                             @if (dashBoard.AlistofServices.Any(w => w.PermissionID == 3 && w.CalTypeID == 1))
                             {
-                                @if (!dashBoard.AlistofServices.Where(w => w.PermissionID == 3 && w.CalTypeID == 1).Select(s => s.Remaining).First().Equals("-"))
+                                @if (dashBoard.AlistofServices.Where(w => w.PermissionID == 3 && w.CalTypeID == 1).Select(s => s.Remaining).First()>0)
                                 {
 
                                     <small class="text-success fw-semibold">
@@ -79,18 +80,18 @@
                             }
                             else
                             {
-                                @if (Convert.ToInt32(dashBoard.Datenow) <= Convert.ToInt32(@dashBoard.AlistofServices.Where(w => w.PermissionID == 3 && w.CalTypeID == 1).Select(s => s.Remaining).First().Replace("/","")))
+                                @if (Convert.ToInt32(dashBoard.Datenow) <= dashBoard.AlistofServices.Where(w => w.PermissionID == 3 && w.CalTypeID == 1).Select(s => s.Remaining).First())
                                 {
                                     <small class="text-success fw-semibold">
                                         <i class='bx'></i>
-                                        تا تاریخ  @dashBoard.AlistofServices.Where(w => w.PermissionID == 3 && w.CalTypeID == 1).Select(s => s.Remaining).First()
+                                        تا تاریخ  @dashBoard.AlistofServices.Where(w => w.PermissionID == 3 && w.CalTypeID == 1).Select(s => s.Remaining).First().ToString().ShamciToFormatShamciinFront()
                                     </small>
                                 }
                               else
                                 {
                                     <small class="text-danger fw-semibold">
                                         <i class='bx'></i>
-                                        تا تاریخ  @dashBoard.AlistofServices.Where(w => w.PermissionID == 3 && w.CalTypeID == 1).Select(s => s.Remaining).First()
+                                        تا تاریخ  @dashBoard.AlistofServices.Where(w => w.PermissionID == 3 && w.CalTypeID == 1).Select(s => s.Remaining).First().ToString().ShamciToFormatShamciinFront()
                                     </small>
                                 }
                             }
@@ -121,7 +122,7 @@
                             <h3 class="card-title mb-1"><span style="font-size: 14px">مانده</span></h3>
                             @if (dashBoard.AlistofServices.Any(w => w.PermissionID == 4 && w.CalTypeID == 1))
                             {
-                                @if (!dashBoard.AlistofServices.Where(w => w.PermissionID == 4 && w.CalTypeID == 1).Select(s => s.Remaining).First().Equals("-"))
+                                @if (dashBoard.AlistofServices.Where(w => w.PermissionID == 4 && w.CalTypeID == 1).Select(s => s.Remaining).First()>0)
                                 {
                                     <small class="text-success fw-semibold">
                                         <i class='bx'></i>
@@ -147,18 +148,18 @@
                             }
                             else
                             {
-                                @if (Convert.ToInt32(dashBoard.Datenow) <= Convert.ToInt32(@dashBoard.AlistofServices.Where(w => w.PermissionID == 4 && w.CalTypeID == 1).Select(s => s.Remaining).First().Replace("/", "")))
+                                @if (Convert.ToInt32(dashBoard.Datenow) <= dashBoard.AlistofServices.Where(w => w.PermissionID == 4 && w.CalTypeID == 1).Select(s => s.Remaining).First())
                                 {
                                     <small class="text-success fw-semibold">
                                         <i class='bx'></i>
-                                        تا تاریخ  @dashBoard.AlistofServices.Where(w => w.PermissionID == 4 && w.CalTypeID == 1).Select(s => s.Remaining).First()
+                                        تا تاریخ  @dashBoard.AlistofServices.Where(w => w.PermissionID == 4 && w.CalTypeID == 1).Select(s => s.Remaining).First().ToString().ShamciToFormatShamciinFront()
                                     </small>
                                 }
                                 else
                                 {
                                     <small class="text-danger fw-semibold">
                                         <i class='bx'></i>
-                                        تا تاریخ  @dashBoard.AlistofServices.Where(w => w.PermissionID == 4 && w.CalTypeID == 1).Select(s => s.Remaining).First()
+                                        تا تاریخ  @dashBoard.AlistofServices.Where(w => w.PermissionID == 4 && w.CalTypeID == 1).Select(s => s.Remaining).First().ToString().ShamciToFormatShamciinFront()
                                     </small>
                                 }
                             }
@@ -244,7 +245,7 @@
                             <h3 class="card-title mb-1"><span style="font-size: 14px">مانده</span></h3>
                             @if (dashBoard.AlistofServices.Any(w => w.PermissionID == 5 && w.CalTypeID == 1))
                             {
-                                @if (!dashBoard.AlistofServices.Where(w => w.PermissionID == 5 && w.CalTypeID == 1).Select(s => s.Remaining).First().Equals("-"))
+                                @if (dashBoard.AlistofServices.Where(w => w.PermissionID == 5 && w.CalTypeID == 1).Select(s => s.Remaining).First()>0)
                                 {
 
                                     <small class="text-success fw-semibold">
@@ -271,18 +272,18 @@
                             }
                             else
                             {
-                                @if (Convert.ToInt32(dashBoard.Datenow) <= Convert.ToInt32(@dashBoard.AlistofServices.Where(w => w.PermissionID == 5 && w.CalTypeID == 1).Select(s => s.Remaining).First().Replace("/", "")))
+                                @if (Convert.ToInt32(dashBoard.Datenow) <= dashBoard.AlistofServices.Where(w => w.PermissionID == 5 && w.CalTypeID == 1).Select(s => s.Remaining).First())
                                 {
                                     <small class="text-success fw-semibold">
                                         <i class='bx'></i>
-                                        تا تاریخ  @dashBoard.AlistofServices.Where(w => w.PermissionID == 5 && w.CalTypeID == 1).Select(s => s.Remaining).First()
+                                        تا تاریخ  @dashBoard.AlistofServices.Where(w => w.PermissionID == 5 && w.CalTypeID == 1).Select(s => s.Remaining).First().ToString().ShamciToFormatShamciinFront()
                                     </small>
                                 }
                                 else
                                 {
                                     <small class="text-danger fw-semibold">
                                         <i class='bx'></i>
-                                        تا تاریخ  @dashBoard.AlistofServices.Where(w => w.PermissionID == 5 && w.CalTypeID == 1).Select(s => s.Remaining).First()
+                                        تا تاریخ  @dashBoard.AlistofServices.Where(w => w.PermissionID == 5 && w.CalTypeID == 1).Select(s => s.Remaining).First().ToString().ShamciToFormatShamciinFront()
                                     </small>
                                 }
                             }
@@ -313,7 +314,7 @@
                             <h3 class="card-title mb-1"><span style="font-size: 14px">مانده</span></h3>
                             @if (dashBoard.AlistofServices.Any(w => w.PermissionID == 16 && w.CalTypeID == 1))
                             {
-                                @if (!dashBoard.AlistofServices.Where(w => w.PermissionID == 16 && w.CalTypeID == 1).Select(s => s.Remaining).First().Equals("-"))
+                                @if (dashBoard.AlistofServices.Where(w => w.PermissionID == 16 && w.CalTypeID == 1).Select(s => s.Remaining).First()>0)
                                 {
                                     <small class="text-success fw-semibold">
                                         <i class='bx'></i>
@@ -339,18 +340,18 @@
                             }
                             else
                             {
-                                @if (Convert.ToInt32(dashBoard.Datenow) <= Convert.ToInt32(@dashBoard.AlistofServices.Where(w => w.PermissionID == 16 && w.CalTypeID == 1).Select(s => s.Remaining).First().Replace("/", "")))
+                                @if (Convert.ToInt32(dashBoard.Datenow) <= dashBoard.AlistofServices.Where(w => w.PermissionID == 16 && w.CalTypeID == 1).Select(s => s.Remaining).First())
                                 {
                                     <small class="text-success fw-semibold">
                                         <i class='bx'></i>
-                                        تا تاریخ  @dashBoard.AlistofServices.Where(w => w.PermissionID == 16 && w.CalTypeID == 1).Select(s => s.Remaining).First()
+                                        تا تاریخ  @dashBoard.AlistofServices.Where(w => w.PermissionID == 16 && w.CalTypeID == 1).Select(s => s.Remaining).First().ToString().ShamciToFormatShamciinFront()
                                     </small>
                                 }
                                 else
                                 {
                                     <small class="text-danger fw-semibold">
                                         <i class='bx'></i>
-                                        تا تاریخ  @dashBoard.AlistofServices.Where(w => w.PermissionID == 16 && w.CalTypeID == 1).Select(s => s.Remaining).First()
+                                        تا تاریخ  @dashBoard.AlistofServices.Where(w => w.PermissionID == 16 && w.CalTypeID == 1).Select(s => s.Remaining).First().ToString().ShamciToFormatShamciinFront()
                                     </small>
                                 }
                             }
diff --git a/TaxPayerFull/Program.cs b/TaxPayerFull/Program.cs
index f8805c2..628e6c3 100644
--- a/TaxPayerFull/Program.cs
+++ b/TaxPayerFull/Program.cs
@@ -34,9 +34,9 @@ builder.Services.AddScoped(sp => new UserAuthenticationDTO()
 }) ;
 
 
-//builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri("https://localhost:7075/api/") });
+builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri("https://localhost:7075/api/") });
 
-builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri("http://localhost:5271/api/") });
+//builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri("http://localhost:5271/api/") });
 
 CultureInfo.DefaultThreadCurrentCulture = new CultureInfo("fa-Ir");