修改导表

IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs

@@ -2,6 +2,7 @@
 using IRaCIS.Core.Application.Helper;
 using IRaCIS.Core.Application.ViewModel;
 using IRaCIS.Core.Domain.Share;
+using MiniExcelLibs.Attributes;
 using Newtonsoft.Json;
 using System.ComponentModel.DataAnnotations;
 
@@ -242,6 +243,7 @@ namespace IRaCIS.Core.Application.Contracts
         //public DateTime? SignDate { get; set; }
         //public bool IsUrgent { get; set; }
 
+        //[ExcelFormat("yyyy-MM-dd")]
         public DateTime? FirstGiveMedicineTime { get; set; }
 
         public DateTime? OutEnrollmentTime { get; set; }
@@ -352,6 +354,58 @@ namespace IRaCIS.Core.Application.Contracts
         public Guid TrialId { get; set; }
     }
 
+    public class SubjectProgressQuery
+    {
+        [NotDefault]
+        public Guid TrialId { get; set; }
+
+        [NotDefault]
+        public Guid TrialReadingCriterionId { get; set; }
+    }
+
+    public class SubjectProgressDto
+    {
+        public string SubjectCode { get; set; }
+
+        public string TrialSiteCode { get; set; }
+
+        [DictionaryTranslateAttribute("Subject_Visit_Status")]
+        public SubjectStatus SubjectStatus { get; set; }
+
+
+        public List<MouduleProgress> VisitList { get; set; }
+
+        public List<MouduleProgress> ModuleList { get; set; }
+
+
+        public List<MouduleProgress> TotalList => VisitList.Union(ModuleList).OrderBy(t=>t.VisitTaskNum).ToList();
+
+
+        public class MouduleProgress
+        {
+            public string TaskName { get; set; }
+
+            public ReadingStatusEnum ReadingStatus { get; set; }
+
+
+           
+
+            //最终任务
+            public decimal VisitTaskNum { get; set; }
+
+            //访视会有
+            public bool? Inplan { get; set; }
+
+            public bool? IsLostVisit { get; set; }
+
+            public bool? IsFinalVisit { get; set; }
+
+            //阅片期会有
+            public ReadingSetType? ReadingSetType { get; set; }
+        }    
+
+    }
+
     public class ReadPeriodExportDto
     {
         public string SubjectCode { get; set; }
@@ -385,7 +439,7 @@ namespace IRaCIS.Core.Application.Contracts
 
         public string Modality { get; set; } = string.Empty;
 
-
+        //[ExcelFormat("yyyy-MM-dd")]
         public DateTime? StudyTime { get; set; }
 
         public string SubjectCode { get; set; } = String.Empty;