Uat_Study
he 2023-03-24 10:56:19 +08:00
parent aee50bf668
commit 2663633798
2 changed files with 4 additions and 12 deletions

View File

@ -140,6 +140,7 @@ namespace IRaCIS.Core.Application.Service
taskAnswer.ForEach(x => { taskAnswer.ForEach(x => {
x.VisitTaskId = taskInfo.Id; x.VisitTaskId = taskInfo.Id;
x.Id= NewId.NextGuid(); x.Id= NewId.NextGuid();
}); });
@ -150,6 +151,7 @@ namespace IRaCIS.Core.Application.Service
{ {
x.VisitTaskId = taskInfo.Id; x.VisitTaskId = taskInfo.Id;
x.IsCurrentTaskAdd = false; x.IsCurrentTaskAdd = false;
x.isf
x.Id = NewId.NextGuid(); x.Id = NewId.NextGuid();
}); });

View File

@ -718,17 +718,7 @@ namespace IRaCIS.Application.Services
var taskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync(); var taskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync();
if (taskInfo.IsConvertedTask && if (taskInfo.IsConvertedTask &&taskInfo.BeforeConvertedTaskId!=null)
!(await _visitTaskRepository.AnyAsync(x => x.IsAnalysisCreate == taskInfo.IsAnalysisCreate
&& x.IsSelfAnalysis == taskInfo.IsSelfAnalysis
&& x.VisitTaskNum < taskInfo.VisitTaskNum
&& x.DoctorUserId == taskInfo.DoctorUserId
&& x.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId
&& !x.IsConvertedTask
&& x.SubjectId == taskInfo.SubjectId
&& x.ArmEnum == taskInfo.ArmEnum &&
x.TaskState == TaskState.Effect))
)
{ {
result.ForEach(x => result.ForEach(x =>
{ {
@ -1153,7 +1143,7 @@ namespace IRaCIS.Application.Services
}); });
answers.Add("LesionType", rowInfo.LesionType.ToString());
answers.Add("BlindName", rowInfo.BlindName); answers.Add("BlindName", rowInfo.BlindName);
answers.Add("IsFirstChangeTask", isFirstChangeTask.ToString()); answers.Add("IsFirstChangeTask", isFirstChangeTask.ToString());
answers.Add("FromMark", rowInfo.FromMark); answers.Add("FromMark", rowInfo.FromMark);