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

修改一版

Uat_Study
he 2022-08-01 13:29:14 +08:00
parent 5cda083a40
commit cf8c2de7a6
3 changed files with 78 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
View File

@ -5857,6 +5857,13 @@
</summary>
<returns></returns>
</member>
<member name="M:IRaCIS.Application.Services.ReadingImageTaskService.GetReadingSubjectInfo(IRaCIS.Core.Application.Service.Reading.Dto.GetReadingSubjectInfoInDto)">
<summary>
获取阅片的受试者信息
</summary>
<param name="inDto"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Application.Services.ReadingImageTaskService.GetJudgeReadingInfo(IRaCIS.Core.Application.Service.Reading.Dto.GetJudgeReadingInfo)">
<summary>
获取裁判阅片任务信息

21
IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
View File

@ -323,6 +323,27 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public string JudgeResultImagePath { get; set; } = string.Empty;
}
public class GetReadingSubjectInfoOutDto
{
public Guid VisitTaskId { get; set; }
public Guid SubjectId { get; set; }
public string SubjectCode { get; set; } = string.Empty;
public ReadingCategory ReadingCategory { get; set; }
public string TaskBlindName { get; set; } = string.Empty;
public bool IsReadingShowPreviousResults { get; set; } = false;
public bool IsReadingShowSubjectInfo { get; set; } = false;
}
public class GetReadingSubjectInfoInDto
{
public Guid VisitTaskId { get; set; }
}
public class GetJudgeReadingInfo
{
public Guid VisitTaskId { get; set; }

99
IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
View File

@ -129,7 +129,7 @@ namespace IRaCIS.Application.Services
/// <param name="inDto"></param>
/// <returns></returns>
[HttpPost]
public async Task<(GetGlobalReadingInfoOutDto,object)> GetGlobalReadingInfo(GetGlobalReadingInfoInDto inDto)
public async Task<GetGlobalReadingInfoOutDto> GetGlobalReadingInfo(GetGlobalReadingInfoInDto inDto)
{
var taskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync();
if (taskInfo.ReadingCategory != ReadingCategory.Global)
@ -216,27 +216,8 @@ namespace IRaCIS.Application.Services
});
var subjectCode = await _subjectRepository.Where(x => x.Id == taskInfo.SubjectId).Select(x => x.Code).FirstOrDefaultAsync();
var trialInfo = await _trialRepository.Where(x => x.Id == taskInfo.TrialId).Select(x => new
{
x.IsReadingShowPreviousResults,
x.IsReadingShowSubjectInfo,
x.ClinicalInformationTransmissionEnum,
}).FirstOrDefaultAsync();
return (result, new
{
VisitTaskId = taskInfo.Id,
SubjectId = taskInfo.SubjectId,
SubjectCode = taskInfo.BlindSubjectCode.IsNullOrEmpty() ? subjectCode : taskInfo.BlindSubjectCode,
ReadingCategory = taskInfo.ReadingCategory,
TaskBlindName = taskInfo.TaskBlindName,
IsReadingShowPreviousResults = trialInfo.IsReadingShowPreviousResults,
IsReadingShowSubjectInfo = trialInfo.IsReadingShowSubjectInfo,
});
return result;
}
#endregion
@ -707,13 +688,49 @@ namespace IRaCIS.Application.Services
}
#endregion
/// <summary>
/// 获取阅片的受试者信息
/// </summary>
/// <param name="inDto"></param>
/// <returns></returns>
[HttpPost]
public async Task<GetReadingSubjectInfoOutDto> GetReadingSubjectInfo(GetReadingSubjectInfoInDto inDto)
{
var visitTask = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstOrDefaultAsync();
var subjectCode = await _subjectRepository.Where(x => x.Id == visitTask.SubjectId).Select(x => x.Code).FirstOrDefaultAsync();
var trialInfo = await _trialRepository.Where(x => x.Id == visitTask.TrialId).Select(x => new
{
x.IsReadingShowPreviousResults,
x.IsReadingShowSubjectInfo,
x.ClinicalInformationTransmissionEnum,
}).FirstOrDefaultAsync();
return new GetReadingSubjectInfoOutDto()
{
VisitTaskId = visitTask.Id,
SubjectId = visitTask.SubjectId,
SubjectCode = visitTask.BlindSubjectCode.IsNullOrEmpty() ? subjectCode : visitTask.BlindSubjectCode,
ReadingCategory = visitTask.ReadingCategory,
TaskBlindName = visitTask.TaskBlindName,
IsReadingShowPreviousResults = trialInfo.IsReadingShowPreviousResults,
IsReadingShowSubjectInfo = trialInfo.IsReadingShowSubjectInfo,
};
}
#region 获取裁判阅片任务信息
/// <summary>
/// 获取裁判阅片任务信息
/// </summary>
/// <returns></returns>
[HttpPost]
public async Task<(GetJudgeReadingInfoOutDto,object)> GetJudgeReadingInfo(GetJudgeReadingInfo inDto)
public async Task<GetJudgeReadingInfoOutDto> GetJudgeReadingInfo(GetJudgeReadingInfo inDto)
{
var visitTask = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstOrDefaultAsync();
GetJudgeReadingInfoOutDto judgeInfo = new GetJudgeReadingInfoOutDto()
@ -773,17 +790,17 @@ namespace IRaCIS.Application.Services
break;
case ReadingCategory.Global:
var taskOneInfo = (await this.GetGlobalReadingInfo(new GetGlobalReadingInfoInDto()
var taskOneInfo = await this.GetGlobalReadingInfo(new GetGlobalReadingInfoInDto()
{
UsingOriginalData = true,
VisitTaskId = taskList[0].Id
})).Item1;
});
var taskTwoInfo = (await this.GetGlobalReadingInfo(new GetGlobalReadingInfoInDto()
var taskTwoInfo = await this.GetGlobalReadingInfo(new GetGlobalReadingInfoInDto()
{
UsingOriginalData = true,
VisitTaskId = taskList[1].Id
})).Item1;
});
foreach (var item in taskOneInfo.TaskList)
@ -870,27 +887,9 @@ namespace IRaCIS.Application.Services
break;
}
var subjectCode = await _subjectRepository.Where(x => x.Id == visitTask.SubjectId).Select(x => x.Code).FirstOrDefaultAsync();
var trialInfo = await _trialRepository.Where(x => x.Id == visitTask.TrialId).Select(x => new
{
x.IsReadingShowPreviousResults,
x.IsReadingShowSubjectInfo,
x.ClinicalInformationTransmissionEnum,
}).FirstOrDefaultAsync();
return (judgeInfo, new
{
VisitTaskId = visitTask.Id,
SubjectId = visitTask.SubjectId,
SubjectCode = visitTask.BlindSubjectCode.IsNullOrEmpty() ? subjectCode : visitTask.BlindSubjectCode,
ReadingCategory = visitTask.ReadingCategory,
TaskBlindName = visitTask.TaskBlindName,
IsReadingShowPreviousResults = trialInfo.IsReadingShowPreviousResults,
IsReadingShowSubjectInfo = trialInfo.IsReadingShowSubjectInfo,
});
return judgeInfo;
}
#endregion
@ -1302,17 +1301,17 @@ namespace IRaCIS.Application.Services
noteEqual = ComputeJudgeResult(groupTasks);
break;
case ReadingCategory.Global:
var taskOneInfo = (await this.GetGlobalReadingInfo(new GetGlobalReadingInfoInDto()
var taskOneInfo = await this.GetGlobalReadingInfo(new GetGlobalReadingInfoInDto()
{
UsingOriginalData = true,
VisitTaskId = visitTaskids[0]
})).Item1;
});
var taskTwoInfo = (await this.GetGlobalReadingInfo(new GetGlobalReadingInfoInDto()
var taskTwoInfo = await this.GetGlobalReadingInfo(new GetGlobalReadingInfoInDto()
{
UsingOriginalData = true,
VisitTaskId = visitTaskids[1]
})).Item1;
});
// 判断两个任务是否
if (taskOneInfo.TaskList.Count() != taskTwoInfo.TaskList.Count())
@ -1365,7 +1364,7 @@ namespace IRaCIS.Application.Services
});
// 找到最后一个任务ID
var lastTask = taskOneInfo.Item1.TaskList.Last();
var lastTask = taskOneInfo.TaskList.Last();
if (lastTask == null)
{