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 @@ + + + 复制既往新病灶答案 + + + 从上传文件中获取Datatable @@ -6838,6 +6844,15 @@ + + + 复制历史答案到当前任务 + + + + + + 获取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()); } 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 /// /// - Task CopyHistoryAnswer(VisitTask taskinfo, List tableRowList, List tableAnswerList) + Task CopyHistoryAnswer(VisitTask taskinfo, List tableRowList, List tableAnswerList); /// /// 获取ReadingCalculateDto