From 293865fc3f77e645dda114b6707cda04cc7a4655 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Mon, 6 Jan 2025 11:41:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A8=BD=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Document/TrialDocumentService.cs  |  2 +-
 .../Common/AuditingData.cs                    | 32 ++++++++++++-------
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs b/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs
index 3d0c2900a..a54254dba 100644
--- a/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs
+++ b/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs
@@ -433,7 +433,7 @@ namespace IRaCIS.Core.Application.Services
                        .CountAsync();
 
 
-            var needSignSystemDocCount = await _systemDocumentRepository
+            var needSignSystemDocCount = await _systemDocumentRepository.AsQueryable(true)
                       .Where(t => t.IsDeleted == false && !t.SystemDocConfirmedUserList.Any(t => t.ConfirmUserId == _userInfo.IdentityUserId && t.ConfirmTime != null) && t.NeedConfirmedUserTypeList.Any(u => u.NeedConfirmUserTypeId == _userInfo.UserTypeId))
                       .CountAsync();
 
diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
index e04dc12d7..fc7f14bd2 100644
--- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
+++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
@@ -3000,12 +3000,13 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                 await InsertInspection<ReadingTaskQuestionMark>(entity, type, x => new InspectionConvertDTO()
                 {
                     VisitTaskId = entity.VisitTaskId,
-                  
+
                     ObjectRelationParentId = entity.VisitTaskId,
 
-                },new {
-                   Answer= answer,
-                   LiverSegmentation= liverSegmentation,
+                }, new
+                {
+                    Answer = answer,
+                    LiverSegmentation = liverSegmentation,
                 });
             }
 
@@ -3331,26 +3332,31 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                     UserRealName = userRealName,
 
                 };
+
+                var extraIdentification = string.Empty;
+                var isDistinctionInterface = true;
                 #region 标识区分
 
                 if (type == AuditOpt.Add)
                 {
+                    isDistinctionInterface = false;
+
                     //生成一致性分析任务
                     if (entity.IsSelfAnalysis == true)
                     {
-                        type = type + "/" + "SelfAnalysis";
+                        extraIdentification = "/SelfAnalysis";
                     }
                     else if (entity.IsSelfAnalysis == false)
                     {
-                        type = type + "/" + "GroupAnalysis";
+                        extraIdentification = "/GroupAnalysis";
                     }
                     else
                     {
-                        type = type + "/" + "NotAnalysis";
+                        extraIdentification = "/NotAnalysis";
                     }
 
                     //区分任务类型
-                    type = type + "/" + (int)entity.ReadingCategory;
+                    extraIdentification = extraIdentification + "/" + (int)entity.ReadingCategory;
 
 
                 }
@@ -3360,7 +3366,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                     {
                         //申请重阅
                         case "VisitTask/applyReReading":
-                            type = type + "/" + (int)entity.ReReadingApplyState;
+                            extraIdentification = "/" + (int)entity.ReReadingApplyState;
                             break;
 
 
@@ -3369,12 +3375,12 @@ namespace IRaCIS.Core.Infra.EFCore.Common
 
                             if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ProjectManager || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.APM)
                             {
-                                type = type + "/" + 1;
+                                extraIdentification = "/" + 1;
 
                             }
                             else
                             {
-                                type = type + "/" + 2;
+                                extraIdentification = "/" + 2;
                             }
 
                             break;
@@ -3510,7 +3516,9 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                 {
                     VisitTaskId = x.Id,
 
-                    IsDistinctionInterface = type == AuditOpt.Update ? true : false,
+                    IsDistinctionInterface = isDistinctionInterface,
+
+                    ExtraIndentification = extraIdentification,
 
                     ObjectRelationParentId = entity.SourceSubjectVisitId != null ? entity.SourceSubjectVisitId : entity.SouceReadModuleId,