SPM 流程配置以及修改

IRaCIS.Core.Application/Service/Allocation/Interface/IVisitTaskService.cs

@@ -14,7 +14,7 @@ namespace IRaCIS.Core.Application.Service
     {
         Task<IResponseOutput> ApplyReReading(ApplyReReadingCommand applyReReadingCommand);
 
-        Task<IResponseOutput> ConfirmReReading(ConfirmReReadingCommand agreeReReadingCommand, [FromServices] IVisitTaskHelpeService _visitTaskCommonService);
+        Task<IResponseOutput> ConfirmReReading(ConfirmReReadingCommand agreeReReadingCommand);
 
         Task<PageOutput<IRUnReadSubjectView>> GetSubjectReadingIQueryable(GetReadingIQueryableInDto inDto);
     }

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

@@ -8,6 +8,7 @@ using IRaCIS.Application.Contracts;
 using IRaCIS.Core.Application.Contracts;
 using IRaCIS.Core.Application.Filter;
 using IRaCIS.Core.Application.ViewModel;
+using IRaCIS.Core.Domain.Models;
 using IRaCIS.Core.Domain.Share;
 using IRaCIS.Core.Domain.Share.Reading;
 using IRaCIS.Core.Infra.EFCore.Common;
@@ -48,6 +49,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
     IRepository<TaskInfluence> _taskInfluenceRepository,
     IRepository<TrialQCQuestionAnswer> _trialQCQuestionAnswerRepository,
     ILogger<VisitTaskService> _logger,
+    IVisitTaskHelpeService _visitTaskCommonService,
     IRepository<SubjectCriteriaEvaluationVisitStudyFilter> _subjectCriteriaEvaluationVisitStudyFilterRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IVisitTaskService
 {
 
@@ -1249,7 +1251,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
 
     [HttpPost]
     [UnitOfWork]
-    public async Task<IResponseOutput> AIRReReading(AIRReReadingCommand command, [FromServices] IVisitTaskHelpeService _visitTaskCommonService)
+    public async Task<IResponseOutput> AIRReReading(AIRReReadingCommand command)
     {
         var baseLineTaskList = await _visitTaskRepository.Where(t => t.TrialId == command.TrialId && t.TrialReadingCriterionId == command.TrialReadingCriterionId && t.DoctorUserId == _userInfo.Id
              && t.TaskState == TaskState.Effect && t.ReadingCategory == ReadingCategory.Visit && t.ReadingTaskState == ReadingTaskState.HaveSigned && t.SourceSubjectVisit.IsBaseLine == true).ToListAsync();
@@ -1294,9 +1296,8 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
         {
             TrialId = command.TrialId,
             RequestReReadingResultEnum = RequestReReadingResult.Agree,
-            //ConfirmReReadingList = new List<ConfirmReReadingDTO>() { new ConfirmReReadingDTO() { Id = requestRecord.Id, OriginalReReadingTaskId = task.Id } }
             ConfirmReReadingList = requestRecordList.Select(t => new ConfirmReReadingDTO() { Id = t.Id, OriginalReReadingTaskId = t.OriginalReReadingTaskId }).ToList()
-        }, _visitTaskCommonService);
+        });
 
         return ResponseOutput.Ok();
 
@@ -1315,7 +1316,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
 
     public async Task<IResponseOutput> ApplyReReading(ApplyReReadingCommand applyReReadingCommand)
     {
-
+        var trialId = applyReReadingCommand.TrialId;
 
         var taskList = await _visitTaskRepository.Where(t => applyReReadingCommand.TaskIdList.Contains(t.Id), true).ToListAsync();
 
@@ -1334,7 +1335,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
                 throw new BusinessValidationFailedException(_localizer["VisitTask_BackendData"]);
             }
 
-            _logger.LogError("重阅申请状态"+ (int)task.ReReadingApplyState);
+            _logger.LogError("重阅申请状态" + (int)task.ReReadingApplyState);
 
             if (task.ReReadingApplyState == ReReadingApplyState.DocotorHaveApplyed || task.ReReadingApplyState == ReReadingApplyState.TrialGroupHaveApplyed || task.ReReadingApplyState == ReReadingApplyState.Agree)
             {
@@ -1383,7 +1384,8 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
 
 
             }
