diff --git a/IRaCIS.Core.Application/Service/Common/DTO/FileUploadRecordViewModel.cs b/IRaCIS.Core.Application/Service/Common/DTO/FileUploadRecordViewModel.cs
index c25cea6e2..0bb0a6af7 100644
--- a/IRaCIS.Core.Application/Service/Common/DTO/FileUploadRecordViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Common/DTO/FileUploadRecordViewModel.cs
@@ -116,6 +116,7 @@ public class SubjectFileUploadRecordQuery : PageInput
 
 public class FileUploadRecordQuery : PageInput
 {
+
     public BatchDataType? BatchDataType { get; set; }
 
     public Guid? TrialId { get; set; }
diff --git a/IRaCIS.Core.Application/Service/Common/FileUploadRecordService.cs b/IRaCIS.Core.Application/Service/Common/FileUploadRecordService.cs
index e6dfeee43..3ed43a408 100644
--- a/IRaCIS.Core.Application/Service/Common/FileUploadRecordService.cs
+++ b/IRaCIS.Core.Application/Service/Common/FileUploadRecordService.cs
@@ -88,7 +88,6 @@ public class FileUploadRecordService(IRepository<FileUploadRecord> _fileUploadRe
     {
 
         var fileUploadRecordQueryable = _fileUploadRecordRepository
-               .WhereIf(inQuery.BatchDataType != null, t => t.BatchDataType == inQuery.BatchDataType)
                .WhereIf(!string.IsNullOrEmpty(inQuery.FileName), t => t.FileName.Contains(inQuery.FileName))
                .WhereIf(!string.IsNullOrEmpty(inQuery.FileType), t => t.FileType.Contains(inQuery.FileType))
                .WhereIf(inQuery.TrialId != null, t => t.TrialId == inQuery.TrialId)
@@ -100,7 +99,7 @@ public class FileUploadRecordService(IRepository<FileUploadRecord> _fileUploadRe
                 .WhereIf(!string.IsNullOrEmpty(inQuery.SubjectCode), t => t.Subject.Code.Contains(inQuery.SubjectCode))
 
                .WhereIf(inQuery.DataFileType == 1 && inQuery.SubjectId != null && inQuery.SubjectVisitId == null, t => t.SubjectVisitId == null)
-               .WhereIf(inQuery.DataFileType == 1 && inQuery.SubjectVisitId != null && inQuery.StudyCode.IsNullOrEmpty(), t => t.StudyCode == "")
+               .WhereIf(inQuery.DataFileType == 1 && inQuery.SubjectVisitId != null && inQuery.StudyCode == "", t => t.StudyCode == "")
 
                .WhereIf(inQuery.DataFileType == 0, t => t.TrialId == null)
                .WhereIf(inQuery.DataFileType == 1, t => t.SubjectId != null)
@@ -137,7 +136,7 @@ public class FileUploadRecordService(IRepository<FileUploadRecord> _fileUploadRe
     {
 
         var fileUploadRecordQueryable = _uploadFileSyncRecordRepository
-
+               .WhereIf(inQuery.JobState != null, t => t.JobState == inQuery.JobState)
                .WhereIf(inQuery.FileUploadRecordId != null, t => t.FileUploadRecordId == inQuery.FileUploadRecordId)
                 .WhereIf(!string.IsNullOrEmpty(inQuery.StudyCode), t => t.FileUploadRecord.StudyCode.Contains(inQuery.StudyCode))
                 .WhereIf(!string.IsNullOrEmpty(inQuery.VisitName), t => t.FileUploadRecord.SubjectVisit.VisitName.Contains(inQuery.VisitName))