From 5f86ea555aa5a0ca6a0a80339cbdb332bc30171b Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Wed, 31 Aug 2022 10:49:39 +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

---
 .../IRaCIS.Core.Application.xml               |  7 +++
 .../Reading/ReadingImageTaskService.cs        | 43 ++++++++++---------
 2 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index ecb452a10..8fc76543b 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -7067,6 +7067,13 @@
             IR影像阅片
             </summary>
         </member>
+        <member name="M:IRaCIS.Application.Services.ReadingImageTaskService.GetReadingReportEvaluation(IRaCIS.Core.Application.Service.Reading.Dto.GetReadingReportEvaluationInDto)">
+            <summary>
+            获取阅片报告
+            </summary>
+            <param name="indto"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Application.Services.ReadingImageTaskService.GetTableAnswerRowInfoList(IRaCIS.Core.Application.Service.Reading.Dto.GetTableAnswerRowInfoInDto)">
             <summary>
             获取表格答案行信息 
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
index badebaf7e..4e4403518 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
@@ -113,6 +113,7 @@ namespace IRaCIS.Application.Services
         /// </summary>
         /// <param name="indto"></param>
         /// <returns></returns>
+        [HttpPost]
         public async Task<GetReadingReportEvaluationOutDto> GetReadingReportEvaluation(GetReadingReportEvaluationInDto indto)
         {
             GetReadingReportEvaluationOutDto result = new GetReadingReportEvaluationOutDto();
@@ -170,10 +171,10 @@ namespace IRaCIS.Application.Services
                     {
 
                         RowIndex = 0,
-                        OrderMark = String.Empty,
+                        OrderMark = string.Empty,
                         TableQuestionList = tableQuestionList.Where(x => x.ReadingQuestionId == question.QuestionId).OrderBy(x => x.ShowOrder).Select(x => new VistTaskTableQuestionInfo()
                         {
-                            Answer = String.Empty,
+                            Answer = string.Empty,
                             QuestionId = question.QuestionId,
                             TableQuestionId = x.Id,
                             ShowOrder = x.ShowOrder,
@@ -1813,25 +1814,25 @@ namespace IRaCIS.Application.Services
         /// <returns></returns>
         private async Task FinishReadUpdateState(Guid visitTaskId)
         {
-            var taskInfo = await _visitTaskRepository.Where(x => x.Id == visitTaskId).FirstNotNullAsync();
-            if (!await _visitTaskRepository.AnyAsync(x => x.SourceSubjectVisitId == taskInfo.SourceSubjectVisitId && x.SouceReadModuleId == taskInfo.SouceReadModuleId && x.ReadingTaskState != ReadingTaskState.HaveSigned))
-            {
-                if (taskInfo.SouceReadModuleId != null)
-                {
-                    await _readModuleRepository.UpdatePartialFromQueryAsync(taskInfo.SouceReadModuleId.Value, x => new ReadModule
-                    {
-                        ReadingStatus = ReadingStatusEnum.ReadCompleted
-                    });
-                }
-                else if (taskInfo.SourceSubjectVisitId != null)
-                {
-                    await _subjectVisitRepository.UpdatePartialFromQueryAsync(taskInfo.SourceSubjectVisitId.Value, x => new SubjectVisit
-                    {
-                        ReadingStatus = ReadingStatusEnum.ReadCompleted
-                    });
-                }
-                await _subjectVisitRepository.SaveChangesAsync();
-            }
+            //var taskInfo = await _visitTaskRepository.Where(x => x.Id == visitTaskId).FirstNotNullAsync();
+            //if (!await _visitTaskRepository.AnyAsync(x => x.SourceSubjectVisitId == taskInfo.SourceSubjectVisitId && x.SouceReadModuleId == taskInfo.SouceReadModuleId && x.ReadingTaskState != ReadingTaskState.HaveSigned))
+            //{
+            //    if (taskInfo.SouceReadModuleId != null)
+            //    {
+            //        await _readModuleRepository.UpdatePartialFromQueryAsync(taskInfo.SouceReadModuleId.Value, x => new ReadModule
+            //        {
+            //            ReadingStatus = ReadingStatusEnum.ReadCompleted
+            //        });
+            //    }
+            //    else if (taskInfo.SourceSubjectVisitId != null)
+            //    {
+            //        await _subjectVisitRepository.UpdatePartialFromQueryAsync(taskInfo.SourceSubjectVisitId.Value, x => new SubjectVisit
+            //        {
+            //            ReadingStatus = ReadingStatusEnum.ReadCompleted
+            //        });
+            //    }
+            //    await _subjectVisitRepository.SaveChangesAsync();
+            //}
          }
 
         /// <summary>