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

暂存

Uat_Study
hang 2023-04-06 14:17:04 +08:00
parent dc10030a67
commit e8e1142363
2 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
View File

@ -1912,6 +1912,17 @@ namespace IRaCIS.Core.Application.Service.Allocation
foreach (var influenceTask in influenceTaskList) foreach (var influenceTask in influenceTaskList)
{ {
//已签名的任务 设置转变后的标志
if (criterionConfig.CriterionType == CriterionType.IRECIST1Point1 && influenceTask.ReadingTaskState==ReadingTaskState.HaveSigned)
{
var isConvertedTask= _visitTaskRepository.Where(t => t.Id == influenceTask.Id).Select(t => t.IsConvertedTask).FirstOrDefault();
if (isConvertedTask)
{
influenceTask.IsHistoryConvertedTask = true;
}
}
//处理申请的任务 //处理申请的任务
if (influenceTask.Id == origenalTask.Id) if (influenceTask.Id == origenalTask.Id)
@ -2138,7 +2149,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
var task = (await _visitTaskRepository.Where(t => t.Id == taskId).FirstOrDefaultAsync()).IfNullThrowException(); var task = (await _visitTaskRepository.Where(t => t.Id == taskId).FirstOrDefaultAsync()).IfNullThrowException();
var criterionConfig = (await _trialReadingCriterionRepository.Where(x => x.Id == task.TrialReadingCriterionId).Select(x => new { x.ReadingTool, x.IsAutoCreate, x.IsReadingTaskViewInOrder }).FirstOrDefaultAsync()).IfNullThrowException(); var criterionConfig = (await _trialReadingCriterionRepository.Where(x => x.Id == task.TrialReadingCriterionId).Select(x => new { x.ReadingTool,x.CriterionType, x.IsAutoCreate, x.IsReadingTaskViewInOrder }).FirstOrDefaultAsync()).IfNullThrowException();
if (criterionConfig.IsAutoCreate == false) if (criterionConfig.IsAutoCreate == false)
{ {
@ -2306,6 +2317,19 @@ namespace IRaCIS.Core.Application.Service.Allocation
foreach (var influenceTask in influenceTaskList) foreach (var influenceTask in influenceTaskList)
{ {
//已签名的任务 设置转变后的标志
if (criterionConfig.CriterionType == CriterionType.IRECIST1Point1 && influenceTask.ReadingTaskState == ReadingTaskState.HaveSigned)
{
var isConvertedTask = _visitTaskRepository.Where(t => t.Id == influenceTask.Id).Select(t => t.IsConvertedTask).FirstOrDefault();
if (isConvertedTask)
{
influenceTask.IsHistoryConvertedTask = true;
}
}
//同意的访视 因为要记录具体的操作，所以废弃 //同意的访视 因为要记录具体的操作，所以废弃
if (influenceTask.Id == task.Id) if (influenceTask.Id == task.Id)
{ {
@ -2367,6 +2391,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
} }
} }
} }
#endregion #endregion

10
IRaCIS.Core.Domain/Allocation/VisitTask.cs
View File

@ -321,10 +321,6 @@ namespace IRaCIS.Core.Domain.Models
public bool IsAnalysisCreate { get; set; } public bool IsAnalysisCreate { get; set; }
///// <summary>
///// 是否是转变的任务(转为IRECIST)
///// </summary>
//public bool IsConvertedTask { get; set; } = false;
/// <summary> /// <summary>
/// 转换之前的任务Id(转化的任务才有该值) /// 转换之前的任务Id(转化的任务才有该值)
@ -342,10 +338,14 @@ namespace IRaCIS.Core.Domain.Models
&& t.ArmEnum == ArmEnum) || BeforeConvertedTaskId != null && t.ArmEnum == ArmEnum) || BeforeConvertedTaskId != null
).Any(); ).Any();
/// <summary>
/// 重阅重置任务的 标注是转化之前的 还是转化之后的
/// </summary>
public bool IsHistoryConvertedTask { get; set; } = false;
public bool? IsSelfAnalysis { get; set; } public bool? IsSelfAnalysis { get; set; }
public string BlindSubjectCode { get; set; } = string.Empty; public string BlindSubjectCode { get; set; } = string.Empty;