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

修改

Uat_Study
he 2023-01-11 11:05:55 +08:00
parent 91f6c67cc6
commit 70679cbf17
4 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.Application/Service/WorkLoad/DoctorWorkloadService.cs
View File

@ -217,7 +217,7 @@ namespace IRaCIS.Application.Services
Id=x.Id Id=x.Id
}).ToList(), }).ToList(),
CriterionReadingCategoryList =intoGroup.EnrollReadingCategoryList.Select(t=>new TrialCriterionReadingCategory() { EnrollId=t.EnrollId,ReadingCategory=t.ReadingCategory, TrialReadingCriterionId = t.TrialReadingCriterionId }).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, DoctorId = doctor.Id,
Code = doctor.ReviewerCode, Code = doctor.ReviewerCode,
FirstName = doctor.FirstName, FirstName = doctor.FirstName,

7
IRaCIS.Core.Domain/Dcotor/Doctor.cs
View File

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

4
IRaCIS.Core.Domain/Management/User.cs
View File

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

24
IRaCIS.Core.Infra.EFCore/EntityConfigration/DoctorConfigration.cs
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) // public void Configure(EntityTypeBuilder<VisitTask> builder)
{ // {
builder // builder
.HasOne(dd => dd.DoctorUser) // .HasOne(dd => dd.DoctorUser)
.WithMany(p => p.VisitTaskList) // .WithMany(p => p.VisitTaskList)
.HasForeignKey(dd => dd.DoctorUserId); // .HasForeignKey(dd => dd.DoctorUserId);
}
} // }
//}
public class DictionaryConfigration : IEntityTypeConfiguration<Dictionary> public class DictionaryConfigration : IEntityTypeConfiguration<Dictionary>
{ {