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

修改

Uat_Study
he 2022-11-30 17:00:54 +08:00
parent dc6123509c
commit 19dd6e109b
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs
View File

@ -382,6 +382,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public bool IsClosedDialog { get; set; }
public List<CriterionDictionaryInfo> OncologyAssessTypeList { get; set; }
public List<TaskInfo> TaskList { get; set; } = new List<TaskInfo>();

22
IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs
View File

@ -27,6 +27,7 @@ namespace IRaCIS.Core.Application.Service
private readonly IRepository<ReadingTaskQuestionAnswer> _readingTaskQuestionAnswerRepository;
private readonly IRepository<ReadingGlobalTaskInfo> _readingGlobalTaskInfoRepository;
private readonly IRepository<ReadingOncologyTaskInfo> _readingOncologyTaskInfoRepository;
private readonly IRepository<ReadingCriterionDictionary> _readingCriterionDictionaryRepository;
private readonly IRepository<User> _userTaskRepository;
private readonly IVisitTaskService _visitTaskService;
private readonly IRepository<TaskMedicalReview> _taskMedicalReviewRepository;
@ -42,6 +43,7 @@ namespace IRaCIS.Core.Application.Service
IRepository<ReadingTaskQuestionAnswer> readingTaskQuestionAnswerRepository,
IRepository<ReadingGlobalTaskInfo> readingGlobalTaskInfoRepository,
IRepository<ReadingOncologyTaskInfo> readingOncologyTaskInfoRepository,
IRepository<ReadingCriterionDictionary> readingCriterionDictionaryRepository,
IRepository<User> userTaskRepository,
IVisitTaskService visitTaskService,
IRepository<TaskMedicalReview> taskMedicalReviewRepository,
@ -57,6 +59,7 @@ namespace IRaCIS.Core.Application.Service
this._readingTaskQuestionAnswerRepository = readingTaskQuestionAnswerRepository;
this._readingGlobalTaskInfoRepository = readingGlobalTaskInfoRepository;
this._readingOncologyTaskInfoRepository = readingOncologyTaskInfoRepository;
this._readingCriterionDictionaryRepository = readingCriterionDictionaryRepository;
this._userTaskRepository = userTaskRepository;
this._visitTaskService = visitTaskService;
this._taskMedicalReviewRepository = taskMedicalReviewRepository;
@ -133,7 +136,7 @@ namespace IRaCIS.Core.Application.Service
medicalReviewInfo.TaskList.ForEach(x =>
{
var oncologyInfo = oncologyList.Where(y => y.OncologyTaskId == x.TaskId).FirstOrDefault();
var oncologyInfo = oncologyList.Where(y => y.VisitTaskId == x.TaskId).FirstOrDefault();
if (oncologyInfo != null)
{
x.OncologyEvaluationResult = oncologyInfo.EvaluationResult;
@ -142,6 +145,23 @@ namespace IRaCIS.Core.Application.Service
});
medicalReviewInfo.OncologyAssessTypeList = await _readingCriterionDictionaryRepository.Where(x => x.CriterionId == taskInfo.TrialReadingCriterionId
&& x.ParentCode == ReadingCommon.CriterionDictionary.OncologyAssess
)
.Select(x => new CriterionDictionaryInfo()
{
Id = x.Id,
DictionaryId = x.DictionaryId,
ChildGroup = x.Dictionary.ChildGroup,
Code = x.Dictionary.Code,
Description = x.Dictionary.Description,
ShowOrder = x.Dictionary.ShowOrder,
ParentCode = x.Dictionary.Parent.Code,
Value = x.Dictionary.Value,
ValueCN = x.Dictionary.ValueCN
}).OrderBy(x => x.ParentCode).ThenBy(x => x.ShowOrder).ToListAsync();
}
else
{