XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

前端限制 界面显示，加字段

Uat_Study
hang 2023-07-17 10:41:46 +08:00
parent 2f5a4d5515
commit 366aba68ce
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs
View File

@ -235,7 +235,17 @@ namespace IRaCIS.Core.Application.Services
var isAdditionalAssessment = _readingQuestionCriterionTrialRepository.Where(t => t.TrialId == trialId && t.IsSigned && t.IsAdditionalAssessment == true 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(); &&t.TrialCriterionAdditionalAssessmentTypeList.Any(c=>/*c.AdditionalAssessmentType==Domain.Share.Reading.AdditionalAssessmentType.BrainMetastasis &&*/ c.IsSelected==true)).Any();
return ResponseOutput.Ok<PageOutput<UnionDocumentWithConfirmInfoView>>( 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<PageOutput<UnionDocumentWithConfirmInfoView>>( result, new {
NeedSignCount = needSignTrialDocCount + needSignSystemDocCount,
NeedSignTrialDocCount = needSignTrialDocCount,
NeedSignSystemDocCount = needSignSystemDocCount,
IsAllOnlySRReading= isAllOnlySRReading,
IsAdditionalAssessment = isAdditionalAssessment && isManualGenerateTask,
TrialStatusStr = trialInfo.TrialStatusStr,
TrialConfig= trialTaskConfig });
} }

4
IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs
View File

@ -750,9 +750,9 @@ namespace IRaCIS.Core.Application.Contracts
{ {
var currentUserList = siteUserList.Where(t => t.TrialSiteSurveyId == trialSiteSurveyId).ToList(); 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和影像阅片人信息");
} }
} }

2
IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
View File

@ -222,6 +222,8 @@ namespace IRaCIS.Core.Application.Contracts
public TrialQCProcess QCProcessEnum { get; set; } = TrialQCProcess.DoubleAudit; public TrialQCProcess QCProcessEnum { get; set; } = TrialQCProcess.DoubleAudit;
public bool IsImageConsistencyVerification { get; set; } = true; public bool IsImageConsistencyVerification { get; set; } = true;
public bool IsMedicalReview { get; set;}
} }
public class TrialTaskConfigView : TrialTaskConfig public class TrialTaskConfigView : TrialTaskConfig