From 23cbf79474ccffff33b8446cac8bde093414e0c1 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Thu, 27 Apr 2023 14:06:36 +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/Resources/en-US.json  |  6 +++---
 .../ReadingImageTaskService.cs                | 15 +++++++++----
 IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs  |  5 +----
 .../Common/ReadingCommon.cs                   | 21 ++++++++++++++++++-
 4 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/IRaCIS.Core.Application/Resources/en-US.json b/IRaCIS.Core.Application/Resources/en-US.json
index 178549491..306b8cba1 100644
--- a/IRaCIS.Core.Application/Resources/en-US.json
+++ b/IRaCIS.Core.Application/Resources/en-US.json
@@ -330,9 +330,7 @@
   "QCOperation_UnresolvedQCQuery": "This operation is not allowed, because the inquiry of the current visitis is not closed. ",
   "QCOperation_CrcNoDelete": "The CRC has been committed and cannot be deleted.",
   "QCOperation_NoRecipient": "You are not the current recipient of the quality control task, no operation authority!",
-  "QCOperation_QCImageTaskAlreadyReleased": "The image quality control task of the current visit has been released by the original recipient. You can get it by ",
-  "pick",
-  "up\".\"",
+  "QCOperation_QCImageTaskAlreadyReleased": "The image quality control task of the current visit has been released by the original recipient. You can get it by 'pick up'.",
   "QCOperation_QCTaskNoAccess": "The image quality control task of the current visit has been claimed by other QC, so it is not allowed to pick up.",
   "QCOperation_QCConfigFirst": "Please configure the image quality control review question before receiving the image quality control task.",
   "QCOperation_NoQC": "The project configuration of image QC process was not check, and the QC Task was not picked up.",
@@ -382,6 +380,8 @@
   "TrialQCQuestion_ReferencedByQCProcess": "This review question has been cited by the image quality control process and is not allowed to be deleted.",
 
 
+
+
   // ------------------------------------------------------------QC--------------------------------------------------------------------
 
   // ------------------------------------------------------------SiteSurvey--------------------------------------------------------------------
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
index 62aae8533..85daf0c5a 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
@@ -848,7 +848,6 @@ namespace IRaCIS.Application.Services
             var organIds = tableAnsweRowInfos.Where(x => x.OrganInfoId != null).Select(x => x.OrganInfoId).Distinct().ToList();
             var organList = await _organInfoRepository.Where(x => organIds.Contains(x.Id)).ToListAsync();
             return (await this.GetReadingTableQuestion(
-
                 new GetReadingTableQuestionOrAnswerInDto()
                 {
                     TrialReadingCriterionId = taskInfo.TrialReadingCriterionId,
@@ -921,9 +920,17 @@ namespace IRaCIS.Application.Services
                     }
 
 
-                    if (inDto.TaskId != null && !taskInfo.IsConvertedTask)
+                    if (inDto.TaskId != null )
                     {
-                        qusetionList = qusetionList.Where(x => x.QuestionType != QuestionType.IsConverted).OrderBy(x => x.ShowOrder).ToList();
+                        if (taskInfo.IsConvertedTask)
+                        {
+                            qusetionList = qusetionList.Where(x => x.ConvertShowType == ConvertShowType.All || x.ConvertShowType == ConvertShowType.AfterShow).OrderBy(x => x.ShowOrder).ToList();
+                        }
+                        else
+                        {
+							qusetionList = qusetionList.Where(x => x.ConvertShowType == ConvertShowType.All || x.ConvertShowType == ConvertShowType.BeforeShow).OrderBy(x => x.ShowOrder).ToList();
+						}
+                      
                     }
 
                     var usedGuropIds = qusetionList.Where(x => x.Type == ReadingQestionType.Table).Select(x => x.GroupId).ToList();
@@ -1178,7 +1185,7 @@ namespace IRaCIS.Application.Services
                 });
 
 
-                answers.Add("LesionType", rowInfo.LesionType.ToString()); 
+                answers.Add("LesionType", rowInfo.LesionType.GetEnumNullInt()); 
                 answers.Add("BlindName", rowInfo.BlindName);
                 answers.Add("IsFirstChangeTask", isFirstChangeTask.ToString());
                 answers.Add("FromMark", rowInfo.FromMark);
diff --git a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
index 1afd4a8bd..f73646437 100644
--- a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
+++ b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
@@ -1472,10 +1472,7 @@ namespace IRaCIS.Core.Domain.Share
         /// </summary>
         IsBrainMetastasis =43,
 
-        /// <summary>
-        /// 是否转变之后表格问题
-        /// </summary>
-        IsConverted = 44,
+       
     }
 
     /// <summary>
diff --git a/IRaCIS.Core.Infra.EFCore/Common/ReadingCommon.cs b/IRaCIS.Core.Infra.EFCore/Common/ReadingCommon.cs
index 47fa3c60d..7460d32d0 100644
--- a/IRaCIS.Core.Infra.EFCore/Common/ReadingCommon.cs
+++ b/IRaCIS.Core.Infra.EFCore/Common/ReadingCommon.cs
@@ -158,7 +158,26 @@ namespace IRaCIS.Core.Infra.EFCore.Common
         /// <typeparam name="T"></typeparam>
         /// <param name="value"></param>
         /// <returns></returns>
-        public static string GetEnumInt<T>(this T value) where T : Enum
+        public static string GetEnumNullInt<T>(this T? value) where T : struct, Enum
+		{
+            if (value == null)
+            {
+                return string.Empty;
+            }
+            else
+            {
+				return ((int)(object)value).ToString();
+			}
+			
+		}
+
+		/// <summary>
+		/// 获取枚举Int值
+		/// </summary>
+		/// <typeparam name="T"></typeparam>
+		/// <param name="value"></param>
+		/// <returns></returns>
+		public static string GetEnumInt<T>(this T value) where T : Enum
         {
            
             return ((int)(object)value).ToString();