修改分配规则

2022-06-08 14:22:38 +08:00
parent dbdcde2d0b
commit 404dc13001
14 changed files with 261 additions and 99 deletions
@@ -29,8 +29,31 @@ namespace IRaCIS.Core.Application.ViewModel

        public int? SelfTaskCount { get; set; }

+
+        public List<int> ArmList { get; set; }
+
    }

+    public class AllocateInfo
+    {
+        public int? TotalTaskCount { get; set; }
+
+        public int? SelfTaskCount { get; set; }
+
+        public int PlanReadingRatio { get; set; }
+
+        public Guid DoctorUserId { get; set; }
+
+        public List<int> ArmList { get; set; }
+
+        //public double? TargetCount => TotalTaskCount * PlanReadingRatio * 0.01;
+
+        //public double? Diff => TargetCount - SelfTaskCount;
+
+
+    }
+
+
    ///<summary>TaskAllocationRuleQuery  列表查询参数模型</summary>
    public class TaskAllocationRuleQuery
    {
@@ -16,10 +16,19 @@ namespace IRaCIS.Core.Application.Service
                 .ForMember(o => o.UserName, t => t.MapFrom(u => u.DoctorUser.UserName))
                 .ForMember(o => o.FullName, t => t.MapFrom(u => u.DoctorUser.FullName))
                 .ForMember(o => o.UserTypeShortName, t => t.MapFrom(u => u.DoctorUser.UserTypeRole.UserTypeShortName))
+                 .ForMember(o => o.ArmList, t => t.MapFrom(u => u.VisitTaskList.Select(t=>t.ArmEnum).Distinct()))
                 .ForMember(o => o.TotalTaskCount, t => t.MapFrom(u => u.Trial.VisitTaskList.Count()))
                 .ForMember(o => o.SelfTaskCount, t => t.MapFrom(u => u.Trial.VisitTaskList.Count(t=>t.DoctorUserId==u.DoctorUserId)));

-            
+            CreateMap<TaskAllocationRule, AllocateInfo>()
+                 .ForMember(o => o.ArmList, t => t.MapFrom(u => u.VisitTaskList.Select(t => t.ArmEnum).Distinct()))
+                .ForMember(o => o.TotalTaskCount, t => t.MapFrom(u => u.Trial.VisitTaskList.Count()))
+
+                .ForMember(o => o.SelfTaskCount, t => t.MapFrom(u => u.Trial.VisitTaskList.Count(t => t.DoctorUserId == u.DoctorUserId)));
+
+
+
+
            CreateMap<VisitTask, VisitTaskView>()
                 .ForMember(o => o.SiteId, t => t.MapFrom(u => u.Subject.SiteId))
                 .ForMember(o => o.TrialSiteCode, t => t.MapFrom(u => u.Subject.TrialSite.TrialSiteCode))