From 1763a1a4feccfb959cb62417cb9f8ee91cb4b597 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Wed, 31 Aug 2022 13:36:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/InspectionController.cs         | 17 +++++++++++++++++
 .../Reading/Dto/ReadingImageTaskViewModel.cs    |  7 ++++++-
 .../Interface/IReadingImageTaskService.cs       |  2 ++
 .../Service/Reading/ReadingImageTaskService.cs  | 17 +++++++++++++++--
 4 files changed, 40 insertions(+), 3 deletions(-)

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;
         }
 
+        /// <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>
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; }
+    }
+
     /// <summary>
     /// 
     /// </summary>
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<IResponseOutput> SubmitGlobalReadingInfo(SubmitGlobalReadingInfoInDto inDto);
 
+        Task<IResponseOutput> SubmitDicomVisitTask(SubmitDicomVisitTaskInDto inDto);
+
         Task<IResponseOutput> 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);
         }
 
-
+        /// <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>
         /// 提交裁判问题