中心调研增加上传文件
parent
826aff3d36
commit
e1ee129f41
|
|
@ -1578,6 +1578,13 @@
|
|||
<param name="_attachmentrepository"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:IRaCIS.Core.Application.Service.FileUploadRecordService.AddOrUpdateCommonUploadRecord(IRaCIS.Core.Application.ViewModel.CommonUploadRecordAddOrEdit)">
|
||||
<summary>
|
||||
上传通用文件记录
|
||||
</summary>
|
||||
<param name="addOrEditCommonUploadRecord"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:IRaCIS.Core.Application.Service.FileUploadRecordService.GetSubjectUploadRecordList(IRaCIS.Core.Application.ViewModel.SubjectFileUploadRecordQuery)">
|
||||
<summary>
|
||||
按照 subject visit studyCode 三个维度进行分组的查询列表 (subject相关)
|
||||
|
|
@ -17523,17 +17530,17 @@
|
|||
</member>
|
||||
<member name="F:IRaCIS.Core.Application.ViewModel.AccessToDialogueEnum.Question">
|
||||
<summary>
|
||||
<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
质疑
|
||||
</summary>
|
||||
</member>
|
||||
<member name="F:IRaCIS.Core.Application.ViewModel.AccessToDialogueEnum.Consistency">
|
||||
<summary>
|
||||
һ<EFBFBD><EFBFBD><EFBFBD>Ժ˲<EFBFBD>
|
||||
一致性核查
|
||||
</summary>
|
||||
</member>
|
||||
<member name="T:IRaCIS.Core.Application.ViewModel.CopyFrontAuditConfigItemDto">
|
||||
<summary>
|
||||
<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
复制
|
||||
</summary>
|
||||
</member>
|
||||
<member name="T:IRaCIS.Core.Application.ViewModel.SystemNoticeView">
|
||||
|
|
@ -21905,11 +21912,6 @@
|
|||
读片数量分类统计
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:IRaCIS.Application.Contracts.TrialExtraConfig.IsOpenLostVistRead">
|
||||
<summary>
|
||||
打开失访可读
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:IRaCIS.Application.Contracts.TrialConfigInfo.IsImageQualityControl">
|
||||
<summary>
|
||||
影像质控风险控制
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@
|
|||
// 生成时间 2026-03-10 06:15:31Z
|
||||
// 对此文件的更改可能会导致不正确的行为,并且如果重新生成代码,这些更改将会丢失。
|
||||
//--------------------------------------------------------------------
|
||||
using System;
|
||||
using IRaCIS.Core.Domain.Share;
|
||||
using System.Collections.Generic;
|
||||
namespace IRaCIS.Core.Application.ViewModel;
|
||||
|
|
@ -96,7 +95,22 @@ public class FileUploadRecordAddOrEdit
|
|||
public bool? IsSync { get; set; }
|
||||
}
|
||||
|
||||
public class CommonUploadRecordDto: CommonUploadRecordAddOrEdit
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public class CommonUploadRecordAddOrEdit
|
||||
{
|
||||
public Guid? Id { get; set; }
|
||||
public string FileType { get; set; }
|
||||
|
||||
public string FileName { get; set; }
|
||||
|
||||
public long FileSize { get; set; }
|
||||
|
||||
public string Path { get; set; }
|
||||
}
|
||||
public class SubjectFileUploadRecordQuery : PageInput
|
||||
{
|
||||
public Guid TrialId { get; set; }
|
||||
|
|
|
|||
|
|
@ -24,11 +24,26 @@ namespace IRaCIS.Core.Application.Service;
|
|||
[ApiExplorerSettings(GroupName = "Common")]
|
||||
public class FileUploadRecordService(IRepository<FileUploadRecord> _fileUploadRecordRepository, IRepository<UploadFileSyncRecord> _uploadFileSyncRecordRepository,
|
||||
IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer, IOptionsMonitor<ObjectStoreServiceOptions> options,
|
||||
IRepository<CommonUploadRecord> _commonUploadRecordRepository,
|
||||
IFusionCache _fusionCache, IRepository<Trial> _trialRepository, FileSyncQueue _fileSyncQueue) : BaseService, IFileUploadRecordService
|
||||
{
|
||||
|
||||
ObjectStoreServiceOptions ObjectStoreServiceConfig = options.CurrentValue;
|
||||
|
||||
/// <summary>
|
||||
/// 上传通用文件记录
|
||||
/// </summary>
|
||||
/// <param name="addOrEditCommonUploadRecord"></param>
|
||||
/// <returns></returns>
|
||||
public async Task<IResponseOutput> AddOrUpdateCommonUploadRecord(CommonUploadRecordAddOrEdit addOrEditCommonUploadRecord)
|
||||
{
|
||||
|
||||
var entity = await _commonUploadRecordRepository.InsertOrUpdateAsync(addOrEditCommonUploadRecord, true);
|
||||
|
||||
return ResponseOutput.Ok(entity.Id.ToString());
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -222,7 +237,7 @@ public class FileUploadRecordService(IRepository<FileUploadRecord> _fileUploadRe
|
|||
{
|
||||
addOrEditFileUploadRecord.IsNeedSync = true;
|
||||
|
||||
addOrEditFileUploadRecord.Priority = addOrEditFileUploadRecord.Priority?? 0;
|
||||
addOrEditFileUploadRecord.Priority = addOrEditFileUploadRecord.Priority ?? 0;
|
||||
|
||||
addOrEditFileUploadRecord.IsSync = false;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -131,6 +131,11 @@ namespace IRaCIS.Core.Application.Service
|
|||
CreateMap<FileUploadRecord, FileUploadRecordAddOrEdit>().ReverseMap();
|
||||
|
||||
|
||||
CreateMap<CommonUploadRecordAddOrEdit, CommonUploadRecord>().ReverseMap();
|
||||
|
||||
CreateMap<CommonUploadRecord, CommonUploadRecordDto>();
|
||||
|
||||
|
||||
CreateMap<UploadFileSyncRecord, UploadFileSyncRecordView>()
|
||||
.ForMember(d => d.FileName, u => u.MapFrom(s => s.FileUploadRecord.FileName))
|
||||
.ForMember(d => d.FileType, u => u.MapFrom(s => s.FileUploadRecord.FileType))
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
//--------------------------------------------------------------------
|
||||
|
||||
using IRaCIS.Application.Contracts;
|
||||
using IRaCIS.Core.Application.ViewModel;
|
||||
using IRaCIS.Core.Domain.Share;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
namespace IRaCIS.Core.Application.Contracts
|
||||
|
|
@ -162,7 +163,7 @@ namespace IRaCIS.Core.Application.Contracts
|
|||
public DateTime? ReviewerTime { get; set; }
|
||||
|
||||
|
||||
|
||||
public CommonUploadRecordDto SiteSurveyFile { get; set; }
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -360,7 +361,7 @@ namespace IRaCIS.Core.Application.Contracts
|
|||
[Comment("不严格按照影像手册参数完成刻盘原因")]
|
||||
public string NotStrictManualBurnFlagReason { get; set; }
|
||||
|
||||
|
||||
public Guid? CommonUploadRecordId { get; set; }
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -46,6 +46,7 @@ namespace IRaCIS.Core.Application.AutoMapper
|
|||
CreateMap<TrialSiteSurvey, TrialSiteSurveyView>()
|
||||
.ForMember(d => d.TrialSiteAliasName, u => u.MapFrom(s => s.TrialSite.TrialSiteAliasName))
|
||||
.ForMember(d => d.SiteName, u => u.MapFrom(s => s.TrialSite.TrialSiteName))
|
||||
.ForMember(d => d.SiteSurveyFile, u => u.MapFrom(s => s.SiteSurveyFile))
|
||||
.ForMember(d => d.TrialSiteCode, u => u.MapFrom(s => s.TrialSite.TrialSiteCode));
|
||||
|
||||
CreateMap<TrialSiteSurvey, TrialSiteSurveySelectView>();
|
||||
|
|
|
|||
|
|
@ -118,18 +118,31 @@ public enum BatchDataType
|
|||
//后端自定义100开始
|
||||
|
||||
|
||||
DataReconciliation=100,
|
||||
DataReconciliation = 100,
|
||||
|
||||
SiteUserSurvey=101,
|
||||
SiteUserSurvey = 101,
|
||||
|
||||
DICOMDIR = 102,
|
||||
|
||||
EmailAttach=103,
|
||||
EmailAttach = 103,
|
||||
|
||||
ReadingImportTemplete=105,
|
||||
ReadingImportTemplete = 105,
|
||||
|
||||
ReadingKeyFile=106,
|
||||
ReadingKeyFile = 106,
|
||||
|
||||
PACSReceive = 107
|
||||
|
||||
}
|
||||
|
||||
public class CommonUploadRecord : BaseAddAuditEntity
|
||||
{
|
||||
[Comment("文件类型")]
|
||||
public string FileType { get; set; }
|
||||
|
||||
public string FileName { get; set; }
|
||||
|
||||
public long FileSize { get; set; }
|
||||
|
||||
[StringLength(1000)]
|
||||
public string Path { get; set; }
|
||||
}
|
||||
|
|
@ -20,6 +20,9 @@ public class TrialSiteSurvey : BaseFullDeleteAuditEntity
|
|||
public UserRole ReviewerUser { get; set; }
|
||||
[JsonIgnore]
|
||||
public UserRole PreliminaryUser { get; set; }
|
||||
|
||||
[JsonIgnore]
|
||||
public CommonUploadRecord SiteSurveyFile { get; set; }
|
||||
#endregion
|
||||
|
||||
public Guid TrialSiteId { get; set; }
|
||||
|
|
@ -53,6 +56,8 @@ public class TrialSiteSurvey : BaseFullDeleteAuditEntity
|
|||
public DateTime? ReviewerTime { get; set; }
|
||||
|
||||
|
||||
public Guid? CommonUploadRecordId { get; set; }
|
||||
|
||||
|
||||
|
||||
[Comment("MRI-PDEE 是否为本中心该适应症的常规诊疗检查项目")]
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,73 @@
|
|||
using System;
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
|
||||
#nullable disable
|
||||
|
||||
namespace IRaCIS.Core.Infra.EFCore.Migrations
|
||||
{
|
||||
/// <inheritdoc />
|
||||
public partial class addfile : Migration
|
||||
{
|
||||
/// <inheritdoc />
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.AddColumn<Guid>(
|
||||
name: "CommonUploadRecordId",
|
||||
table: "TrialSiteSurvey",
|
||||
type: "uniqueidentifier",
|
||||
nullable: true);
|
||||
|
||||
migrationBuilder.CreateTable(
|
||||
name: "CommonUploadRecord",
|
||||
columns: table => new
|
||||
{
|
||||
Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
|
||||
FileType = table.Column<string>(type: "nvarchar(400)", maxLength: 400, nullable: false, comment: "文件类型"),
|
||||
FileName = table.Column<string>(type: "nvarchar(400)", maxLength: 400, nullable: false),
|
||||
FileSize = table.Column<long>(type: "bigint", nullable: false),
|
||||
Path = table.Column<string>(type: "nvarchar(1000)", maxLength: 1000, nullable: false),
|
||||
CreateUserId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
|
||||
CreateTime = table.Column<DateTime>(type: "datetime2", nullable: false)
|
||||
},
|
||||
constraints: table =>
|
||||
{
|
||||
table.PrimaryKey("PK_CommonUploadRecord", x => x.Id)
|
||||
.Annotation("SqlServer:Clustered", false);
|
||||
table.ForeignKey(
|
||||
name: "FK_CommonUploadRecord_User_CreateUserId",
|
||||
column: x => x.CreateUserId,
|
||||
principalTable: "User",
|
||||
principalColumn: "Id",
|
||||
onDelete: ReferentialAction.Cascade);
|
||||
});
|
||||
|
||||
//migrationBuilder.CreateIndex(
|
||||
// name: "IX_CommonUploadRecord_CreateTime",
|
||||
// table: "CommonUploadRecord",
|
||||
// column: "CreateTime")
|
||||
// .Annotation("SqlServer:Clustered", true);
|
||||
|
||||
//migrationBuilder.AddForeignKey(
|
||||
// name: "FK_TrialSiteSurvey_CommonUploadRecord_CommonUploadRecordId",
|
||||
// table: "TrialSiteSurvey",
|
||||
// column: "CommonUploadRecordId",
|
||||
// principalTable: "CommonUploadRecord",
|
||||
// principalColumn: "Id");
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropForeignKey(
|
||||
name: "FK_TrialSiteSurvey_CommonUploadRecord_CommonUploadRecordId",
|
||||
table: "TrialSiteSurvey");
|
||||
|
||||
migrationBuilder.DropTable(
|
||||
name: "CommonUploadRecord");
|
||||
|
||||
migrationBuilder.DropColumn(
|
||||
name: "CommonUploadRecordId",
|
||||
table: "TrialSiteSurvey");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -825,6 +825,47 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
|
|||
});
|
||||
});
|
||||
|
||||
modelBuilder.Entity("IRaCIS.Core.Domain.Models.CommonUploadRecord", b =>
|
||||
{
|
||||
b.Property<Guid>("Id")
|
||||
.HasColumnType("uniqueidentifier");
|
||||
|
||||
b.Property<DateTime>("CreateTime")
|
||||
.HasColumnType("datetime2");
|
||||
|
||||
b.Property<Guid>("CreateUserId")
|
||||
.HasColumnType("uniqueidentifier");
|
||||
|
||||
b.Property<string>("FileName")
|
||||
.IsRequired()
|
||||
.HasMaxLength(400)
|
||||
.HasColumnType("nvarchar(400)");
|
||||
|
||||
b.Property<long>("FileSize")
|
||||
.HasColumnType("bigint");
|
||||
|
||||
b.Property<string>("FileType")
|
||||
.IsRequired()
|
||||
.HasMaxLength(400)
|
||||
.HasColumnType("nvarchar(400)")
|
||||
.HasComment("文件类型");
|
||||
|
||||
b.Property<string>("Path")
|
||||
.IsRequired()
|
||||
.HasMaxLength(1000)
|
||||
.HasColumnType("nvarchar(1000)");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
SqlServerKeyBuilderExtensions.IsClustered(b.HasKey("Id"), false);
|
||||
|
||||
b.HasIndex("CreateTime");
|
||||
|
||||
SqlServerIndexBuilderExtensions.IsClustered(b.HasIndex("CreateTime"));
|
||||
|
||||
b.ToTable("CommonUploadRecord");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("IRaCIS.Core.Domain.Models.CriterionKeyFileRead", b =>
|
||||
{
|
||||
b.Property<Guid>("Id")
|
||||
|
|
@ -15151,6 +15192,9 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
|
|||
b.Property<int>("AverageEngravingCycle")
|
||||
.HasColumnType("int");
|
||||
|
||||
b.Property<Guid?>("CommonUploadRecordId")
|
||||
.HasColumnType("uniqueidentifier");
|
||||
|
||||
b.Property<DateTime>("CreateTime")
|
||||
.HasColumnType("datetime2");
|
||||
|
||||
|
|
@ -17303,6 +17347,17 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
|
|||
b.Navigation("CreateUserRole");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("IRaCIS.Core.Domain.Models.CommonUploadRecord", b =>
|
||||
{
|
||||
b.HasOne("IRaCIS.Core.Domain.Models.UserRole", "CreateUserRole")
|
||||
.WithMany()
|
||||
.HasForeignKey("CreateUserId")
|
||||
.OnDelete(DeleteBehavior.Cascade)
|
||||
.IsRequired();
|
||||
|
||||
b.Navigation("CreateUserRole");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("IRaCIS.Core.Domain.Models.CriterionKeyFileRead", b =>
|
||||
{
|
||||
b.HasOne("IRaCIS.Core.Domain.Models.UserRole", "CreateUserRole")
|
||||
|
|
@ -21224,6 +21279,10 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
|
|||
|
||||
modelBuilder.Entity("IRaCIS.Core.Domain.Models.TrialSiteSurvey", b =>
|
||||
{
|
||||
b.HasOne("IRaCIS.Core.Domain.Models.CommonUploadRecord", "SiteSurveyFile")
|
||||
.WithMany()
|
||||
.HasForeignKey("CommonUploadRecordId");
|
||||
|
||||
b.HasOne("IRaCIS.Core.Domain.Models.UserRole", "CreateUserRole")
|
||||
.WithMany()
|
||||
.HasForeignKey("CreateUserId")
|
||||
|
|
@ -21256,6 +21315,8 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
|
|||
|
||||
b.Navigation("ReviewerUser");
|
||||
|
||||
b.Navigation("SiteSurveyFile");
|
||||
|
||||
b.Navigation("Trial");
|
||||
|
||||
b.Navigation("TrialSite");
|
||||
|
|
|
|||
Loading…
Reference in New Issue