XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

临床数据修改

Test_IRC_Net8
he 2025-02-08 10:20:15 +08:00
parent 91471dee13
commit 7e7c186784
9 changed files with 18776 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
View File

@ -6002,6 +6002,16 @@
文件路径 文件路径
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataTrialSetAddOrEdit.EnFileName">
<summary>
英文模板文件名称
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataTrialSetAddOrEdit.EnPath">
<summary>
英文文件路径
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataSystemSetAddOrEdit.IsApply"> <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataSystemSetAddOrEdit.IsApply">
<summary> <summary>
是否应用 是否应用
@ -6052,6 +6062,16 @@
文件路径 文件路径
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataSystemSetAddOrEdit.EnFileName">
<summary>
英文模板文件名称
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataSystemSetAddOrEdit.EnPath">
<summary>
英文文件路径
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataTrialSetView.CreateUserId"> <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataTrialSetView.CreateUserId">
<summary> <summary>
创建人 创建人

2
IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalDataSetService.cs
View File

@ -372,6 +372,8 @@ namespace IRaCIS.Core.Application.Service
ClinicalDataSetEnName = x.ClinicalDataSetEnName, ClinicalDataSetEnName = x.ClinicalDataSetEnName,
UploadRole = x.UploadRole, UploadRole = x.UploadRole,
FileName = x.FileName, FileName = x.FileName,
EnFileName = x.EnFileName,
EnPath = x.EnPath,
Path = x.Path, Path = x.Path,
TrialId = trialId, TrialId = trialId,
IsApply = x.IsApply, IsApply = x.IsApply,

14
IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
View File

@ -159,9 +159,10 @@ namespace IRaCIS.Core.Application.Service
ClinicalDataLevel = x.ClinicalDataTrialSet.ClinicalDataLevel, ClinicalDataLevel = x.ClinicalDataTrialSet.ClinicalDataLevel,
ClinicalDataSetEnName = x.ClinicalDataTrialSet.ClinicalDataSetEnName, ClinicalDataSetEnName = x.ClinicalDataTrialSet.ClinicalDataSetEnName,
ClinicalDataTrialSetId = x.ClinicalDataTrialSet.Id, ClinicalDataTrialSetId = x.ClinicalDataTrialSet.Id,
FileName = x.ClinicalDataTrialSet.FileName, FileName = _userInfo.IsEn_Us?x.ClinicalDataTrialSet.EnFileName: x.ClinicalDataTrialSet.FileName,
Path = _userInfo.IsEn_Us ? x.ClinicalDataTrialSet.EnPath : x.ClinicalDataTrialSet.Path,
UploadRole = x.ClinicalDataTrialSet.UploadRole, UploadRole = x.ClinicalDataTrialSet.UploadRole,
Path = x.ClinicalDataTrialSet.Path,
IsBlind = x.IsBlind, IsBlind = x.IsBlind,
IsComplete = x.IsComplete, IsComplete = x.IsComplete,
ClinicalFromList = x.Subject.ClinicalFormList.Where(y => y.ReadingId == x.ReadingId && y.ClinicalDataTrialSetId == x.ClinicalDataTrialSetId).Select(y => new ClinicalFromData() ClinicalFromList = x.Subject.ClinicalFormList.Where(y => y.ReadingId == x.ReadingId && y.ClinicalDataTrialSetId == x.ClinicalDataTrialSetId).Select(y => new ClinicalFromData()
@ -231,9 +232,10 @@ namespace IRaCIS.Core.Application.Service
ClinicalDataLevel = x.ClinicalDataTrialSet.ClinicalDataLevel, ClinicalDataLevel = x.ClinicalDataTrialSet.ClinicalDataLevel,
ClinicalDataSetEnName = x.ClinicalDataTrialSet.ClinicalDataSetEnName, ClinicalDataSetEnName = x.ClinicalDataTrialSet.ClinicalDataSetEnName,
ClinicalDataTrialSetId = x.ClinicalDataTrialSet.Id, ClinicalDataTrialSetId = x.ClinicalDataTrialSet.Id,
FileName = x.ClinicalDataTrialSet.FileName, FileName = _userInfo.IsEn_Us?x.ClinicalDataTrialSet.EnFileName: x.ClinicalDataTrialSet.FileName,
Path = _userInfo.IsEn_Us ? x.ClinicalDataTrialSet.EnPath : x.ClinicalDataTrialSet.Path,
UploadRole = x.ClinicalDataTrialSet.UploadRole, UploadRole = x.ClinicalDataTrialSet.UploadRole,
Path = x.ClinicalDataTrialSet.Path,
IsBlind = x.IsBlind, IsBlind = x.IsBlind,
IsComplete = x.IsComplete, IsComplete = x.IsComplete,
ClinicalFromList = x.Subject.ClinicalFormList.Where(y => y.ReadingId == x.ReadingId && y.ClinicalDataTrialSetId == x.ClinicalDataTrialSetId).Select(y => new ClinicalFromData() ClinicalFromList = x.Subject.ClinicalFormList.Where(y => y.ReadingId == x.ReadingId && y.ClinicalDataTrialSetId == x.ClinicalDataTrialSetId).Select(y => new ClinicalFromData()
@ -682,8 +684,8 @@ namespace IRaCIS.Core.Application.Service
ClinicalDataSetName = x.ClinicalDataSetName.LanguageName(x.ClinicalDataSetEnName, _userInfo.IsEn_Us), ClinicalDataSetName = x.ClinicalDataSetName.LanguageName(x.ClinicalDataSetEnName, _userInfo.IsEn_Us),
ClinicalDataSetEnName = x.ClinicalDataSetEnName, ClinicalDataSetEnName = x.ClinicalDataSetEnName,
ClinicalUploadType = x.ClinicalUploadType, ClinicalUploadType = x.ClinicalUploadType,
FileName = x.FileName, FileName = _userInfo.IsEn_Us?x.EnFileName: x.FileName,
Path = x.Path, Path = _userInfo.IsEn_Us ? x.EnPath : x.Path,
Id = x.Id, Id = x.Id,
CriterionEnumList = x.CriterionEnumList, CriterionEnumList = x.CriterionEnumList,
}).ToListAsync(); }).ToListAsync();

