添加EvaluateProgress 任务评估进度相关字段
parent
e622f601a4
commit
54e30f008c
|
|
@ -293,6 +293,33 @@ namespace IRaCIS.Core.Domain.Share
|
||||||
Freeze = 5,
|
Freeze = 5,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 评估进度
|
||||||
|
/// </summary>
|
||||||
|
public enum EvaluateProgress
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 默认
|
||||||
|
/// </summary>
|
||||||
|
Default = 0,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 放射学
|
||||||
|
/// </summary>
|
||||||
|
Radiology = 1,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 核医学
|
||||||
|
/// </summary>
|
||||||
|
NuclearMedicine = 2,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 肿瘤学
|
||||||
|
/// </summary>
|
||||||
|
Oncology = 3,
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
//阅片状态
|
//阅片状态
|
||||||
public enum ReadingTaskState
|
public enum ReadingTaskState
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,20 @@
|
||||||
|
using IRaCIS.Core.Domain.Share;
|
||||||
|
|
||||||
|
namespace IRaCIS.Core.Domain.Models;
|
||||||
|
|
||||||
|
[Comment("项目阅片 - 任务评估进度")]
|
||||||
|
[Table("TaskEvaluateProgress")]
|
||||||
|
public class TaskEvaluateProgress : BaseAddAuditEntity
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 任务Id
|
||||||
|
/// </summary>
|
||||||
|
public Guid VisitTaskId { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 评估进度
|
||||||
|
/// </summary>
|
||||||
|
public EvaluateProgress EvaluateProgressEnum { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -304,6 +304,11 @@ public class VisitTask : BaseFullAuditEntity
|
||||||
[ForeignKey("SubjectCriterionClaimUserId")]
|
[ForeignKey("SubjectCriterionClaimUserId")]
|
||||||
public UserRole SubjectCriterionClaimUser { get; set; }
|
public UserRole SubjectCriterionClaimUser { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 评估进度
|
||||||
|
/// </summary>
|
||||||
|
public EvaluateProgress EvaluateProgressEnum { get; set; } = EvaluateProgress.Default;
|
||||||
|
|
||||||
|
|
||||||
[NotMapped]
|
[NotMapped]
|
||||||
public List<string> PIAuditImagePathList
|
public List<string> PIAuditImagePathList
|
||||||
|
|
|
||||||
|
|
@ -543,6 +543,8 @@ public class IRaCISDBContext : DbContext
|
||||||
|
|
||||||
public virtual DbSet<TaskConsistentRule> TaskConsistentRule { get; set; }
|
public virtual DbSet<TaskConsistentRule> TaskConsistentRule { get; set; }
|
||||||
|
|
||||||
|
public virtual DbSet<TaskEvaluateProgress> TaskEvaluateProgress { get; set; }
|
||||||
|
|
||||||
|
|
||||||
public virtual DbSet<TaskInfluence> TaskInfluence { get; set; }
|
public virtual DbSet<TaskInfluence> TaskInfluence { get; set; }
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,46 @@
|
||||||
|
using System;
|
||||||
|
using Microsoft.EntityFrameworkCore.Migrations;
|
||||||
|
|
||||||
|
#nullable disable
|
||||||
|
|
||||||
|
namespace IRaCIS.Core.Infra.EFCore.Migrations
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
public partial class TaskEvaluateProgress : Migration
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Up(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.AddColumn<int>(
|
||||||
|
name: "EvaluateProgressEnum",
|
||||||
|
table: "VisitTask",
|
||||||
|
type: "int",
|
||||||
|
nullable: false,
|
||||||
|
defaultValue: 0);
|
||||||
|
|
||||||
|
migrationBuilder.CreateTable(
|
||||||
|
name: "TaskEvaluateProgress",
|
||||||
|
columns: table => new
|
||||||
|
{
|
||||||
|
Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
|
||||||
|
VisitTaskId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
|
||||||
|
EvaluateProgressEnum = table.Column<int>(type: "int", nullable: false),
|
||||||
|
CreateUserId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
|
||||||
|
CreateTime = table.Column<DateTime>(type: "datetime2", nullable: false)
|
||||||
|
},
|
||||||
|
constraints: table =>
|
||||||
|
{
|
||||||
|
table.PrimaryKey("PK_TaskEvaluateProgress", x => x.Id);
|
||||||
|
},
|
||||||
|
comment: "项目阅片 - 任务评估进度");
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Down(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -3092,6 +3092,8 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
|
||||||
|
|
||||||
b.HasKey("Id");
|
b.HasKey("Id");
|
||||||
|
|
||||||
|
b.HasIndex("CreateUserId");
|
||||||
|
|
||||||
b.HasIndex("TrialId");
|
b.HasIndex("TrialId");
|
||||||
|
|
||||||
b.ToTable("IdentityUser", t =>
|
b.ToTable("IdentityUser", t =>
|
||||||
|
|
@ -10098,6 +10100,33 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("IRaCIS.Core.Domain.Models.TaskEvaluateProgress", b =>
|
||||||
|
{
|
||||||
|
b.Property<Guid>("Id")
|
||||||
|
.HasColumnType("uniqueidentifier");
|
||||||
|
|
||||||
|
b.Property<DateTime>("CreateTime")
|
||||||
|
.HasColumnType("datetime2");
|
||||||
|
|
||||||
|
b.Property<Guid>("CreateUserId")
|
||||||
|
.HasColumnType("uniqueidentifier");
|
||||||
|
|
||||||
|
b.Property<int>("EvaluateProgressEnum")
|
||||||
|
.HasColumnType("int");
|
||||||
|
|
||||||
|
b.Property<Guid>("VisitTaskId")
|
||||||
|
.HasColumnType("uniqueidentifier");
|
||||||
|
|
||||||
|
b.HasKey("Id");
|
||||||
|
|
||||||
|
b.HasIndex("CreateUserId");
|
||||||
|
|
||||||
|
b.ToTable("TaskEvaluateProgress", t =>
|
||||||
|
{
|
||||||
|
t.HasComment("项目阅片 - 任务评估进度");
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
modelBuilder.Entity("IRaCIS.Core.Domain.Models.TaskInfluence", b =>
|
modelBuilder.Entity("IRaCIS.Core.Domain.Models.TaskInfluence", b =>
|
||||||
{
|
{
|
||||||
b.Property<Guid>("Id")
|
b.Property<Guid>("Id")
|
||||||
|
|
@ -13568,6 +13597,8 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
|
||||||
|
|
||||||
b.HasKey("Id");
|
b.HasKey("Id");
|
||||||
|
|
||||||
|
b.HasIndex("CreateUserId");
|
||||||
|
|
||||||
b.HasIndex("DoctorId")
|
b.HasIndex("DoctorId")
|
||||||
.IsUnique()
|
.IsUnique()
|
||||||
.HasFilter("[DoctorId] IS NOT NULL");
|
.HasFilter("[DoctorId] IS NOT NULL");
|
||||||
|
|
@ -14010,6 +14041,9 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
|
||||||
b.Property<Guid?>("DoctorUserId")
|
b.Property<Guid?>("DoctorUserId")
|
||||||
.HasColumnType("uniqueidentifier");
|
.HasColumnType("uniqueidentifier");
|
||||||
|
|
||||||
|
b.Property<int>("EvaluateProgressEnum")
|
||||||
|
.HasColumnType("int");
|
||||||
|
|
||||||
b.Property<DateTime?>("ExpetidEmailNoticeTime")
|
b.Property<DateTime?>("ExpetidEmailNoticeTime")
|
||||||
.HasColumnType("datetime2")
|
.HasColumnType("datetime2")
|
||||||
.HasComment("通知IR加急阅片时间");
|
.HasComment("通知IR加急阅片时间");
|
||||||
|
|
@ -15206,10 +15240,18 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
|
||||||
|
|
||||||
modelBuilder.Entity("IRaCIS.Core.Domain.Models.IdentityUser", b =>
|
modelBuilder.Entity("IRaCIS.Core.Domain.Models.IdentityUser", b =>
|
||||||
{
|
{
|
||||||
|
b.HasOne("IRaCIS.Core.Domain.Models.UserRole", "CreateUserRole")
|
||||||
|
.WithMany()
|
||||||
|
.HasForeignKey("CreateUserId")
|
||||||
|
.OnDelete(DeleteBehavior.Cascade)
|
||||||
|
.IsRequired();
|
||||||
|
|
||||||
b.HasOne("IRaCIS.Core.Domain.Models.Trial", "Trial")
|
b.HasOne("IRaCIS.Core.Domain.Models.Trial", "Trial")
|
||||||
.WithMany()
|
.WithMany()
|
||||||
.HasForeignKey("TrialId");
|
.HasForeignKey("TrialId");
|
||||||
|
|
||||||
|
b.Navigation("CreateUserRole");
|
||||||
|
|
||||||
b.Navigation("Trial");
|
b.Navigation("Trial");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
@ -16350,7 +16392,7 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
|
||||||
.IsRequired();
|
.IsRequired();
|
||||||
|
|
||||||
b.HasOne("IRaCIS.Core.Domain.Models.VisitTask", "VisitTask")
|
b.HasOne("IRaCIS.Core.Domain.Models.VisitTask", "VisitTask")
|
||||||
.WithMany()
|
.WithMany("ReadingTaskQuestionMarkList")
|
||||||
.HasForeignKey("VisitTaskId")
|
.HasForeignKey("VisitTaskId")
|
||||||
.OnDelete(DeleteBehavior.Cascade)
|
.OnDelete(DeleteBehavior.Cascade)
|
||||||
.IsRequired();
|
.IsRequired();
|
||||||
|
|
@ -17263,6 +17305,17 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
|
||||||
b.Navigation("TrialReadingCriterion");
|
b.Navigation("TrialReadingCriterion");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("IRaCIS.Core.Domain.Models.TaskEvaluateProgress", 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.TaskInfluence", b =>
|
modelBuilder.Entity("IRaCIS.Core.Domain.Models.TaskInfluence", b =>
|
||||||
{
|
{
|
||||||
b.HasOne("IRaCIS.Core.Domain.Models.UserRole", "CreateUserRole")
|
b.HasOne("IRaCIS.Core.Domain.Models.UserRole", "CreateUserRole")
|
||||||
|
|
@ -18249,6 +18302,12 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
|
||||||
|
|
||||||
modelBuilder.Entity("IRaCIS.Core.Domain.Models.UserRole", b =>
|
modelBuilder.Entity("IRaCIS.Core.Domain.Models.UserRole", b =>
|
||||||
{
|
{
|
||||||
|
b.HasOne("IRaCIS.Core.Domain.Models.UserRole", "CreateUserRole")
|
||||||
|
.WithMany()
|
||||||
|
.HasForeignKey("CreateUserId")
|
||||||
|
.OnDelete(DeleteBehavior.Cascade)
|
||||||
|
.IsRequired();
|
||||||
|
|
||||||
b.HasOne("IRaCIS.Core.Domain.Models.Doctor", null)
|
b.HasOne("IRaCIS.Core.Domain.Models.Doctor", null)
|
||||||
.WithOne("User")
|
.WithOne("User")
|
||||||
.HasForeignKey("IRaCIS.Core.Domain.Models.UserRole", "DoctorId");
|
.HasForeignKey("IRaCIS.Core.Domain.Models.UserRole", "DoctorId");
|
||||||
|
|
@ -18265,6 +18324,8 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
|
||||||
.OnDelete(DeleteBehavior.Cascade)
|
.OnDelete(DeleteBehavior.Cascade)
|
||||||
.IsRequired();
|
.IsRequired();
|
||||||
|
|
||||||
|
b.Navigation("CreateUserRole");
|
||||||
|
|
||||||
b.Navigation("IdentityUser");
|
b.Navigation("IdentityUser");
|
||||||
|
|
||||||
b.Navigation("UserTypeRole");
|
b.Navigation("UserTypeRole");
|
||||||
|
|
@ -18979,6 +19040,8 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
|
||||||
|
|
||||||
b.Navigation("ReadingTaskQuestionAnswerList");
|
b.Navigation("ReadingTaskQuestionAnswerList");
|
||||||
|
|
||||||
|
b.Navigation("ReadingTaskQuestionMarkList");
|
||||||
|
|
||||||
b.Navigation("TaskInfluenceList");
|
b.Navigation("TaskInfluenceList");
|
||||||
|
|
||||||
b.Navigation("TaskMedicalReviewList");
|
b.Navigation("TaskMedicalReviewList");
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue