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

修改

Uat_Study
he 2023-03-30 13:36:42 +08:00
parent 432a2bca21
commit 2923d9e761
6 changed files with 56 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
IRaCIS.Core.Application/Service/Reading/Dto/VisitTaskDto.cs
View File

@ -243,31 +243,31 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public bool IsConvertedTask { get; set; } public bool IsConvertedTask { get; set; }
[NotMapped] //[NotMapped]
public List<CrterionDictionaryGroup> CrterionDictionaryGroup //public List<CrterionDictionaryGroup> CrterionDictionaryGroup
{ //{
get // get
{ // {
//try // try
//{ // {
// if (this.IsConvertedTask) // if (this.IsConvertedTask)
// { // {
// return new List<CrterionDictionaryGroup>() { Share.CrterionDictionaryGroup.General, Share.CrterionDictionaryGroup.Converted }; // return new List<CrterionDictionaryGroup>() { Share.CrterionDictionaryGroup.General, Share.CrterionDictionaryGroup.Converted };
// } // }
// else // else
// { // {
// return new List<CrterionDictionaryGroup>() { Share.CrterionDictionaryGroup.General, Share.CrterionDictionaryGroup.BeforeConvert }; // return new List<CrterionDictionaryGroup>() { Share.CrterionDictionaryGroup.General, Share.CrterionDictionaryGroup.BeforeConvert };
// } // }
//} // }
//catch (Exception) // catch (Exception)
//{ // {
return new List<CrterionDictionaryGroup>(); // return new List<CrterionDictionaryGroup>();
//} // }
} // }
} // }

9
IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs
View File

@ -230,7 +230,7 @@ namespace IRaCIS.Application.Services
VisitNum = x.SourceSubjectVisit.VisitNum, VisitNum = x.SourceSubjectVisit.VisitNum,
IsBaseLine = x.SourceSubjectVisit.IsBaseLine, IsBaseLine = x.SourceSubjectVisit.IsBaseLine,
VisitId = x.SourceSubjectVisitId.Value, VisitId = x.SourceSubjectVisitId.Value,
CrterionDictionaryGroup= x.CrterionDictionaryGroup, //CrterionDictionaryGroup= x.CrterionDictionaryGroup,
BeforeQuestionList = x.ReadingTaskQuestionAnswerList.Where(y => y.ReadingQuestionTrial.GlobalReadingShowType!=GlobalReadingShowType.NotShow).OrderBy(y => y.ReadingQuestionTrial.ShowOrder) BeforeQuestionList = x.ReadingTaskQuestionAnswerList.Where(y => y.ReadingQuestionTrial.GlobalReadingShowType!=GlobalReadingShowType.NotShow).OrderBy(y => y.ReadingQuestionTrial.ShowOrder)
.Select(y => new GlobalQuestionInfo() .Select(y => new GlobalQuestionInfo()
{ {
@ -255,9 +255,12 @@ namespace IRaCIS.Application.Services
}).ToList() }).ToList()
}).ToListAsync(); }).ToListAsync();
result.TaskList.ForEach(x =>
{
x.CrterionDictionaryGroup = ReadingCommon.GetCrterionDictionaryGroup(x.IsConvertedTask);
});
var globalReadingQuestion = await _readingGlobalTaskInfoRepository.Where(x => x.GlobalTaskId == inDto.VisitTaskId).ToListAsync();
var globalReadingQuestion = await _readingGlobalTaskInfoRepository.Where(x => x.GlobalTaskId == inDto.VisitTaskId).ToListAsync();
var criterionType = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == taskInfo.TrialReadingCriterionId).Select(x => x.CriterionType).FirstOrDefaultAsync(); var criterionType = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == taskInfo.TrialReadingCriterionId).Select(x => x.CriterionType).FirstOrDefaultAsync();
// Before的Answer取自于 上一次全局阅片的结果, 如果没有上一次全局阅片的结果 取访视的答案 // Before的Answer取自于 上一次全局阅片的结果, 如果没有上一次全局阅片的结果 取访视的答案

6
IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
View File

@ -641,9 +641,10 @@ namespace IRaCIS.Application.Services
answers = await _readingTaskQuestionAnswerRepository.Where(x => x.VisitTaskId == visitTaskId).ToListAsync(); answers = await _readingTaskQuestionAnswerRepository.Where(x => x.VisitTaskId == visitTaskId).ToListAsync();
var taskinfo = await _visitTaskRepository.Where(x => x.Id == visitTaskId).ProjectTo<VisitTaskDto>(_mapper.ConfigurationProvider).FirstNotNullAsync(); var taskinfo = await _visitTaskRepository.Where(x => x.Id == visitTaskId).ProjectTo<VisitTaskDto>(_mapper.ConfigurationProvider).FirstNotNullAsync();
questions.ForEach(x => questions.ForEach(x =>
{ {
x.CrterionDictionaryGroup = taskinfo.CrterionDictionaryGroup; x.CrterionDictionaryGroup = ReadingCommon.GetCrterionDictionaryGroup(taskinfo.IsConvertedTask);
}); });
if (taskinfo.IsConvertedTask && taskinfo.BeforeConvertedTaskId != null) if (taskinfo.IsConvertedTask && taskinfo.BeforeConvertedTaskId != null)
@ -872,8 +873,7 @@ namespace IRaCIS.Application.Services
qusetionList.ForEach(x => qusetionList.ForEach(x =>
{ {
x.CrterionDictionaryGroup = ReadingCommon.GetCrterionDictionaryGroup(taskInfo.IsConvertedTask);
x.CrterionDictionaryGroup = taskInfo.CrterionDictionaryGroup;
}); });
} }
else else

9
IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs
View File

@ -175,16 +175,23 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
BlindName = x.TaskBlindName, BlindName = x.TaskBlindName,
IsBaseLine = x.SourceSubjectVisit.IsBaseLine, IsBaseLine = x.SourceSubjectVisit.IsBaseLine,
VisitTaskId = x.Id, VisitTaskId = x.Id,
CrterionDictionaryGroup= x.CrterionDictionaryGroup,
TaskName = x.TaskName, TaskName = x.TaskName,
LatestScanDate= x.SourceSubjectVisit!=null?x.SourceSubjectVisit.LatestScanDate : null, LatestScanDate= x.SourceSubjectVisit!=null?x.SourceSubjectVisit.LatestScanDate : null,
VisitTaskNum = x.VisitTaskNum, VisitTaskNum = x.VisitTaskNum,
IsConvertedTask=x.IsConvertedTask, IsConvertedTask=x.IsConvertedTask,
BeforeConvertedTaskId=x.BeforeConvertedTaskId, BeforeConvertedTaskId=x.BeforeConvertedTaskId,
//CrterionDictionaryGroup = x.CrterionDictionaryGroup,
IsCurrentTask = x.Id == visitTaskId, IsCurrentTask = x.Id == visitTaskId,
}).ToListAsync(); }).ToListAsync();
taskInfoList.ForEach(x =>
{
x.CrterionDictionaryGroup = ReadingCommon.GetCrterionDictionaryGroup(x.IsConvertedTask);
});
var taskIds = taskInfoList.Select(x => x.VisitTaskId).ToList(); var taskIds = taskInfoList.Select(x => x.VisitTaskId).ToList();
var isHaveAdditionalTaskIds = await _readingTaskQuestionAnswerRepository.Where(x => taskIds.Contains(x.VisitTaskId) && isAdditionalQuestionId.Contains(x.ReadingQuestionTrialId)).Select(x => x.VisitTaskId).Distinct().ToListAsync(); var isHaveAdditionalTaskIds = await _readingTaskQuestionAnswerRepository.Where(x => taskIds.Contains(x.VisitTaskId) && isAdditionalQuestionId.Contains(x.ReadingQuestionTrialId)).Select(x => x.VisitTaskId).Distinct().ToListAsync();

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

@ -314,40 +314,7 @@ namespace IRaCIS.Core.Domain.Models
&& t.ArmEnum == ArmEnum) || BeforeConvertedTaskId != null && t.ArmEnum == ArmEnum) || BeforeConvertedTaskId != null
).Any(); ).Any();
//[NotMapped]
public List<CrterionDictionaryGroup> CrterionDictionaryGroup
{
get
{
try
{
var isConverted= 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();
if (isConverted)
{
return new List<CrterionDictionaryGroup>() { Share.CrterionDictionaryGroup.General, Share.CrterionDictionaryGroup.Converted };
}
else
{
return new List<CrterionDictionaryGroup>() { Share.CrterionDictionaryGroup.General, Share.CrterionDictionaryGroup.BeforeConvert };
}
}
catch (Exception)
{
return new List<CrterionDictionaryGroup>();
}
}
}

16
IRaCIS.Core.Infra.EFCore/Common/ReadingCommon.cs
View File

@ -42,6 +42,22 @@ namespace IRaCIS.Core.Infra.EFCore.Common
//}; //};
} }
/// <summary>
/// 获取DictionaryGroup
/// </summary>
public static List<CrterionDictionaryGroup> GetCrterionDictionaryGroup(bool isConvertedTask)
{
if (isConvertedTask)
{
return new List<CrterionDictionaryGroup>() { CrterionDictionaryGroup.General, CrterionDictionaryGroup.Converted };
}
else
{
return new List<CrterionDictionaryGroup>() { CrterionDictionaryGroup.General, CrterionDictionaryGroup.BeforeConvert };
}
}
/// <summary> /// <summary>
/// 获取语言名称 /// 获取语言名称
/// </summary> /// </summary>