Uat_Study
he 2023-01-11 11:05:55 +08:00
parent 91f6c67cc6
commit 70679cbf17
4 changed files with 22 additions and 15 deletions

View File

@ -217,7 +217,7 @@ namespace IRaCIS.Application.Services
Id=x.Id
}).ToList(),
CriterionReadingCategoryList =intoGroup.EnrollReadingCategoryList.Select(t=>new TrialCriterionReadingCategory() { EnrollId=t.EnrollId,ReadingCategory=t.ReadingCategory, TrialReadingCriterionId = t.TrialReadingCriterionId }).ToList(),
ReadingTaskStateList=doctor.VisitTaskList.Where(x=>x.TaskState==TaskState.Effect&&x.TrialId== trialId).Select(x=>x.ReadingTaskState).ToList(),
ReadingTaskStateList=doctor.User.VisitTaskList.Where(x=>x.TaskState==TaskState.Effect&&x.TrialId== trialId).Select(x=>x.ReadingTaskState).ToList(),
DoctorId = doctor.Id,
Code = doctor.ReviewerCode,
FirstName = doctor.FirstName,

View File

@ -188,9 +188,12 @@ namespace IRaCIS.Core.Domain.Models
[JsonIgnore]
public List<DoctorCriterionFile> CriterionFileList { get; set; }
[JsonIgnore]
public List<VisitTask> VisitTaskList { get; set; }
public User User { get; set; }
//[JsonIgnore]
//public List<VisitTask> VisitTaskList { get; set; }
public bool IsVirtual { get; set; }

View File

@ -78,6 +78,10 @@ namespace IRaCIS.Core.Domain.Models
//医生生成账号后,会有值
public Guid? DoctorId { get; set; }
[JsonIgnore]
[ForeignKey("DoctorId")]
public Doctor Doctor { get; set; }
public bool IsTestUser { get; set; }

View File

@ -26,22 +26,22 @@ namespace IRaCIS.Core.Infra.EFCore.EntityConfigration
}
public class DoctorTaskConfigration : IEntityTypeConfiguration<VisitTask>
{
//public class DoctorTaskConfigration : IEntityTypeConfiguration<VisitTask>
//{
public void Configure(EntityTypeBuilder<VisitTask> builder)
{
builder
.HasOne(dd => dd.DoctorUser)
.WithMany(p => p.VisitTaskList)
.HasForeignKey(dd => dd.DoctorUserId);
}
// public void Configure(EntityTypeBuilder<VisitTask> builder)
// {
// builder
// .HasOne(dd => dd.DoctorUser)
// .WithMany(p => p.VisitTaskList)
// .HasForeignKey(dd => dd.DoctorUserId);
}
// }
//}
public class DictionaryConfigration : IEntityTypeConfiguration<Dictionary>
{