diff --git a/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs b/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs index 3a9acc25e..9defbfcbb 100644 --- a/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs +++ b/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs @@ -235,7 +235,17 @@ namespace IRaCIS.Core.Application.Services var isAdditionalAssessment = _readingQuestionCriterionTrialRepository.Where(t => t.TrialId == trialId && t.IsSigned && t.IsAdditionalAssessment == true &&t.TrialCriterionAdditionalAssessmentTypeList.Any(c=>/*c.AdditionalAssessmentType==Domain.Share.Reading.AdditionalAssessmentType.BrainMetastasis &&*/ c.IsSelected==true)).Any(); - return ResponseOutput.Ok>( result, new { NeedSignCount = needSignTrialDocCount + needSignSystemDocCount, NeedSignTrialDocCount = needSignTrialDocCount, NeedSignSystemDocCount = needSignSystemDocCount, IsAdditionalAssessment = isAdditionalAssessment && isManualGenerateTask, TrialStatusStr = trialInfo.TrialStatusStr,TrialConfig= trialTaskConfig }); + + var isAllOnlySRReading = _readingQuestionCriterionTrialRepository.Where(t => t.TrialId == trialId && t.IsSigned).All(t => t.ReadingDivisionEnum == ReadingDivisionEnum.OnlySR); + + return ResponseOutput.Ok>( result, new { + NeedSignCount = needSignTrialDocCount + needSignSystemDocCount, + NeedSignTrialDocCount = needSignTrialDocCount, + NeedSignSystemDocCount = needSignSystemDocCount, + IsAllOnlySRReading= isAllOnlySRReading, + IsAdditionalAssessment = isAdditionalAssessment && isManualGenerateTask, + TrialStatusStr = trialInfo.TrialStatusStr, + TrialConfig= trialTaskConfig }); } diff --git a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs index 7d5093d80..26d48ddf0 100644 --- a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs +++ b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs @@ -750,9 +750,9 @@ namespace IRaCIS.Core.Application.Contracts { var currentUserList = siteUserList.Where(t => t.TrialSiteSurveyId == trialSiteSurveyId).ToList(); - if(!currentUserList.Any(t=>t.Code=="1") || !currentUserList.Any(t => t.Code == "4")) + if(!currentUserList.Any(t=>t.Code=="1") || !currentUserList.Any(t => t.Code == "5")) { - throw new BusinessValidationFailedException("本次提交,必须有CRC和影像负责人信息"); + throw new BusinessValidationFailedException("本次提交,必须有CRC和影像阅片人信息"); } } diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs index 287b8c2ad..9da0f6e88 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs @@ -222,6 +222,8 @@ namespace IRaCIS.Core.Application.Contracts public TrialQCProcess QCProcessEnum { get; set; } = TrialQCProcess.DoubleAudit; public bool IsImageConsistencyVerification { get; set; } = true; + + public bool IsMedicalReview { get; set;} } public class TrialTaskConfigView : TrialTaskConfig