diff --git a/IRaCIS.Core.API/Controllers/InspectionController.cs b/IRaCIS.Core.API/Controllers/InspectionController.cs
index 804352e82..7df5d7adb 100644
--- a/IRaCIS.Core.API/Controllers/InspectionController.cs
+++ b/IRaCIS.Core.API/Controllers/InspectionController.cs
@@ -121,6 +121,23 @@ namespace IRaCIS.Core.API.Controllers
return result;
}
+ ///
+ /// 提交Diocm阅片
+ ///
+ ///
+ ///
+ [HttpPost, Route("Inspection/ReadingImageTask/SubmitDicomVisitTask")]
+ [UnitOfWork]
+ public async Task SubmitDicomVisitTask(DataInspectionDto opt)
+ {
+
+ var singid = await _inspectionService.RecordSing(opt.SignInfo);
+ var result = await _iReadingImageTaskService.SubmitDicomVisitTask(opt.Data);
+ await _inspectionService.CompletedSign(singid, result);
+ return result;
+ }
+
+
///
/// 提交全局阅片任务
///
diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
index b66bf7225..e48f4e24e 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
@@ -102,7 +102,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public class GetReadingReportEvaluationInDto
{
- public Guid SubjectId { get; set; }
+ public Guid VisitTaskId { get; set; }
public Guid TrialId { get; set; }
}
@@ -750,6 +750,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public FormType? FormType { get; set; }
}
+ public class SubmitDicomVisitTaskInDto
+ {
+ public Guid VisitTaskId { get; set; }
+ }
+
///
///
///
diff --git a/IRaCIS.Core.Application/Service/Reading/Interface/IReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/Interface/IReadingImageTaskService.cs
index e1c702efd..77846b7ff 100644
--- a/IRaCIS.Core.Application/Service/Reading/Interface/IReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Interface/IReadingImageTaskService.cs
@@ -20,6 +20,8 @@ namespace IRaCIS.Core.Application.Contracts
Task SubmitGlobalReadingInfo(SubmitGlobalReadingInfoInDto inDto);
+ Task SubmitDicomVisitTask(SubmitDicomVisitTaskInDto inDto);
+
Task SubmitOncologyReadingInfo(SubmitOncologyReadingInfoInDto inDto);
Task AddOncologyTask(Guid oncologModuleId);
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
index 46c2f3965..ebfe37bad 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
@@ -118,7 +118,10 @@ namespace IRaCIS.Application.Services
{
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
).OrderBy(x => x.VisitTaskNum).Select(x => new VisitTaskInfo()
{
@@ -1704,7 +1707,17 @@ namespace IRaCIS.Application.Services
return ResponseOutput.Ok(true);
}
-
+ ///
+ /// 提交Dicom阅片信息
+ ///
+ ///
+ ///
+ [NonDynamicMethod]
+ public async Task SubmitDicomVisitTask(SubmitDicomVisitTaskInDto inDto)
+ {
+ await this.SubmitTaskChangeState(inDto.VisitTaskId);
+ return ResponseOutput.Ok(true);
+ }
///
/// 提交裁判问题