From b38259576728054995b9271dfa851af17bb6b4a0 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Wed, 3 Dec 2025 17:53:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9EA=20=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E6=A1=86=E8=BF=94=E5=9B=9E=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IRaCIS.Core.Application.xml                   | 15 +++++++++++++++
 .../Service/Document/TrialDocumentService.cs      |  8 +++++++-
 .../Interface/IGeneralCalculateService.cs         |  2 +-
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 97d03f47e..166f4701e 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -3757,6 +3757,12 @@
             <param name="needChangeType"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.GeneralCalculateService.CopyHistoryAnswer(IRaCIS.Core.Domain.Models.VisitTask,System.Collections.Generic.List{IRaCIS.Core.Domain.Models.ReadingTableAnswerRowInfo},System.Collections.Generic.List{IRaCIS.Core.Domain.Models.ReadingTableQuestionAnswer})">
+            <summary>
+            复制既往新病灶答案
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.GeneralCalculateService.GetDataTableFromUpload(Microsoft.AspNetCore.Http.IFormFile,System.String,System.Guid)">
             <summary>
             从上传文件中获取Datatable
@@ -6838,6 +6844,15 @@
             <param name="inDto"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.IGeneralCalculateService.CopyHistoryAnswer(IRaCIS.Core.Domain.Models.VisitTask,System.Collections.Generic.List{IRaCIS.Core.Domain.Models.ReadingTableAnswerRowInfo},System.Collections.Generic.List{IRaCIS.Core.Domain.Models.ReadingTableQuestionAnswer})">
+            <summary>
+            复制历史答案到当前任务
+            </summary>
+            <param name="taskinfo"></param>
+            <param name="tableRowList"></param>
+            <param name="tableAnswerList"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.Service.IGeneralCalculateService.GetReadingCalculateDto(System.Guid)">
             <summary>
             获取ReadingCalculateDto
diff --git a/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs b/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs
index bb9bccb2b..06de4dcf3 100644
--- a/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs
+++ b/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs
@@ -906,6 +906,12 @@ namespace IRaCIS.Core.Application.Services
             //EA 只能查看内部人员文档
             var isEA = _userInfo.UserTypeEnumInt == (int)UserTypeEnum.EA;
 
+            //EA 但是没有在进行的培训记录查看权限，那么返回空数据
+            if (isEA && !_auditRecordRepository.Any(t => t.IsViewTrainingRecord && t.AuditState == AuditState.Ongoing && t.AuditRecordIdentityUserList.Any(c => c.IdentityUserId == _userInfo.IdentityUserId)))
+            {
+                return ResponseOutput.Ok();
+            }
+
             var list = _systemDocConfirmedUserRepository.Where(t => t.ConfirmTime != null)
                 .WhereIf(isEA, t => t.ConfirmUser.IsZhiZhun == true)
                 .Select(t => new { t.ConfirmUserId, t.ConfirmUser.UserName, t.ConfirmUser.FullName }).Distinct().ToList();
@@ -922,7 +928,7 @@ namespace IRaCIS.Core.Application.Services
             var isEA = _userInfo.UserTypeEnumInt == (int)UserTypeEnum.EA;
 
             //EA 但是没有在进行的培训记录查看权限，那么返回空数据
-            if (isEA && !_auditRecordRepository.Any(t => t.IsViewTrainingRecord && t.AuditState == AuditState.Ongoing))
+            if (isEA && !_auditRecordRepository.Any(t => t.IsViewTrainingRecord && t.AuditState == AuditState.Ongoing && t.AuditRecordIdentityUserList.Any(c=>c.IdentityUserId==_userInfo.IdentityUserId)))
             {
                 return ResponseOutput.Ok(new PageOutput<UnionDocumentWithConfirmInfoView>());
             }
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/Interface/IGeneralCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/Interface/IGeneralCalculateService.cs
index a1cf755b6..b9f340c7f 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/Interface/IGeneralCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/Interface/IGeneralCalculateService.cs
@@ -29,7 +29,7 @@ namespace IRaCIS.Core.Application.Service
         /// <param name="tableAnswerList"></param>
         /// <returns></returns>
 
-        Task CopyHistoryAnswer(VisitTask taskinfo, List<ReadingTableAnswerRowInfo> tableRowList, List<ReadingTableQuestionAnswer> tableAnswerList)
+        Task CopyHistoryAnswer(VisitTask taskinfo, List<ReadingTableAnswerRowInfo> tableRowList, List<ReadingTableQuestionAnswer> tableAnswerList);
 
         /// <summary>
         /// 获取ReadingCalculateDto