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

修改

Browse Source
This commit is contained in:
he
2022-12-19 16:10:07 +08:00
committed by {872297557@qq.com}
parent ea84e9e1a6
commit aac8a5a1ff
7 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs
+1
View File
@@ -877,6 +877,7 @@ namespace IRaCIS.Application.Services
IsMustGlobalReading = systemCriterion.IsMustGlobalReading,
IseCRFShowInDicomReading=systemCriterion.IseCRFShowInDicomReading,
IsGlobalReading = systemCriterion.IsMustGlobalReading ? true : trialCriterion.IsGlobalReading,
IsReadingPeriod = systemCriterion.IsMustGlobalReading ? true : trialCriterion.IsReadingPeriod,
}) ;
IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs
+3 -3
View File
@@ -410,7 +410,7 @@ namespace IRaCIS.Application.Services
var readModule = await _readModuleRepository.Where(x => x.SubjectVisitId == taskinfo.SourceSubjectVisitId && x.TrialReadingCriterionId == taskinfo.TrialReadingCriterionId).FirstOrDefaultAsync();
if (criterion.IsGlobalReading && !criterion.IsGlobalTask && readModule != null)
if (criterion.IsReadingPeriod && !criterion.IsGlobalReading && readModule != null)
{
return true;
}
@@ -456,7 +456,7 @@ namespace IRaCIS.Application.Services
x.IsArbitrationReading,
x.ArbitrationRule,
x.IsGlobalReading,
x.IsGlobalTask,
x.IsReadingPeriod,
}).FirstNotNullAsync();
var noteEqual = false;
@@ -676,7 +676,7 @@ namespace IRaCIS.Application.Services
(visitTask.SourceSubjectVisitId != null && criterionInfo.ArbitrationRule == ArbitrationRule.Visit)
||(visitTask.SouceReadModuleId != null && criterionInfo.ArbitrationRule == ArbitrationRule.Reading)
// 全局访视任务仲裁
||(visitTask.SourceSubjectVisitId != null && criterionInfo.ArbitrationRule == ArbitrationRule.Reading&& criterionInfo.IsGlobalReading&&!criterionInfo.IsGlobalTask)
||(visitTask.SourceSubjectVisitId != null && criterionInfo.ArbitrationRule == ArbitrationRule.Reading&& criterionInfo.IsReadingPeriod&&!criterionInfo.IsGlobalReading)
)
IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadModuleService.cs
+2
View File
@@ -115,6 +115,7 @@ namespace IRaCIS.Application.Services
x.IsReadingTaskViewInOrder,
x.IsOncologyReading,
x.IsGlobalReading,
x.IsReadingPeriod,
}).FirstNotNullAsync();
return (pageOutput, new
@@ -127,6 +128,7 @@ namespace IRaCIS.Application.Services
IsExistsVisitClinicalData = await _clinicalDataTrialSetRepository.AnyAsync(x => x.TrialId == dto.TrialId && x.ClinicalDataLevel == ClinicalLevel.SubjectVisit && x.IsConfirm),
IsExistsReadingClinicalData = await _clinicalDataTrialSetRepository.AnyAsync(x => x.TrialId == dto.TrialId && x.ClinicalDataLevel == ClinicalLevel.ImageRead && x.IsConfirm),
IsGlobalReading= criterionInfo.IsGlobalReading,
IsReadingPeriod=criterionInfo.IsReadingPeriod,
}) ;