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

修改

Uat_Study
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs
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,
}) ;

6
IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs
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)
)

2
IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadModuleService.cs
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,
}) ;

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

@ -804,9 +804,9 @@ namespace IRaCIS.Core.Application.Contracts
public bool IseCRFShowInDicomReading { get; set; }
/// <summary>
/// 是否有全局阅片任务
/// 是否有阅片期
/// </summary>
public bool IsGlobalTask { get; set; } = true;
public bool IsReadingPeriod { get; set; } = true;
public string GlobalUpdateType { get; set; } = string.Empty;

2
IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
View File

@ -460,7 +460,7 @@ namespace IRaCIS.Core.Application
await _readingQuestionCriterionTrialRepository.UpdatePartialFromQueryAsync(inDto.TrialReadingCriterionId, x => new ReadingQuestionCriterionTrial()
{
ReadingTool=inDto.ReadingTool,
IsGlobalTask=inDto.IsGlobalTask,
IsReadingPeriod=inDto.IsReadingPeriod,
//DigitPlaces=inDto.DigitPlaces,
IsReadingTaskViewInOrder =inDto.IsReadingTaskViewInOrder,
ReadingTaskViewEnum = inDto.ReadingTaskViewEnum,

2
IRaCIS.Core.Application/Triggers/SubjectVisitFinalVisitTrigger.cs
View File

@ -111,7 +111,7 @@ namespace IRaCIS.Core.Application.Triggers
if (!subjectVisit.IsBaseLine)
{
var criterionList = await _repository.Where<ReadingQuestionCriterionTrial>(x => x.TrialId == trialId && x.IsConfirm && x.IsGlobalReading && x.IsReadingTaskViewInOrder).ToListAsync();
var criterionList = await _repository.Where<ReadingQuestionCriterionTrial>(x => x.TrialId == trialId && x.IsConfirm && x.IsReadingPeriod && x.IsReadingTaskViewInOrder).ToListAsync();
foreach (var item in criterionList)
{
ReadingPeriodSet? readingPeriodSet = await _readingPeriodSetRepository.FirstOrDefaultNoTrackingAsync(x => x.TrialId == trialId && x.IsGlobal && x.TrialReadingCriterionId == item.Id);

13
IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs
View File

@ -167,15 +167,18 @@ namespace IRaCIS.Core.Domain.Models
/// </summary>
public ReadingMethod ReadingType { get; set; } = ReadingMethod.Double;
/// <summary>
/// 阅片期
/// 是否有阅片期
/// </summary>
public bool IsReadingPeriod { get; set; } = true;
/// <summary>
/// 是否生成全局阅片任务
/// </summary>
public bool IsGlobalReading { get; set; } = true;
/// <summary>
/// 是否有全局阅片任务
/// </summary>
public bool IsGlobalTask { get; set; } = true;
/// <summary>
/// 仲裁阅片