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

@@ -2568,27 +2568,9 @@ namespace IRaCIS.Core.Infra.EFCore.Common
             }
 
 
-			foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(SubjectCanceDoctor)))
-			{
-				var type = GetEntityAuditOpt(item);
 
-				var entity = item.Entity as SubjectCanceDoctor;
+            //申请重阅记录表
-
+            foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(VisitTaskReReading)))
-				await InsertInspection<SubjectCanceDoctor>(entity, type, x => new InspectionConvertDTO()
-				{
-
-					ObjectRelationParentId = entity.SubjectId,
-
-
-					ObjectRelationParentId3 = entity.TrialReadingCriterionId,
-
-				}, new { });
-			}
-
-
-
-			//申请重阅记录表
-			foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(VisitTaskReReading)))
             {
                 var type = GetEntityAuditOpt(item);
 
@@ -2596,7 +2578,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
 
                 var extraIdentification = string.Empty;
 
-                var reason = entity.RequestReReadingReason;
+
                 switch (_userInfo.RequestUrl)
                 {
                     case "VisitTask/applyReReading":
@@ -2614,9 +2596,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                         {
                             extraIdentification = "/" + 2;
                         }
-                        reason = entity.RequestReReadingRejectReason;
 
-						if (entity.RequestReReadingResultEnum == RequestReReadingResult.Agree)
+                        if (entity.RequestReReadingResultEnum == RequestReReadingResult.Agree)
                         {
                             extraIdentification = extraIdentification+"/" + 1;
 
@@ -2633,7 +2614,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                 {
                     VisitTaskId = entity.OriginalReReadingTaskId,
 
-                    Reason = reason,
+                    Reason = entity.RequestReReadingReason,
 
                     ObjectRelationParentId = entity.OriginalReReadingTaskId,
 
@@ -3144,14 +3125,11 @@ namespace IRaCIS.Core.Infra.EFCore.Common
 
                 var entity = item.Entity as VisitTask;
 				var userRealName = await _dbContext.User.Where(x => x.Id == entity.DoctorUserId).Select(x => x.FullName).FirstOrDefaultAsync();
-                VisitTaskAuditingDto obj = new VisitTaskAuditingDto()
+				object obj = new  { UserRealName= userRealName };
-                {
-                    UserRealName = userRealName,
 
-                };
+                #region 标识区分
-				#region 标识区分
 
-				if (type == AuditOpt.Add)
+                if (type == AuditOpt.Add)
                 {
                     //生成一致性分析任务
                     if (entity.IsSelfAnalysis == true)
@@ -3214,8 +3192,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                 {
                     //跳转阅片结果需要该参数
                     var subjectCode = _dbContext.Subject.Where(t => t.Id == entity.SubjectId).Select(t => t.Code).First();
-
+                    obj = new { SubjectCode = subjectCode };
-					obj.SubjectCode=subjectCode;
                 }
 
                 #region 裁判、肿瘤学、全局 都是通用的
@@ -3231,9 +3208,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                     var r1 = list.Where(t => t.ArmEnum == Arm.DoubleReadingArm1).FirstOrDefault();
                     var r2 = list.Where(t => t.ArmEnum == Arm.DoubleReadingArm2).FirstOrDefault();
 
-                    obj.R1 = r1.FullName; 
+
-                    obj.R2 = r2.FullName;
+                    obj = new { R1 = r1.FullName, R2 = r2.FullName, SelectResult = r1.Id == entity.JudgeResultTaskId ? "R1" : "R2" };
-                    obj.SelectResult = r1.Id == entity.JudgeResultTaskId ? "R1" : "R2";
                 }
 
 
@@ -3316,15 +3292,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common
 
                 #endregion
 
-                if (entity.SouceReadModuleId != null)
-                {
-                    var subjectVisitId = await _dbContext.ReadModule.Where(x => x.Id == entity.SouceReadModuleId).Select(x => x.SubjectVisitId).FirstOrDefaultAsync();
 
-                    obj.CutOffVisitName = await _dbContext.SubjectVisit.Where(x => x.Id == subjectVisitId).Select(x => x.BlindName).FirstOrDefaultAsync();
+                await InsertInspection<VisitTask>(entity, type, x => new InspectionConvertDTO()
-
-				}
-
-				await InsertInspection<VisitTask>(entity, type, x => new InspectionConvertDTO()
                 {
                     VisitTaskId = x.Id,
 

IRaCIS.Core.Infra.EFCore/Common/Dto/SetDictionaryValueDto.cs

@@ -120,20 +120,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common.Dto
         public object CommonData { get; set; }
     }
 
-    public class VisitTaskAuditingDto
-    {
-		public string UserRealName { get; set; }
 
-		public string SubjectCode { get; set; }
-
-		public string R1 { get; set; }
-
-		public string R2 { get; set; }
-
-		public string CutOffVisitName { get; set; }
-
-		public string SelectResult { get; set; }
-	}
     public class InspectionConvertDTO : DataInspection
     {
         /// <summary>