Compare commits

..

No commits in common. "50f2a6a8b02a70b9703c7fc176a7c3007d77b1e8" and "626de2e44a365a6f568ab29759465e729fb108c5" have entirely different histories.

9 changed files with 0 additions and 22079 deletions

View File

@ -42,7 +42,6 @@ public class FileUploadRecordAddOrEdit
public string UploadBatchId { get; set; }
public BatchDataType BatchDataType { get; set; }
public string StudyCode { get; set; }
public Guid? TrialId { get; set; }
@ -73,8 +72,6 @@ public class FileUploadRecordQuery : PageInput
public bool? IsSystermFile { get; set; }
public string StudyCode { get; set; }
public string? FileMarkId { get; set; }

View File

@ -29,10 +29,6 @@ public class FileUploadRecordService(IRepository<FileUploadRecord> _fileUploadRe
ObjectStoreServiceOptions ObjectStoreServiceConfig = options.CurrentValue;
/// <summary>
/// 上传记录表--里面包含待同步任务
/// </summary>
@ -46,7 +42,6 @@ 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)

View File

@ -265,11 +265,6 @@ 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;
@ -294,10 +289,6 @@ 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;

View File

@ -41,7 +41,6 @@ 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,
@ -804,8 +803,6 @@ 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)
{

View File

@ -20,7 +20,6 @@ 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,
@ -333,8 +332,6 @@ 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)
{

View File

@ -27,8 +27,6 @@ public class FileUploadRecord : BaseFullAuditEntity
public Guid? NoneDicomStudyId { get; set; }
public string StudyCode { get; set; }
[Comment("文件标识ID")]
public string FileMarkId { get; set; }

File diff suppressed because it is too large Load Diff

View File

@ -1,30 +0,0 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace IRaCIS.Core.Infra.EFCore.Migrations
{
/// <inheritdoc />
public partial class addStudyCode : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<string>(
name: "StudyCode",
table: "FileUploadRecord",
type: "nvarchar(400)",
maxLength: 400,
nullable: false,
defaultValue: "");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "StudyCode",
table: "FileUploadRecord");
}
}
}

View File

@ -3163,11 +3163,6 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
.HasColumnType("int")
.HasComment("同步优先级");
b.Property<string>("StudyCode")
.IsRequired()
.HasMaxLength(400)
.HasColumnType("nvarchar(400)");
b.Property<Guid?>("SubjectId")
.HasColumnType("uniqueidentifier");