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

修改

Uat_Study
he 2023-03-29 17:31:37 +08:00
parent c9eff0d0ac
commit cb2d6e9bdf
2 changed files with 32 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs
View File

@ -119,22 +119,22 @@ namespace IRaCIS.Core.Application.Service
var taskInfo = await _visitTaskRepository.Where(x => x.Id == taskId).IgnoreAutoIncludes().AsNoTracking().FirstNotNullAsync();
taskInfo.ReadingTaskState = ReadingTaskState.Reading;
taskInfo.IsConvertedTask = true;
//taskInfo.IsConvertedTask = true;
taskInfo.BeforeConvertedTaskId = taskId;
taskInfo.Id = NewId.NextGuid();
await _visitTaskRepository.BatchUpdateNoTrackingAsync(x =>
x.IsAnalysisCreate == taskInfo.IsAnalysisCreate
&& x.IsSelfAnalysis == taskInfo.IsSelfAnalysis
&& x.VisitTaskNum > taskInfo.VisitTaskNum
&& x.DoctorUserId == taskInfo.DoctorUserId
&& x.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId
&& x.SubjectId == taskInfo.SubjectId
&& x.ArmEnum == taskInfo.ArmEnum &&
x.TaskState == TaskState.Effect, x => new VisitTask()
{
IsConvertedTask = true
});
//await _visitTaskRepository.BatchUpdateNoTrackingAsync(x =>
// x.IsAnalysisCreate == taskInfo.IsAnalysisCreate
// && x.IsSelfAnalysis == taskInfo.IsSelfAnalysis
// && x.VisitTaskNum > taskInfo.VisitTaskNum
// && x.DoctorUserId == taskInfo.DoctorUserId
// && x.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId
// && x.SubjectId == taskInfo.SubjectId
// && x.ArmEnum == taskInfo.ArmEnum &&
// x.TaskState == TaskState.Effect, x => new VisitTask()
// {
// IsConvertedTask = true
// });
await _visitTaskRepository.AddAsync(taskInfo);
@ -1682,7 +1682,7 @@ namespace IRaCIS.Core.Application.Service
var task1 = await _visitTaskRepository.AddAsync(new VisitTask()
{
TrialId = trialId,
IsConvertedTask = originalTaskInfo.IsConvertedTask,
//IsConvertedTask = originalTaskInfo.IsConvertedTask,
SubjectId = item.SubjectId,
IsUrgent = originalTaskInfo.IsUrgent,
VisitTaskNum = item.VisitNum + ReadingCommon.TaskNumDic[ReadingCategory.Global],
@ -1734,7 +1734,7 @@ namespace IRaCIS.Core.Application.Service
SubjectId = item.SubjectId,
IsUrgent = originalTaskInfo.IsUrgent,
TaskName = item.ReadingName,
IsConvertedTask = originalTaskInfo.IsConvertedTask,
//IsConvertedTask = originalTaskInfo.IsConvertedTask,
// 原任务是全局任务 加0.03 就好
VisitTaskNum = originalTaskInfo.VisitTaskNum + 0.03m,
ArmEnum = Arm.TumorArm, //特殊

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

@ -293,16 +293,27 @@ namespace IRaCIS.Core.Domain.Models
public bool IsAnalysisCreate { get; set; }
/// <summary>
/// 是否是转变的任务(转为IRECIST)
/// </summary>
public bool IsConvertedTask { get; set; } = false;
///// <summary>
///// 是否是转变的任务(转为IRECIST)
///// </summary>
//public bool IsConvertedTask { get; set; } = false;
/// <summary>
/// 转换之前的任务Id
/// 转换之前的任务Id(转化的任务才有该值)
/// </summary>
public Guid? BeforeConvertedTaskId { get; set; }
[Projectable]
public bool IsConvertedTask => Subject.SubjectVisitTaskList.Where(t => (t.TrialReadingCriterionId == TrialReadingCriterionId
&& t.DoctorUserId == DoctorUserId && t.BeforeConvertedTaskId!=null
&& t.TaskState == TaskState.Effect &&
t.VisitTaskNum < VisitTaskNum
&& t.IsSelfAnalysis == IsSelfAnalysis
&& t.ArmEnum == ArmEnum)|| BeforeConvertedTaskId!=null
).Any();
[NotMapped]
public List<CrterionDictionaryGroup> CrterionDictionaryGroup
{
@ -361,15 +372,7 @@ namespace IRaCIS.Core.Domain.Models
public Trial Trial { get; set; }
[Projectable]
public bool IsAfterConvertedTask=>Subject.SubjectVisitTaskList.Where(t=>t.TrialReadingCriterionId == TrialReadingCriterionId
&& t.DoctorUserId==DoctorUserId && t.IsConvertedTask
&& t.TaskState==TaskState.Effect &&
t.VisitTaskNum<VisitTaskNum
&& t.IsSelfAnalysis==IsSelfAnalysis
&& t.ArmEnum==ArmEnum
).Any();
//影像质量 等等第一层级问题答案