diff --git a/IRaCIS.Core.Application/Helper/ExcelExportHelper.cs b/IRaCIS.Core.Application/Helper/ExcelExportHelper.cs
index bc14bf6a8..069eb3b3f 100644
--- a/IRaCIS.Core.Application/Helper/ExcelExportHelper.cs
+++ b/IRaCIS.Core.Application/Helper/ExcelExportHelper.cs
@@ -181,7 +181,7 @@ public static class ExcelExportHelper
 
         return new FileStreamResult(memoryStream, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
         {
-            FileDownloadName = $"{exportFileNamePrefix}_{fileName}_{DateTime.Now.ToString("yyyyMMddHHmmss")}.xlsx"
+            FileDownloadName = $"{(string.IsNullOrEmpty(exportFileNamePrefix) ? "" : exportFileNamePrefix+ "_") }{Path.GetFileNameWithoutExtension(fileName)  }_{DateTime.Now.ToString("yyyyMMddHHmmss")}.xlsx"
         };
 
         #endregion
diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
index 8bdde16f8..934262818 100644
--- a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
@@ -430,9 +430,6 @@ namespace IRaCIS.Application.Services
         //    data.IsComplete = inDto.IsComplete;
         //    data.IsSign = true;
         //    data.ReadingClinicalDataState = ReadingClinicalDataStatus.HaveSigned;
-
-
-
         //    var result = await _readingClinicalDataRepository.SaveChangesAsync();