修改

IRaCIS.Core.Application/Service/Doctor/DTO/DoctorModel.cs

@@ -716,6 +716,52 @@ namespace IRaCIS.Application.Contracts
         public CriterionFileType FileType { get; set; }
     }
 
+
+    public class GetDoctorCriterionFileOutDto
+    {
+        public Guid Id { get; set; }
+
+        /// <summary>
+        /// 文件名称
+        /// </summary>
+        public string FileName { get; set; }
+
+        /// <summary>
+        /// 文件路径
+        /// </summary>
+        public string FilePath { get; set; }
+
+        /// <summary>
+        /// 标准类型
+        /// </summary>
+        public CriterionType CriterionType { get; set; }
+
+        /// <summary>
+        /// 医生Id
+        /// </summary>
+        public Guid DoctorId { get; set; }
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { get; set; }
+
+        /// <summary>
+        /// 文件类型
+        /// </summary>
+        public CriterionFileType FileType { get; set; }
+
+        /// <summary>
+        /// CreateUserId
+        /// </summary>
+        public Guid CreateUserId { get; set; }
+
+        /// <summary>
+        /// CreateTime
+        /// </summary>
+        public DateTime CreateTime { get; set; }
+    }
+
     public class GetDoctorCriterionFileInDto    
     {
         public  Guid DoctorId { get; set; }

IRaCIS.Core.Application/Service/Doctor/DoctorService.cs

@@ -507,6 +507,7 @@ namespace IRaCIS.Application.Services
             var result = await _doctorCriterionFileRepository.Where(x => x.DoctorId == inDto.DoctorId)
                 .WhereIf(inDto.CriterionType != null, x => x.CriterionType == inDto.CriterionType)
                 .WhereIf(inDto.FileType != null, x => x.FileType == inDto.FileType)
+                .ProjectTo<DoctorCriterionFile>(_mapper.ConfigurationProvider)
                 .ToListAsync();
             return result;
         }

IRaCIS.Core.Application/Service/Doctor/_MapConfig.cs

@@ -34,6 +34,7 @@ namespace IRaCIS.Core.Application.Service
             CreateMap<ReviewerAckDTO, Attachment>().EqualityComparison((odto, o) => odto.Id == o.Id);
 
             CreateMap<AddDoctorCriterionFileDto, DoctorCriterionFile>();
+            CreateMap<DoctorCriterionFile, GetDoctorCriterionFileOutDto>();
             CreateMap<Doctor, DoctorBasicInfoCommand>();
             CreateMap<Education, EducationInfoViewModel>();
 

IRaCIS.Core.Application/Service/WorkLoad/DTO/DoctorWorkLoadViewModel.cs

@@ -270,6 +270,9 @@ namespace IRaCIS.Application.Contracts
 
         public List<TrialCriterionReadingCategory> CriterionReadingCategoryList { get; set; }
 
+        //任务阅片状态
+        public List<ReadingTaskState> ReadingTaskStateList { get; set; }
+
         public List<CriterionFile> CriterionFileList { get; set; }
 
 
@@ -278,6 +281,8 @@ namespace IRaCIS.Application.Contracts
             new CriterionReadingCategory()
             {
                 EnrollId = EnrollId,
+                ToDoQuantity= ReadingTaskStateList.Where(x=>x!=ReadingTaskState.HaveSigned).Count(),
+                CompletionQuantity = ReadingTaskStateList.Where(x => x == ReadingTaskState.HaveSigned).Count(),
                 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()
@@ -363,6 +368,13 @@ namespace IRaCIS.Application.Contracts
         public Guid EnrollId { get; set; }
         public Guid TrialReadingCriterionId { get; set; }
 
+        /// <summary>
+        /// 待办数量
+        /// </summary>
+        public int ToDoQuantity { get; set; }
+
+        public int CompletionQuantity { get; set; }
+
         public List<CriterionFile> CriterionFileList { get; set; }
 
 

IRaCIS.Core.Application/Service/WorkLoad/DoctorWorkloadService.cs

@@ -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(),
                     DoctorId = doctor.Id,
                     Code = doctor.ReviewerCode,
                     FirstName = doctor.FirstName,

IRaCIS.Core.Domain/Dcotor/Doctor.cs

@@ -188,6 +188,10 @@ namespace IRaCIS.Core.Domain.Models
         [JsonIgnore]
         public List<DoctorCriterionFile> CriterionFileList { get; set; }
 
+
+        [JsonIgnore]
+        public List<VisitTask> VisitTaskList { get; set; }
+
         public bool IsVirtual { get; set; }
 
         public string BlindName { get; set; } = string.Empty;