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

无序修改字段类型
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
hang
2024-05-16 14:54:34 +08:00
parent 4552a24caa
commit a93bbebb61
22 changed files with 46 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs
+4 -4
View File
@@ -208,7 +208,7 @@ namespace IRaCIS.Core.Application.Service
}
else
{
if (trialReadingCriterionConfig.IsReadingTaskViewInOrder)
if (trialReadingCriterionConfig.IsReadingTaskViewInOrder == ReadingOrder.InOrder)
{
blindTaskName = visitBlindConfig.BlindFollowUpPrefix + " " + visitNumList.IndexOf(subjectVisit.VisitNum);
}
@@ -675,7 +675,7 @@ namespace IRaCIS.Core.Application.Service
}
else
{
if (trialReadingCriterionConfig.IsReadingTaskViewInOrder)
if (trialReadingCriterionConfig.IsReadingTaskViewInOrder == ReadingOrder.InOrder)
{
blindTaskName = visitBlindConfig.BlindFollowUpPrefix + " " + visitNumList.IndexOf(subjectVisit.VisitNum);
}
@@ -785,7 +785,7 @@ namespace IRaCIS.Core.Application.Service
#region 后续访视 未分配的进行再次分配，重置的或者失效的 需要重新生成新的任务 (PM 有序退回 或者PM 有序 申请重阅)
if (trialReadingCriterionConfig.IsReadingTaskViewInOrder)
if (trialReadingCriterionConfig.IsReadingTaskViewInOrder == ReadingOrder.InOrder)
{
//之前有回退到影像上传的访视 那么当前访视一致性核查通过的时候，当前访视生成但是不分配出去(排除失访的)
@@ -1115,7 +1115,7 @@ namespace IRaCIS.Core.Application.Service
#region 重阅/退回的时候，需要将取消分配的访视类型的 任务重新分配
if (trialReadingCriterionConfig.IsReadingTaskViewInOrder)
if (trialReadingCriterionConfig.IsReadingTaskViewInOrder == ReadingOrder.InOrder)
{
//之前有回退到影像上传的访视 那么当前访视一致性核查通过的时候，当前访视生成但是不分配出去(排除失访的)
var beforeBackVisitTask = await _visitTaskRepository.Where(t => t.TrialId == trialId && t.SubjectId == subjectVisit.SubjectId && t.TrialReadingCriterionId == trialReadingCriterionId && t.VisitTaskNum < subjectVisit.VisitNum && t.ReadingCategory == ReadingCategory.Visit && t.SourceSubjectVisit.CheckState != CheckStateEnum.CVPassed && t.SourceSubjectVisit.IsLostVisit == false).OrderBy(t => t.VisitTaskNum).FirstOrDefaultAsync();