Compare commits
No commits in common. "20f6f95b89924593b22ee7283720e8d7901142a5" and "70e0a1325a124f8b4d229ae1d81519e1c9a870e3" have entirely different histories.
20f6f95b89
...
70e0a1325a
|
|
@ -6002,16 +6002,6 @@
|
||||||
文件路径
|
文件路径
|
||||||
</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>
|
||||||
是否应用
|
是否应用
|
||||||
|
|
@ -6062,16 +6052,6 @@
|
||||||
文件路径
|
文件路径
|
||||||
</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>
|
||||||
创建人
|
创建人
|
||||||
|
|
|
||||||
|
|
@ -372,8 +372,6 @@ 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,
|
||||||
|
|
|
||||||
|
|
@ -159,10 +159,9 @@ 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 = _userInfo.IsEn_Us?x.ClinicalDataTrialSet.EnFileName: x.ClinicalDataTrialSet.FileName,
|
FileName = 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()
|
||||||
|
|
@ -232,10 +231,9 @@ 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 = _userInfo.IsEn_Us?x.ClinicalDataTrialSet.EnFileName: x.ClinicalDataTrialSet.FileName,
|
FileName = 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()
|
||||||
|
|
@ -684,8 +682,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 = _userInfo.IsEn_Us?x.EnFileName: x.FileName,
|
FileName = x.FileName,
|
||||||
Path = _userInfo.IsEn_Us ? x.EnPath : x.Path,
|
Path = x.Path,
|
||||||
Id = x.Id,
|
Id = x.Id,
|
||||||
CriterionEnumList = x.CriterionEnumList,
|
CriterionEnumList = x.CriterionEnumList,
|
||||||
}).ToListAsync();
|
}).ToListAsync();
|
||||||
|
|
|
||||||
|
|
@ -66,16 +66,6 @@ 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; }
|
||||||
|
|
||||||
|
|
@ -149,17 +139,6 @@ 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; }
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -39,15 +39,5 @@ 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; }
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -51,16 +51,6 @@ 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; }
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,113 +0,0 @@
|
||||||
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");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -247,16 +247,6 @@ 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)
|
||||||
|
|
@ -321,16 +311,6 @@ 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)
|
||||||
|
|
@ -12764,8 +12744,7 @@ 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");
|
||||||
|
|
||||||
|
|
@ -13846,7 +13825,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.02 全局任务在截止访视号上+0.03 肿瘤0.06");
|
.HasComment("随访任务号 取访视的号 计划外是 访视+0.1 裁判任务在访视任务上+0.002 全局任务在截止访视号上+0.03 肿瘤待定");
|
||||||
|
|
||||||
b.HasKey("Id");
|
b.HasKey("Id");
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue