修改稽查

IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs

@@ -577,7 +577,8 @@ namespace IRaCIS.Core.Application.Service.Allocation
 
                     //给Subject分配医生的时候， 未确认绑定关系的
                     DoctorUserList = t.SubjectDoctorList.Where(t => isJudge ? t.ArmEnum == Arm.JudgeArm : t.ArmEnum != Arm.JudgeArm).Where(t => t.OrignalSubjectUserId == null).Select(t => new { t.DoctorUserId, t.ArmEnum }),
-                    IsApplyed = t.SubjectDoctorList.Where(t => isJudge ? t.ArmEnum == Arm.JudgeArm : t.ArmEnum != Arm.JudgeArm).Where(t => t.OrignalSubjectUserId == null).SelectMany(t => t.SubjectArmVisitTaskList).Any(c => c.DoctorUserId != null)
+                    //IsApplyed = t.SubjectDoctorList.Where(t => isJudge ? t.ArmEnum == Arm.JudgeArm : t.ArmEnum != Arm.JudgeArm).Where(t => t.OrignalSubjectUserId == null).SelectMany(t => t.SubjectArmVisitTaskList).Any(c => c.DoctorUserId != null)
+                    IsApplyed=false
                 }).ToList();
 
             //已产生任务的Subject数量（裁判情况下，就是产生裁判任务Subject 的数量）

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

@@ -35,7 +35,7 @@ namespace IRaCIS.Core.Application.Service
                  .ForMember(o => o.SelfApplyedTaskCount, t => t.MapFrom(u => u.Trial.VisitTaskList.Count(t => t.DoctorUserId == u.DoctorUserId)))
                  .ForMember(o => o.ApplyedTotalTaskCount, t => t.MapFrom(u => u.Trial.VisitTaskList.Count(t => t.DoctorUserId != null)))
 
-                 .ForMember(o => o.SelfApplyedSubjectCount, t => t.MapFrom(u => u.Trial.SubjectDoctorUserList.Where(t => t.DoctorUserId == u.DoctorUserId && t.SubjectArmVisitTaskList.Any(c => c.DoctorUserId != null)).Count()))
+                 //.ForMember(o => o.SelfApplyedSubjectCount, t => t.MapFrom(u => u.Trial.SubjectDoctorUserList.Where(t => t.DoctorUserId == u.DoctorUserId && t.SubjectArmVisitTaskList.Any(c => c.DoctorUserId != null)).Count()))
                  .ForMember(o => o.SelfSubjectCount, t => t.MapFrom(u => u.Trial.SubjectDoctorUserList.Where(t => t.DoctorUserId == u.DoctorUserId).Count()))
 
                  .ForMember(o => o.ApplyedTotalSubjectCount, t => t.MapFrom(u => u.Trial.SubjectList.Count(c => c.SubjectVisitTaskList.Any(d => d.DoctorUserId != null))))
@@ -43,10 +43,10 @@ namespace IRaCIS.Core.Application.Service
 
 
                  //该医生未应用Subject 数量
-                 .ForMember(o => o.WaitApplySelfSubjectCount, t => t.MapFrom(u =>
+                 //.ForMember(o => o.WaitApplySelfSubjectCount, t => t.MapFrom(u =>
-                  subjectIdList.Count == 0 ? u.Trial.SubjectDoctorUserList.Where(t => t.DoctorUserId == u.DoctorUserId && t.SubjectArmVisitTaskList.Where(t => isJudgeDoctor ? t.ArmEnum == Arm.JudgeArm : t.ArmEnum != Arm.JudgeArm).Any(c => c.DoctorUserId == null)).Count()
+                 // subjectIdList.Count == 0 ? u.Trial.SubjectDoctorUserList.Where(t => t.DoctorUserId == u.DoctorUserId && t.SubjectArmVisitTaskList.Where(t => isJudgeDoctor ? t.ArmEnum == Arm.JudgeArm : t.ArmEnum != Arm.JudgeArm).Any(c => c.DoctorUserId == null)).Count()
-                  : u.Trial.SubjectDoctorUserList.Where(t => t.DoctorUserId == u.DoctorUserId && subjectIdList.Contains(t.SubjectId) && t.SubjectArmVisitTaskList.Where(t => isJudgeDoctor ? t.ArmEnum == Arm.JudgeArm : t.ArmEnum != Arm.JudgeArm).Any(c => c.DoctorUserId == null)).Count()
+                 // : u.Trial.SubjectDoctorUserList.Where(t => t.DoctorUserId == u.DoctorUserId && subjectIdList.Contains(t.SubjectId) && t.SubjectArmVisitTaskList.Where(t => isJudgeDoctor ? t.ArmEnum == Arm.JudgeArm : t.ArmEnum != Arm.JudgeArm).Any(c => c.DoctorUserId == null)).Count()
-                  ))
+                 // ))
 
 
                  .ForMember(o => o.WaitApplyTotalSubjectCount, t => t.MapFrom(u =>
@@ -54,10 +54,10 @@ namespace IRaCIS.Core.Application.Service
                   : u.Trial.SubjectList.Where(t => subjectIdList.Contains(t.Id) && t.SubjectVisitTaskList.Where(t => isJudgeDoctor ? t.ArmEnum == Arm.JudgeArm : t.ArmEnum != Arm.JudgeArm).Any(c => c.DoctorUserId == null)).Count()
                  ))
 
-                 .ForMember(o => o.WaitApplySelfTaskCount, t => t.MapFrom(u =>
+                 //.ForMember(o => o.WaitApplySelfTaskCount, t => t.MapFrom(u =>
-                 subjectIdList.Count == 0 ? u.Trial.SubjectDoctorUserList.Where(d => d.DoctorUserId == u.DoctorUserId).SelectMany(t => t.SubjectArmVisitTaskList.Where(t => isJudgeDoctor ? t.ArmEnum == Arm.JudgeArm : t.ArmEnum != Arm.JudgeArm).Where(t => t.DoctorUserId == null)).Count()
+                 //subjectIdList.Count == 0 ? u.Trial.SubjectDoctorUserList.Where(d => d.DoctorUserId == u.DoctorUserId).SelectMany(t => t.SubjectArmVisitTaskList.Where(t => isJudgeDoctor ? t.ArmEnum == Arm.JudgeArm : t.ArmEnum != Arm.JudgeArm).Where(t => t.DoctorUserId == null)).Count()
-                 : u.Trial.SubjectDoctorUserList.Where(d => d.DoctorUserId == u.DoctorUserId && subjectIdList.Contains(d.SubjectId)).SelectMany(t => t.SubjectArmVisitTaskList.Where(t => isJudgeDoctor ? t.ArmEnum == Arm.JudgeArm : t.ArmEnum != Arm.JudgeArm).Where(t => t.DoctorUserId == null)).Count()
+                 //: u.Trial.SubjectDoctorUserList.Where(d => d.DoctorUserId == u.DoctorUserId && subjectIdList.Contains(d.SubjectId)).SelectMany(t => t.SubjectArmVisitTaskList.Where(t => isJudgeDoctor ? t.ArmEnum == Arm.JudgeArm : t.ArmEnum != Arm.JudgeArm).Where(t => t.DoctorUserId == null)).Count()
-                                                                ))
+                 //                                               ))
 
                   .ForMember(o => o.WaitApplyTotalTaskCount, t => t.MapFrom(u =>
                          subjectIdList.Count == 0 ? u.Trial.VisitTaskList.Where(t => isJudgeDoctor ? t.ArmEnum == Arm.JudgeArm : t.ArmEnum != Arm.JudgeArm).Where(t => t.DoctorUserId == null).Count()
@@ -93,7 +93,7 @@ namespace IRaCIS.Core.Application.Service
 
 
             CreateMap<SubjectUser, SubjectUserDTO>().IncludeBase<SubjectUser, SubjectUserView>()
-             .ForMember(o => o.IsHaveReading, t => t.MapFrom(u => u.SubjectArmVisitTaskList.Any(t => t.ReadingTaskState != ReadingTaskState.WaitReading)));
+             /*.ForMember(o => o.IsHaveReading, t => t.MapFrom(u => u.SubjectArmVisitTaskList.Any(t => t.ReadingTaskState != ReadingTaskState.WaitReading)))*/;
 
 
             CreateMap<SubjectVisit, VisitGenerataTaskDTO>();

IRaCIS.Core.Application/Triggers/AddSubjectTrigger.cs

@@ -52,6 +52,7 @@ namespace IRaCIS.Core.Application.Triggers
 
 
                 await _subjectVisitRepository.AddRangeAsync(svList);
+
                 await _subjectVisitRepository.SaveChangesAsync();
 
                 #region 在f访视计划确认的时候处理 给subject添加访视计划

IRaCIS.Core.Domain/Allocation/SubjectUser.cs

@@ -69,12 +69,13 @@ namespace IRaCIS.Core.Domain.Models
 		public Guid? OrignalSubjectUserId { get; set; }
 
         //Parent
+        [ForeignKey("OrignalSubjectUserId")]
 		public SubjectUser OrignalSubjectUser { get; set; }
 
 		//ChildList
 		public List<SubjectUser> EarlierSubjectUserList { get; set; }
 
-		public List<VisitTask> SubjectArmVisitTaskList { get; set; }
+        //public List<VisitTask> SubjectArmVisitTaskList { get; set; }
 
 
     }

IRaCIS.Core.Domain/Allocation/VisitTask.cs

@@ -105,7 +105,10 @@ namespace IRaCIS.Core.Domain.Models
 
         [ForeignKey("JudgeVisitTaskId")]
         public VisitTask JudgeVisitTask { get; set; }
-        public SubjectUser SujectArm { get; set; }
+
+        //public SubjectUser SujectArm { get; set; }
+
+
         public Subject Subject { get; set; }
 
 

IRaCIS.Core.Domain/Visit/Subject.cs

@@ -20,7 +20,7 @@ namespace IRaCIS.Core.Domain.Models
         public List<VisitTask> SubjectVisitTaskList { get; set; } = new List<VisitTask>();
         [JsonIgnore]
         public List<ReadModule> ReadModuleList { get; set; }
-
+        [JsonIgnore]
         public List<SubjectCanceDoctor> SubjectCanceDoctorList { get; set; }
 
 

IRaCIS.Core.Domain/Visit/SubjectCanceDoctor.cs

@@ -16,7 +16,7 @@ namespace IRaCIS.Core.Domain.Models
 	 public class SubjectCanceDoctor : Entity, IAuditAdd
 	 {
 	 
-
+		public Subject Subject { get; set; }
 		public Guid CreateUserId { get; set; }
 
 		public DateTime CreateTime { get; set; }

IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs

@@ -751,7 +751,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                 await InsertInspection<Subject>(entity, type, x => new InspectionConvertDTO()
                 {
                     SubjectId = x.Id,
-                    //SubjectCode = x.Code,
+                    SubjectCode = x.Code,
                 }, new
                 {
                     FinalSubjectVisitName = finalSubjectVisitName,
@@ -947,7 +947,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
 
                     ObjectRelationParentId2 = entity.DoctorUserId
 
-                });
+                },new { ArmToTask =entity.ArmEnum});
             }
 
             //任务

IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs

@@ -97,7 +97,11 @@ namespace IRaCIS.Core.Infra.EFCore
 
             modelBuilder.Entity<TaskMedicalReviewRule>().HasMany(t => t.TaskMedicalReviewList).WithOne(t => t.TaskMedicalReviewRule).HasForeignKey(t => new { t.DoctorUserId, t.TrialId }).HasPrincipalKey(u => new { u.DoctorUserId, u.TrialId });
 
-            modelBuilder.Entity<SubjectUser>().HasMany(t => t.SubjectArmVisitTaskList).WithOne(t => t.SujectArm).HasForeignKey(t => new { t.SubjectId, t.ArmEnum }).HasPrincipalKey(u => new { u.SubjectId, u.ArmEnum });
+            //会导致级联删除  
+            //modelBuilder.Entity<SubjectUser>().HasMany(t => t.SubjectArmVisitTaskList).WithOne(t => t.SujectArm).HasForeignKey(t => new { t.SubjectId, t.ArmEnum }).HasPrincipalKey(u => new { u.SubjectId, u.ArmEnum })
+            //    ./*IsRequired(false)*/OnDelete(DeleteBehavior.NoAction);
+
+            // modelBuilder.Entity<VisitTask>().HasOne(t => t.SujectArm).WithMany(s => s.SubjectArmVisitTaskList).HasForeignKey(t => new { t.SubjectId, t.ArmEnum }).HasPrincipalKey(u => new { u.SubjectId, u.ArmEnum });
 
             modelBuilder.Entity<VisitTask>().HasMany(t => t.JudgeVisitList).WithOne(t => t.JudgeVisitTask);
 
@@ -467,8 +471,8 @@ namespace IRaCIS.Core.Infra.EFCore
 
         public async Task AddAudit()
         {
-            try
+            //try
-            {
+            //{
                 //触发器里面提交事务 业务方法里面提交事务 会记录两次
                 var inspectionGeneralIdList = ChangeTracker.Entries().Where(t => typeof(DataInspection).IsAssignableFrom(t.Entity.GetType())).Select(t => ((DataInspection)t.Entity).GeneralId).ToList();
 
@@ -478,12 +482,12 @@ namespace IRaCIS.Core.Infra.EFCore
                 AuditingData auditingData = new AuditingData(this, _userInfo);
 
                 await auditingData.IncomingEntitys(entities);
-            }
+            //}
-            catch (Exception)
+            //catch (Exception)
-            {
+            //{
 
 
-            }
+            //}
 
         }