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

修改一版

Uat_Study
he 2022-10-19 17:22:21 +08:00
parent 5fb96ef04a
commit 9523efac7b
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -203,7 +203,7 @@ namespace IRaCIS.Application.Services
List<GetAssessTypeOutDto> assessTypeList = await _readingCriterionDictionaryRepository.Where(x => x.CriterionId == taskInfo.TrialReadingCriterionId List<GetAssessTypeOutDto> assessTypeList = await _readingCriterionDictionaryRepository.Where(x => x.CriterionId == taskInfo.TrialReadingCriterionId
&& x.ParentCode == "GlobalAssessType" && x.ParentCode == ReadingCommon.GlobalAssess
) )
.Select(x => new GetAssessTypeOutDto() .Select(x => new GetAssessTypeOutDto()
{ {

4
IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs
View File

@ -200,7 +200,7 @@ namespace IRaCIS.Application.Services
{ {
Answer = item.AfterQuestionList.Where(x => x.GlobalAnswerType == GlobalAnswerType.Reason).Select(x => x.Answer).FirstOrDefault(), Answer = item.AfterQuestionList.Where(x => x.GlobalAnswerType == GlobalAnswerType.Reason).Select(x => x.Answer).FirstOrDefault(),
QuestionType = JudgeReadingQuestionType.VisitRemark, QuestionType = JudgeReadingQuestionType.VisitRemark,
QuestionName = "全局阅片备注",
}); });
judgeReadingInfo.VisitTaskInfoList.Add(judgeReadingQuestion); judgeReadingInfo.VisitTaskInfoList.Add(judgeReadingQuestion);
@ -234,7 +234,7 @@ namespace IRaCIS.Application.Services
{ {
Answer = twoItem.AfterQuestionList.Where(x => x.GlobalAnswerType == GlobalAnswerType.Reason).Select(x => x.Answer).FirstOrDefault(), Answer = twoItem.AfterQuestionList.Where(x => x.GlobalAnswerType == GlobalAnswerType.Reason).Select(x => x.Answer).FirstOrDefault(),
QuestionType = JudgeReadingQuestionType.VisitRemark, QuestionType = JudgeReadingQuestionType.VisitRemark,
QuestionName = "全局阅片备注",
}); });
judgeReadingInfo.VisitTaskInfoList.Add(rTwoJudge); judgeReadingInfo.VisitTaskInfoList.Add(rTwoJudge);

7
IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingOncologyTaskService.cs
View File

@ -135,7 +135,7 @@ namespace IRaCIS.Application.Services
result.OncologyVisits = oncologyVisits; result.OncologyVisits = oncologyVisits;
List<GetAssessTypeOutDto> assessTypeList = await _readingCriterionDictionaryRepository.Where(x => x.CriterionId == taskInfo.TrialReadingCriterionId List<GetAssessTypeOutDto> assessTypeList = await _readingCriterionDictionaryRepository.Where(x => x.CriterionId == taskInfo.TrialReadingCriterionId
&& x.ParentCode == "OncologyAssessType" && x.ParentCode == ReadingCommon.OncologyAssess
) )
.Select(x => new GetAssessTypeOutDto() .Select(x => new GetAssessTypeOutDto()
{ {
@ -262,9 +262,12 @@ namespace IRaCIS.Application.Services
ReadingCategory = ReadingCategory.Oncology, ReadingCategory = ReadingCategory.Oncology,
}); });
var originalVisitId = await _visitTaskRepository.Where(x => x.SouceReadModuleId == globalreadModuleId && x.TaskState == TaskState.Effect && x.ReadingCategory == ReadingCategory.Global
&& x.ReadingTaskState == ReadingTaskState.HaveSigned && !x.IsAnalysisCreate && x.TrialReadingCriterionId == readModuleInfo.TrialReadingCriterionId
).Select(x => x.Id).FirstOrDefaultAsync();
await _visitTaskHelpeService.AddTaskAsync(new GenerateTaskCommand() await _visitTaskHelpeService.AddTaskAsync(new GenerateTaskCommand()
{ {
OriginalVisitId= originalVisitId,
ReadingCategory = GenerateTaskCategory.Oncology, ReadingCategory = GenerateTaskCategory.Oncology,
TrialId = readModuleInfo.TrialId, TrialId = readModuleInfo.TrialId,
ReadingGenerataTaskList = needReadList ReadingGenerataTaskList = needReadList