From afd356de176f9b2472a3c3396b9024cece988dce Mon Sep 17 00:00:00 2001
From: "{872297557@qq.com}" <872297557@qq.com>
Date: Wed, 7 Dec 2022 15:14:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A8=BD=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IRaCIS.Core.Application.xml               |  5 +++++
 .../ReadingImageTaskService.cs                | 19 +++++++++++++++++--
 .../Common/AuditingData.cs                    | 16 ++++++++++------
 3 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index e72f0f674..45077de71 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -2465,6 +2465,11 @@
             标准类型
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadingTaskDto.IseCRFShowInDicomReading">
+            <summary>
+             eCRF报告是否显示在图像页面
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadingTaskDto.IsReadingTaskViewInOrder">
             <summary>
             任务展示访视 读片任务显示是否顺序
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
index 0ee3061ff..bd826b557 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
@@ -833,11 +833,22 @@ namespace IRaCIS.Application.Services
         #region 访视任务  - Dicom 阅片 提交、修改
 
         /// <summary>
-        /// 修改Dicom阅片问题
+        /// 保存影像质量
         /// </summary>
         /// <param name="inDto"></param>
         /// <returns></returns>
-        [HttpPost("{type:int}")]
+        [HttpPost]
+        public async Task<IResponseOutput> SaveImageQuality(ChangeDicomReadingQuestionAnswerInDto inDto)
+        {
+            return await ChangeDicomReadingQuestionAnswer(inDto);
+        }
+
+        /// <summary>
+        /// 修改肿瘤学评估结果
+        /// </summary>
+        /// <param name="inDto"></param>
+        /// <returns></returns>
+        [HttpPost]
         public async Task<IResponseOutput> ChangeDicomReadingQuestionAnswer(ChangeDicomReadingQuestionAnswerInDto inDto)
         {
             await VerifyTaskIsSign(inDto.VisitTaskId);
@@ -862,6 +873,10 @@ namespace IRaCIS.Application.Services
         }
 
 
+
+
+
+
         /// <summary>
         /// 删除表格行数据
         /// </summary>
diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
index a58673f97..cc3ee85fd 100644
--- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
+++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
@@ -601,7 +601,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
             if (entitys.Any(x => x.Entity.GetType() == typeof(ReadingTaskQuestionAnswer)))
             {
                 //1 保存影像质量   2:修改整体肿瘤评估结果
-                if (_userInfo.RequestUrl == "ReadingImageTask/changeDicomReadingQuestionAnswer/1" || _userInfo.RequestUrl == "ReadingImageTask/changeDicomReadingQuestionAnswer/2")
+                if (_userInfo.RequestUrl == "ReadingImageTask/changeDicomReadingQuestionAnswer" || _userInfo.RequestUrl == "ReadingImageTask/saveImageQuality")
                 {
                     var type = AuditOpt.Add;
 
@@ -609,7 +609,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                     var taskQuestionAnswerList = entitys.Where(x => x.Entity.GetType() == typeof(ReadingTaskQuestionAnswer)).Select(t => t.Entity as ReadingTaskQuestionAnswer).ToList();
 
                     //获取问题名称 组合成数组
-                    var quesionList = await _dbContext.ReadingQuestionTrial.Where(t => taskQuestionAnswerList.Select(k => k.ReadingQuestionTrialId).Contains(t.Id)).Select(t => new { t.QuestionName, QuestionId = t.Id, t.ShowOrder }).OrderBy(t => t.ShowOrder).ToListAsync();
+                    var quesionList = await _dbContext.ReadingQuestionTrial.Where(t => taskQuestionAnswerList.Select(k => k.ReadingQuestionTrialId).Contains(t.Id)).Select(t => new { t.QuestionName, QuestionId = t.Id,
+                        t.DictionaryCode, t.ShowOrder }).OrderBy(t => t.ShowOrder).ToListAsync();
 
 
                     var firstEntity = taskQuestionAnswerList.First();
@@ -627,7 +628,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
 
                         TrialReadingCriterionId = x.ReadingQuestionCriterionTrialId,
 
-                    }, new { QuestionAnswerList = taskQuestionAnswerList.Join(quesionList, t => t.ReadingQuestionTrialId, u => u.QuestionId, (t, u) => new { t.Answer, u.QuestionName, u.ShowOrder }).OrderBy(t => t.ShowOrder).ToList() });
+                    }, new { QuestionAnswerList = taskQuestionAnswerList.Join(quesionList, t => t.ReadingQuestionTrialId, u => u.QuestionId, (t, u) => new { t.Answer, u.DictionaryCode,  u.QuestionName, u.ShowOrder }).OrderBy(t => t.ShowOrder).ToList() });
 
 
                 }
@@ -677,10 +678,13 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                     QuestionAnswerList =
 
                 //需要手动添加病灶类型
-                tableQuestionAnswerList.Join(tableQuesionList, t => t.TableQuestionId, u => u.QuestionId, (t, u) => new {
-                     Answer= t.Answer /*u.Unit==ValueUnit.Custom? t.Answer+u.CustomUnit:(u.Unit != ValueUnit.None|| u.Unit != null)*/, 
+                tableQuestionAnswerList.Join(tableQuesionList, t => t.TableQuestionId, u => u.QuestionId, (t, u) => 
+                new {
+                    t.Answer        /*u.Unit==ValueUnit.Custom? t.Answer+u.CustomUnit:(u.Unit != ValueUnit.None|| u.Unit != null)*/, 
                     u.QuestionName,
-                    u.ShowOrder }).OrderBy(t => t.ShowOrder).ToList()
+                    u.DictionaryCode,
+                    u.ShowOrder }
+                ).OrderBy(t => t.ShowOrder).ToList()
                 });