增加StudyCode

2026-04-02 17:07:46 +08:00
parent 9a276e3d3c
commit 81280a3fed
9 changed files with 22079 additions and 0 deletions
@@ -42,6 +42,7 @@ public class FileUploadRecordAddOrEdit
    public string UploadBatchId { get; set; }
    public BatchDataType BatchDataType { get; set; }

+    public string StudyCode { get; set; }

    public Guid? TrialId { get; set; }

@@ -72,6 +73,8 @@ public class FileUploadRecordQuery : PageInput

    public bool? IsSystermFile { get; set; }

+    public string StudyCode { get; set; }
+

    public string? FileMarkId { get; set; }

@@ -29,6 +29,10 @@ public class FileUploadRecordService(IRepository<FileUploadRecord> _fileUploadRe

    ObjectStoreServiceOptions ObjectStoreServiceConfig = options.CurrentValue;

+
+
+
+
    /// <summary>
    /// 上传记录表--里面包含待同步任务
    /// </summary>
@@ -42,6 +46,7 @@ public class FileUploadRecordService(IRepository<FileUploadRecord> _fileUploadRe
               .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(!string.IsNullOrEmpty(inQuery.StudyCode), t => t.StudyCode.Contains(inQuery.StudyCode))
               .WhereIf(inQuery.TrialId != null, t => t.TrialId == inQuery.TrialId)
                .WhereIf(inQuery.IsSystermFile == true, t => t.TrialId == null)
               .WhereIf(inQuery.IsSync != null, t => t.IsSync == inQuery.IsSync)
@@ -265,6 +265,11 @@ namespace IRaCIS.Core.Application.Contracts
        [NotDefault]
        public Guid StudyMonitorId { get; set; }

+        [NotDefault]
+        public string UploadBatchId { get; set; }
+
+
+
        public int FailedFileCount { get; set; }

        public string RecordPath { get; set; } = string.Empty;
@@ -289,6 +294,10 @@ namespace IRaCIS.Core.Application.Contracts
        [NotDefault]
        public Guid StudyMonitorId { get; set; }

+        [NotDefault]
+        public string UploadBatchId { get; set; }
+
+
        public int FailedFileCount { get; set; }

        public string RecordPath { get; set; } = string.Empty;
@@ -41,6 +41,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
        IRepository<VisitTask> _visitTaskRepository,
        IRepository<SubjectVisit> _subjectVisitRepository,
        IOSSService _oSSService,
+        IRepository<FileUploadRecord> _fileUploadRecordRepository,
        IRepository<Dictionary> _dictionaryRepository,
        IRepository<Trial> _trialRepository,
        IRepository<StudyMonitor> _studyMonitorRepository,
@@ -803,6 +804,8 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                {
                    await _taskStudyRepository.SaveChangesAsync();
                }
+
+                await _fileUploadRecordRepository.BatchUpdateNoTrackingAsync(t => t.UploadBatchId == incommand.UploadBatchId, u => new FileUploadRecord() { StudyCode = findStudy.StudyCode });
            }
            catch (Exception ex)
            {
@@ -20,6 +20,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
        IRepository<Trial> _trialRepository,
        IRepository<VisitTask> _visitTaskRepository,
        IRepository<SCPStudy> _scpStudyRepository,
+        IRepository<FileUploadRecord> _fileUploadRecordRepository,
        IRepository<Subject> _subjectRepository,
        IRepository<StudyMonitor> _studyMonitorRepository,
        IRepository<SystemAnonymization> _systemAnonymizationRepository,
@@ -332,6 +333,8 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                {
                    await _dicomInstanceRepository.SaveChangesAsync();
                }
+
+              await  _fileUploadRecordRepository.BatchUpdateNoTrackingAsync(t => t.UploadBatchId == incommand.UploadBatchId, u => new FileUploadRecord() { StudyCode = findStudy.StudyCode });
            }
            catch (Exception ex)
            {