x

2022-06-10 15:11:31 +08:00
parent 856898696b
commit 6f04c8ac14
4 changed files with 12 additions and 3 deletions
@@ -29,6 +29,10 @@ namespace IRaCIS.Core.Application.ViewModel

        public int? SelfTaskCount { get; set; }

+        public int? SelfSubjectCount { get; set; }
+
+        public int? TotalSubjectCount { get; set; }
+

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

@@ -101,7 +101,7 @@ namespace IRaCIS.Core.Application.Service
            {
                foreach (var doctorUserId in assginSubjectDoctorCommand.DoctorUserIdList)
                {
-                    await _subjectUserRepository.AddAsync(new SubjectUser() { SubjectId = subjectId, DoctorUserId = doctorUserId, AssignTime = DateTime.Now });
+                    await _subjectUserRepository.AddAsync(new SubjectUser() {TrialId= assginSubjectDoctorCommand.TrialId,  SubjectId = subjectId, DoctorUserId = doctorUserId, AssignTime = DateTime.Now });
                }
                await _subjectRepository.BatchUpdateNoTrackingAsync(t => t.Id == subjectId, u => new Subject() { IsAssignDoctorUser = true });

@@ -18,7 +18,9 @@ namespace IRaCIS.Core.Application.Service
                 .ForMember(o => o.UserTypeShortName, t => t.MapFrom(u => u.DoctorUser.UserTypeRole.UserTypeShortName))
                 .ForMember(o => o.ArmList, t => t.MapFrom(u => u.VisitTaskList.Where(c => c.TrialId == u.TrialId).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)));
+                 .ForMember(o => o.SelfTaskCount, t => t.MapFrom(u => u.Trial.VisitTaskList.Count(t => t.DoctorUserId == u.DoctorUserId)))
+                  .ForMember(o => o.TotalSubjectCount, t => t.MapFrom(u => u.Trial.SubjectList.Count()))
+                /* .ForMember(o => o.SelfSubjectCount, t => t.MapFrom(u => u.Trial.su.Where(t => t.DoctorUserId == u.DoctorUserId).Select(t=>t.SubjectId).Distinct().Count())*/;

            CreateMap<TaskAllocationRule, AllocateInfo>()
                 .ForMember(o => o.ArmList, t => t.MapFrom(u => u.VisitTaskList.Where(c => c.TrialId == u.TrialId).Select(t => t.ArmEnum).Distinct()))