Uat_Study
he 2022-08-31 13:36:06 +08:00
parent 6120ea029c
commit 1763a1a4fe
4 changed files with 40 additions and 3 deletions

View File

@ -121,6 +121,23 @@ namespace IRaCIS.Core.API.Controllers
return result; return result;
} }
/// <summary>
/// 提交Diocm阅片
/// </summary>
/// <param name="opt"></param>
/// <returns></returns>
[HttpPost, Route("Inspection/ReadingImageTask/SubmitDicomVisitTask")]
[UnitOfWork]
public async Task<IResponseOutput> SubmitDicomVisitTask(DataInspectionDto<SubmitDicomVisitTaskInDto> opt)
{
var singid = await _inspectionService.RecordSing(opt.SignInfo);
var result = await _iReadingImageTaskService.SubmitDicomVisitTask(opt.Data);
await _inspectionService.CompletedSign(singid, result);
return result;
}
/// <summary> /// <summary>
/// 提交全局阅片任务 /// 提交全局阅片任务
/// </summary> /// </summary>

View File

@ -102,7 +102,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public class GetReadingReportEvaluationInDto public class GetReadingReportEvaluationInDto
{ {
public Guid SubjectId { get; set; } public Guid VisitTaskId { get; set; }
public Guid TrialId { get; set; } public Guid TrialId { get; set; }
} }
@ -750,6 +750,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public FormType? FormType { get; set; } public FormType? FormType { get; set; }
} }
public class SubmitDicomVisitTaskInDto
{
public Guid VisitTaskId { get; set; }
}
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>

View File

@ -20,6 +20,8 @@ namespace IRaCIS.Core.Application.Contracts
Task<IResponseOutput> SubmitGlobalReadingInfo(SubmitGlobalReadingInfoInDto inDto); Task<IResponseOutput> SubmitGlobalReadingInfo(SubmitGlobalReadingInfoInDto inDto);
Task<IResponseOutput> SubmitDicomVisitTask(SubmitDicomVisitTaskInDto inDto);
Task<IResponseOutput> SubmitOncologyReadingInfo(SubmitOncologyReadingInfoInDto inDto); Task<IResponseOutput> SubmitOncologyReadingInfo(SubmitOncologyReadingInfoInDto inDto);
Task AddOncologyTask(Guid oncologModuleId); Task AddOncologyTask(Guid oncologModuleId);

View File

@ -118,7 +118,10 @@ namespace IRaCIS.Application.Services
{ {
GetReadingReportEvaluationOutDto result = new GetReadingReportEvaluationOutDto(); GetReadingReportEvaluationOutDto result = new GetReadingReportEvaluationOutDto();
var taskInfoList = await _visitTaskRepository.Where(x => x.SubjectId == indto.SubjectId && x.TaskState == TaskState.Effect
var visitTaskInfo = await _visitTaskRepository.Where(x => x.Id == indto.VisitTaskId).FirstNotNullAsync();
var taskInfoList = await _visitTaskRepository.Where(x => x.SubjectId == visitTaskInfo.SubjectId && x.TaskState == TaskState.Effect
&& x.ReadingCategory == ReadingCategory.Visit && !x.IsAnalysisCreate && x.ReadingTaskState == ReadingTaskState.HaveSigned && x.ReadingCategory == ReadingCategory.Visit && !x.IsAnalysisCreate && x.ReadingTaskState == ReadingTaskState.HaveSigned
).OrderBy(x => x.VisitTaskNum).Select(x => new VisitTaskInfo() ).OrderBy(x => x.VisitTaskNum).Select(x => new VisitTaskInfo()
{ {
@ -1704,7 +1707,17 @@ namespace IRaCIS.Application.Services
return ResponseOutput.Ok(true); return ResponseOutput.Ok(true);
} }
/// <summary>
/// 提交Dicom阅片信息
/// </summary>
/// <param name="inDto"></param>
/// <returns></returns>
[NonDynamicMethod]
public async Task<IResponseOutput> SubmitDicomVisitTask(SubmitDicomVisitTaskInDto inDto)
{
await this.SubmitTaskChangeState(inDto.VisitTaskId);
return ResponseOutput.Ok(true);
}
/// <summary> /// <summary>
/// 提交裁判问题 /// 提交裁判问题