修改独立阅片人

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

@@ -219,23 +219,27 @@ namespace IRaCIS.Application.Contracts
 
         public string? UpdateTimeStr => UpdateTime?.ToString("yyyy-MM-dd HH:mm:ss");
 
-        public int? TrainingTimes { get; set; }
-        public int? Downtime { get; set; }
 
-        //读片点
-        public int? Timepoint { get; set; }
-        public int? TimepointIn24H { get; set; }
-        public int? TimepointIn48H { get; set; }
 
-        //裁判阅片
-        public int? Adjudication { get; set; }
-        public int? AdjudicationIn24H { get; set; }
-        public int? AdjudicationIn48H { get; set; }
 
-        //全局阅片
-        public int? Global { get; set; }
 
-        public int? RefresherTraining { get; set; }
+        //public int? TrainingTimes { get; set; }
+        //public int? Downtime { get; set; }
+
+        ////读片点
+        //public int? Timepoint { get; set; }
+        //public int? TimepointIn24H { get; set; }
+        //public int? TimepointIn48H { get; set; }
+
+        ////裁判阅片
+        //public int? Adjudication { get; set; }
+        //public int? AdjudicationIn24H { get; set; }
+        //public int? AdjudicationIn48H { get; set; }
+
+        ////全局阅片
+        //public int? Global { get; set; }
+
+        //public int? RefresherTraining { get; set; }
 
 
 

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

@@ -198,25 +198,25 @@ namespace IRaCIS.Application.Services
                 join doctor in _doctorRepository.AsQueryable() on intoGroup.DoctorId equals doctor.Id
                 join attachmentItem in _attachmentRepository.AsQueryable() on intoGroup.AttachmentId equals attachmentItem.Id into cc
                 from attachment in cc.DefaultIfEmpty()
-                join doctorWorkLoad in _doctorWorkloadRepository.Where(t => t.TrialId == trialId && t.DataFrom == (int)WorkLoadFromStatus.FinalConfirm).GroupBy(t => t.DoctorId).Select(
-                    g => new
-                    {
-                        DoctorId = g.Key,
+                //join doctorWorkLoad in _doctorWorkloadRepository.Where(t => t.TrialId == trialId && t.DataFrom == (int)WorkLoadFromStatus.FinalConfirm).GroupBy(t => t.DoctorId).Select(
+                //    g => new
+                //    {
+                //        DoctorId = g.Key,
 
-                        Training = g.Sum(t => t.Training),
-                        Downtime = g.Sum(t => t.Downtime),
-                        Timepoint = g.Sum(t => t.Timepoint),
-                        TimepointIn24H = g.Sum(t => t.TimepointIn24H),
-                        TimepointIn48H = g.Sum(t => t.TimepointIn48H),
-                        Global = g.Sum(t => t.Global),
-                        Adjudication = g.Sum(t => t.Adjudication),
-                        AdjudicationIn24H = g.Sum(t => t.AdjudicationIn24H),
-                        AdjudicationIn48H = g.Sum(t => t.AdjudicationIn48H),
-                        RefresherTraining = g.Sum(t => t.RefresherTraining)
-                    }
+                //        Training = g.Sum(t => t.Training),
+                //        Downtime = g.Sum(t => t.Downtime),
+                //        Timepoint = g.Sum(t => t.Timepoint),
+                //        TimepointIn24H = g.Sum(t => t.TimepointIn24H),
+                //        TimepointIn48H = g.Sum(t => t.TimepointIn48H),
+                //        Global = g.Sum(t => t.Global),
+                //        Adjudication = g.Sum(t => t.Adjudication),
+                //        AdjudicationIn24H = g.Sum(t => t.AdjudicationIn24H),
+                //        AdjudicationIn48H = g.Sum(t => t.AdjudicationIn48H),
+                //        RefresherTraining = g.Sum(t => t.RefresherTraining)
+                //    }
 
-                ) on intoGroup.DoctorId equals doctorWorkLoad.DoctorId into tt //连接为了得到入组时间
-                from doctorWorkLoad in tt.DefaultIfEmpty()//不是每个医生都有工作量          
+                //) on intoGroup.DoctorId equals doctorWorkLoad.DoctorId into tt //连接为了得到入组时间
+                //from doctorWorkLoad in tt.DefaultIfEmpty()//不是每个医生都有工作量          
 
                 select new WorkLoadAndAgreementDTO()
                 {
@@ -241,19 +241,19 @@ namespace IRaCIS.Application.Services
                     ReviewerReadingType = intoGroup.ReviewerReadingType,
                     AgreementPath = attachment.Path,
 
-                    Timepoint = doctorWorkLoad.Timepoint,
-                    TimepointIn24H = doctorWorkLoad.TimepointIn24H,
-                    TimepointIn48H = doctorWorkLoad.TimepointIn48H,
+                    //Timepoint = doctorWorkLoad.Timepoint,
+                    //TimepointIn24H = doctorWorkLoad.TimepointIn24H,
+                    //TimepointIn48H = doctorWorkLoad.TimepointIn48H,
 
-                    Adjudication = doctorWorkLoad.Adjudication,
-                    AdjudicationIn24H = doctorWorkLoad.AdjudicationIn24H,
-                    AdjudicationIn48H = doctorWorkLoad.AdjudicationIn48H,
+                    //Adjudication = doctorWorkLoad.Adjudication,
+                    //AdjudicationIn24H = doctorWorkLoad.AdjudicationIn24H,
+                    //AdjudicationIn48H = doctorWorkLoad.AdjudicationIn48H,
 
-                    Global = doctorWorkLoad.Global,
+                    //Global = doctorWorkLoad.Global,
 
-                    RefresherTraining = doctorWorkLoad.RefresherTraining,
-                    TrainingTimes = doctorWorkLoad.Training,
-                    Downtime = doctorWorkLoad.Downtime
+                    //RefresherTraining = doctorWorkLoad.RefresherTraining,
+                    //TrainingTimes = doctorWorkLoad.Training,
+                    //Downtime = doctorWorkLoad.Downtime
 
                 };