-            if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.IndependentReviewer)
+
+            else if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.IndependentReviewer)
             {
                 task.ReReadingApplyState = ReReadingApplyState.DocotorHaveApplyed;
 
@@ -1478,7 +1480,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
             }
 
             //AIR  不加验证
-            if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.AIR)
+            else if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.AIR)
             {
                 task.ReReadingApplyState = ReReadingApplyState.DocotorHaveApplyed;
             }
@@ -1506,6 +1508,30 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
 
         await _visitTaskRepository.SaveChangesAsync();
 
+        #region 处理SPM 是否参与审批流程
+
+        var isSPMJoinReReadingApproval = _trialRepository.Any(t => t.Id == trialId && t.IsSPMJoinReReadingApproval);
+
+        var hasSPMOrCPM = await _trialRepository.Where(t => t.Id == trialId).SelectMany(t => t.TrialUserList).AnyAsync(t => t.User.UserTypeEnum == UserTypeEnum.SPM || t.User.UserTypeEnum == UserTypeEnum.CPM);
+
+        var isSPMjoin = isSPMJoinReReadingApproval && hasSPMOrCPM;
+
+        if (!isSPMjoin && IsPMOrAPm())
+        {
+            var requestRecordList = await _visitTaskReReadingRepository.Where(t => applyReReadingCommand.TaskIdList.Contains(t.OriginalReReadingTaskId) && t.RequestReReadingUserId == _userInfo.Id).ToListAsync();
+
+            await ConfirmReReading(new ConfirmReReadingCommand()
+            {
+                TrialId = trialId,
+                RequestReReadingResultEnum = RequestReReadingResult.Agree,
+                ConfirmReReadingList = requestRecordList.Select(t => new ConfirmReReadingDTO() { Id = t.Id, OriginalReReadingTaskId = t.OriginalReReadingTaskId }).ToList()
+            });
+        }
+
+        #endregion
+
+
+
         return ResponseOutput.Ok();
     }
 
@@ -1579,13 +1605,12 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
     /// 确认重阅与否  1同意 2 拒绝
     /// </summary>
     /// <param name="agreeReReadingCommand"></param>
-    /// <param name="_visitTaskCommonService"></param>
     /// <returns></returns>
     [HttpPost]
     [UnitOfWork]
     [TrialGlobalLimit("AfterStopCannNotOpt")]
 
-    public async Task<IResponseOutput> ConfirmReReading(ConfirmReReadingCommand agreeReReadingCommand, [FromServices] IVisitTaskHelpeService _visitTaskCommonService)
+    public async Task<IResponseOutput> ConfirmReReading(ConfirmReReadingCommand agreeReReadingCommand)
     {
 
         var trialId = agreeReReadingCommand.TrialId;
@@ -1628,7 +1653,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
             if (criterionConfig.CriterionType == CriterionType.RECIST1Point1 && criterionConfig.IsAdditionalAssessment)
             {
                 // PM申请 SPM / CPM审批
-                if (visitTaskReReadingAppply.RequestReReadingType == RequestReReadingType.TrialGroupApply && (IsSpmOrCPM()))
+                if (visitTaskReReadingAppply.RequestReReadingType == RequestReReadingType.TrialGroupApply)
                 {
                     filterExpression = filterExpression.And(t => t.TrialReadingCriterionId == origenalTask.TrialReadingCriterionId || t.TrialReadingCriterion.CriterionType == CriterionType.RECIST1Pointt1_MB);
                 }
@@ -1660,7 +1685,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
             if (agreeReReadingCommand.RequestReReadingResultEnum == RequestReReadingResult.Agree)
             {
                 //PM申请   SPM / CPM审批   回退访视，因此这里不生成访视任务  影响多个标准的任务
-                if (visitTaskReReadingAppply.RequestReReadingType == RequestReReadingType.TrialGroupApply && (IsSpmOrCPM()))
+                if (visitTaskReReadingAppply.RequestReReadingType == RequestReReadingType.TrialGroupApply)
                 {
 
                     // 不管有序 无序  都会  回退访视
@@ -2554,6 +2579,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
         return _userInfo.UserTypeEnumInt == (int)UserTypeEnum.ProjectManager || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.APM;
     }
 
+
     private bool IsSpmOrCPM()
     {
         return _userInfo.UserTypeEnumInt == (int)UserTypeEnum.SPM || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.CPM;