diff --git a/IRaCIS.Core.Application/Service/WorkLoad/DTO/DoctorWorkLoadViewModel.cs b/IRaCIS.Core.Application/Service/WorkLoad/DTO/DoctorWorkLoadViewModel.cs index 60a75e52..ad504f6b 100644 --- a/IRaCIS.Core.Application/Service/WorkLoad/DTO/DoctorWorkLoadViewModel.cs +++ b/IRaCIS.Core.Application/Service/WorkLoad/DTO/DoctorWorkLoadViewModel.cs @@ -270,12 +270,15 @@ namespace IRaCIS.Application.Contracts public List CriterionReadingCategoryList { get; set; } + public List CriterionFileList { get; set; } + public List CriterionCategoryList => TrialReadingCriterionList.Select(t => new CriterionReadingCategory() { EnrollId = EnrollId, + CriterionFileList= CriterionFileList.Where(x=>x.CriterionType==t.CriterionType).ToList(), TrialReadingCriterionId = t.TrialReadingCriterionId, ReadingCategorys = CriterionReadingCategoryList.Where(c => c.TrialReadingCriterionId == t.TrialReadingCriterionId).Select(t => t.ReadingCategory).OrderBy(c => c).ToList() }).ToList(); @@ -317,12 +320,52 @@ namespace IRaCIS.Application.Contracts } + public class CriterionFile + { + + public Guid Id { get; set; } + + + /// + /// 文件名称 + /// + public string FileName { get; set; } + + /// + /// 文件路径 + /// + public string FilePath { get; set; } + + /// + /// 标准类型 + /// + public CriterionType CriterionType { get; set; } + + /// + /// 医生Id + /// + public Guid DoctorId { get; set; } + + /// + /// 备注 + /// + public string Remark { get; set; } + + /// + /// 文件类型 + /// + public CriterionFileType FileType { get; set; } + } + public class CriterionReadingCategory { public Guid EnrollId { get; set; } public Guid TrialReadingCriterionId { get; set; } + public List CriterionFileList { get; set; } + + public List ReadingCategorys { get; set; } = new List(); } diff --git a/IRaCIS.Core.Application/Service/WorkLoad/DoctorWorkloadService.cs b/IRaCIS.Core.Application/Service/WorkLoad/DoctorWorkloadService.cs index 742a14f1..68c2cc03 100644 --- a/IRaCIS.Core.Application/Service/WorkLoad/DoctorWorkloadService.cs +++ b/IRaCIS.Core.Application/Service/WorkLoad/DoctorWorkloadService.cs @@ -207,8 +207,16 @@ namespace IRaCIS.Application.Services IsEnable = allocateRule.IsEnable, TrialReadingCriterionList = intoGroup.Trial.ReadingQuestionCriterionTrialList.Where(t=>t.IsConfirm).Select(t=>new TrialReadingCriterionDto() { TrialReadingCriterionId=t.Id,TrialReadingCriterionName=t.CriterionName,CriterionType=t.CriterionType,IsOncologyReading=t.IsOncologyReading,IsArbitrationReading=t.IsArbitrationReading,IsGlobalReading=t.IsGlobalReading,ReadingInfoSignTime=t.ReadingInfoSignTime,ReadingType=t.ReadingType}).ToList(), - - CriterionReadingCategoryList=intoGroup.EnrollReadingCategoryList.Select(t=>new TrialCriterionReadingCategory() { EnrollId=t.EnrollId,ReadingCategory=t.ReadingCategory, TrialReadingCriterionId = t.TrialReadingCriterionId }).ToList(), + CriterionFileList= doctor.CriterionFileList.Select(x=> new CriterionFile() { + CriterionType=x.CriterionType, + DoctorId=x.DoctorId, + FileName=x.FileName, + FilePath=x.FilePath, + FileType=x.FileType, + Remark=x.Remark, + Id=x.Id + }).ToList(), + CriterionReadingCategoryList =intoGroup.EnrollReadingCategoryList.Select(t=>new TrialCriterionReadingCategory() { EnrollId=t.EnrollId,ReadingCategory=t.ReadingCategory, TrialReadingCriterionId = t.TrialReadingCriterionId }).ToList(), DoctorId = doctor.Id, Code = doctor.ReviewerCode, diff --git a/IRaCIS.Core.Domain/Dcotor/Doctor.cs b/IRaCIS.Core.Domain/Dcotor/Doctor.cs index 9ae5527e..feea39d4 100644 --- a/IRaCIS.Core.Domain/Dcotor/Doctor.cs +++ b/IRaCIS.Core.Domain/Dcotor/Doctor.cs @@ -185,6 +185,8 @@ namespace IRaCIS.Core.Domain.Models public virtual Dictionary Position { get; set; } [JsonIgnore] public List AttachmentList { get; set; } + [JsonIgnore] + public List CriterionFileList { get; set; } public bool IsVirtual { get; set; } diff --git a/IRaCIS.Core.Domain/Dcotor/DoctorCriterionFile.cs b/IRaCIS.Core.Domain/Dcotor/DoctorCriterionFile.cs index 800b0ac8..6661804a 100644 --- a/IRaCIS.Core.Domain/Dcotor/DoctorCriterionFile.cs +++ b/IRaCIS.Core.Domain/Dcotor/DoctorCriterionFile.cs @@ -55,8 +55,12 @@ namespace IRaCIS.Core.Domain.Models /// CreateTime /// public DateTime CreateTime { get; set; } - - } + + [JsonIgnore] + [ForeignKey("DoctorId")] + public Doctor Doctor { get; set; } + + } }