21
IRaCIS.Core.Application/Service/Reading/Dto/ClinicalDataServiceViewModel.cs
View File

@ -66,6 +66,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary> /// </summary>
public string Path { get; set; } public string Path { get; set; }
/// <summary>
/// 英文模板文件名称
/// </summary>
public string EnFileName { get; set; } = string.Empty;
/// <summary>
/// 英文文件路径
/// </summary>
public string EnPath { get; set; } = string.Empty;
public List<Guid> TrialCriterionIdList { get; set; } public List<Guid> TrialCriterionIdList { get; set; }
@ -139,6 +149,17 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public string Path { get; set; } public string Path { get; set; }
/// <summary>
/// 英文模板文件名称
/// </summary>
public string EnFileName { get; set; } = string.Empty;
/// <summary>
/// 英文文件路径
/// </summary>
public string EnPath { get; set; } = string.Empty;
//public List<Guid> SystemCriterionIdList { get; set; } //public List<Guid> SystemCriterionIdList { get; set; }

10
IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataSystemSet.cs
View File

@ -39,5 +39,15 @@ public class ClinicalDataSystemSet : BaseAddAuditEntity
[StringLength(1000)] [StringLength(1000)]
public string Path { get; set; } = null!; public string Path { get; set; } = null!;
/// <summary>
/// 英文模板文件名称
/// </summary>
public string EnFileName { get; set; } = string.Empty;
/// <summary>
/// 英文文件路径
/// </summary>
public string EnPath { get; set; } = string.Empty;
public UploadRole UploadRole { get; set; } public UploadRole UploadRole { get; set; }
} }

10
IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataTrialSet.cs
View File

@ -51,6 +51,16 @@ public class ClinicalDataTrialSet : BaseAddAuditEntity
[StringLength(1000)] [StringLength(1000)]
public string Path { get; set; } = null!; public string Path { get; set; } = null!;
/// <summary>
/// 英文模板文件名称
/// </summary>
public string EnFileName { get; set; } = string.Empty;
/// <summary>
/// 英文文件路径
/// </summary>
public string EnPath { get; set; } = string.Empty;
public Guid? SystemClinicalDataSetId { get; set; } public Guid? SystemClinicalDataSetId { get; set; }
public Guid TrialId { get; set; } public Guid TrialId { get; set; }

18569
IRaCIS.Core.Infra.EFCore/Migrations/20250208021716_clidata.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

113
IRaCIS.Core.Infra.EFCore/Migrations/20250208021716_clidata.cs Normal file
View File

@ -0,0 +1,113 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace IRaCIS.Core.Infra.EFCore.Migrations
{
/// <inheritdoc />
public partial class clidata : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AlterColumn<decimal>(
name: "VisitTaskNum",
table: "VisitTask",
type: "decimal(18,2)",
precision: 18,
scale: 2,
nullable: false,
comment: "随访任务号 取访视的号 计划外是 访视+0.1 裁判任务在访视任务上+0.02 全局任务在截止访视号上+0.03 肿瘤0.06",
oldClrType: typeof(decimal),
oldType: "decimal(18,2)",
oldPrecision: 18,
oldScale: 2,
oldComment: "随访任务号 取访视的号 计划外是 访视+0.1 裁判任务在访视任务上+0.002 全局任务在截止访视号上+0.03 肿瘤待定");
migrationBuilder.AlterColumn<Guid>(
name: "UserId",
table: "TrialUser",
type: "uniqueidentifier",
nullable: false,
comment: "这里实际是UserRoleId",
oldClrType: typeof(Guid),
oldType: "uniqueidentifier");
migrationBuilder.AddColumn<string>(
name: "EnFileName",
table: "ClinicalDataTrialSet",
type: "nvarchar(400)",
maxLength: 400,
nullable: false,
defaultValue: "");
migrationBuilder.AddColumn<string>(
name: "EnPath",
table: "ClinicalDataTrialSet",
type: "nvarchar(400)",
maxLength: 400,
nullable: false,
defaultValue: "");
migrationBuilder.AddColumn<string>(
name: "EnFileName",
table: "ClinicalDataSystemSet",
type: "nvarchar(400)",
maxLength: 400,
nullable: false,
defaultValue: "");
migrationBuilder.AddColumn<string>(
name: "EnPath",
table: "ClinicalDataSystemSet",
type: "nvarchar(400)",
maxLength: 400,
nullable: false,
defaultValue: "");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "EnFileName",
table: "ClinicalDataTrialSet");
migrationBuilder.DropColumn(
name: "EnPath",
table: "ClinicalDataTrialSet");
migrationBuilder.DropColumn(
name: "EnFileName",
table: "ClinicalDataSystemSet");
migrationBuilder.DropColumn(
name: "EnPath",
table: "ClinicalDataSystemSet");
migrationBuilder.AlterColumn<decimal>(
name: "VisitTaskNum",
table: "VisitTask",
type: "decimal(18,2)",
precision: 18,
scale: 2,
nullable: false,
comment: "随访任务号 取访视的号 计划外是 访视+0.1 裁判任务在访视任务上+0.002 全局任务在截止访视号上+0.03 肿瘤待定",
oldClrType: typeof(decimal),
oldType: "decimal(18,2)",
oldPrecision: 18,
oldScale: 2,
oldComment: "随访任务号 取访视的号 计划外是 访视+0.1 裁判任务在访视任务上+0.02 全局任务在截止访视号上+0.03 肿瘤0.06");
migrationBuilder.AlterColumn<Guid>(
name: "UserId",
table: "TrialUser",
type: "uniqueidentifier",
nullable: false,
oldClrType: typeof(Guid),
oldType: "uniqueidentifier",
oldComment: "这里实际是UserRoleId");
}
}
}

25
IRaCIS.Core.Infra.EFCore/Migrations/IRaCISDBContextModelSnapshot.cs
View File

@ -247,6 +247,16 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
.HasMaxLength(1000) .HasMaxLength(1000)
.HasColumnType("nvarchar(1000)"); .HasColumnType("nvarchar(1000)");
b.Property<string>("EnFileName")
.IsRequired()
.HasMaxLength(400)
.HasColumnType("nvarchar(400)");
b.Property<string>("EnPath")
.IsRequired()
.HasMaxLength(400)
.HasColumnType("nvarchar(400)");
b.Property<string>("FileName") b.Property<string>("FileName")
.IsRequired() .IsRequired()
.HasMaxLength(400) .HasMaxLength(400)
@ -311,6 +321,16 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
.HasMaxLength(1000) .HasMaxLength(1000)
.HasColumnType("nvarchar(1000)"); .HasColumnType("nvarchar(1000)");
b.Property<string>("EnFileName")
.IsRequired()
.HasMaxLength(400)
.HasColumnType("nvarchar(400)");
b.Property<string>("EnPath")
.IsRequired()
.HasMaxLength(400)
.HasColumnType("nvarchar(400)");
b.Property<string>("FileName") b.Property<string>("FileName")
.IsRequired() .IsRequired()
.HasMaxLength(400) .HasMaxLength(400)
@ -12744,7 +12764,8 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier");
b.Property<Guid>("UserId") b.Property<Guid>("UserId")
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier")
.HasComment("这里实际是UserRoleId");
b.HasKey("Id"); b.HasKey("Id");
@ -13825,7 +13846,7 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
b.Property<decimal>("VisitTaskNum") b.Property<decimal>("VisitTaskNum")
.HasPrecision(18, 2) .HasPrecision(18, 2)
.HasColumnType("decimal(18,2)") .HasColumnType("decimal(18,2)")
.HasComment("随访任务号 取访视的号 计划外是 访视+0.1 裁判任务在访视任务上+0.002 全局任务在截止访视号上+0.03 肿瘤待定"); .HasComment("随访任务号 取访视的号 计划外是 访视+0.1 裁判任务在访视任务上+0.02 全局任务在截止访视号上+0.03 肿瘤0.06");
b.HasKey("Id"); b.HasKey("Id");