From 4a433fc18d6a73fbb2f5eba5c4cc533297dbe48f Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Tue, 1 Nov 2022 09:36: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

---
 .../Service/Reading/Dto/OrganInfoViewModel.cs | 32 +++++++++++++++++++
 .../ReadingCriterion/OrganInfoService.cs      |  6 ++++
 .../ReadingImageTaskService.cs                |  2 +-
 IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs  |  5 +++
 4 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs
index 7fb68db7d..dfeb901d7 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs
@@ -213,6 +213,38 @@ namespace IRaCIS.Core.Application.ViewModel
         public bool? IsEnable { get; set; }
 
         public IsLymph? IsLymphNodes { get; set; }
+
+
+        public string Part { get; set; } = string.Empty;
+        public string TULOC { get; set; } = string.Empty;
+        public string TULAT { get; set; } = string.Empty;
+
+
+
+
+
+
+
+
+
+
+        /// <summary>
+        /// 部位 英文
+        /// </summary>
+        public string PartEN { get; set; } = string.Empty;
+
+
+        /// <summary>
+        /// TULOC 英文
+        /// </summary>
+        public string TULOCEN { get; set; } = string.Empty;
+
+
+
+        /// <summary>
+        /// 位置 英文
+        /// </summary>
+        public string TULATEN { get; set; } = string.Empty;
     }
 
     public class GetTrialCheckOrganList : GetTrialOrganListOutDto
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/OrganInfoService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/OrganInfoService.cs
index 8a4856682..7f064ffba 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/OrganInfoService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/OrganInfoService.cs
@@ -156,6 +156,12 @@ namespace IRaCIS.Core.Application.Service
                                                  .WhereIf(inDto.OrganType != null, x => x.OrganType == inDto.OrganType)
                                                  .WhereIf(inDto.IsLymphNodes != null, x => x.IsLymphNodes == inDto.IsLymphNodes)
                                                   .WhereIf(inDto.LesionType != null, x => organs.Contains(x.OrganType))
+                                                   .WhereIf(!inDto.Part.IsNullOrEmpty(), x => x.Part.Contains(inDto.Part))
+                                                    .WhereIf(!inDto.TULOC.IsNullOrEmpty(), x => x.Part.Contains(inDto.TULOC))
+                                                     .WhereIf(!inDto.TULAT.IsNullOrEmpty(), x => x.Part.Contains(inDto.TULAT))
+                                                      .WhereIf(!inDto.PartEN.IsNullOrEmpty(), x => x.Part.Contains(inDto.PartEN))
+                                                       .WhereIf(!inDto.TULOC.IsNullOrEmpty(), x => x.Part.Contains(inDto.TULOC))
+                                                          .WhereIf(!inDto.TULATEN.IsNullOrEmpty(), x => x.Part.Contains(inDto.TULATEN))
                                      join trialData in _organTrialInfoRepository.WhereIf(inDto.IsEnable != null, x => x.IsEnable == inDto.IsEnable)
 
                                                  .WhereIf(inDto.IsEnable != null, x => x.IsEnable == inDto.IsEnable)
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
index a7317fba6..963e5d4b6 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
@@ -839,7 +839,7 @@ namespace IRaCIS.Application.Services
                         if (rowCount > item.MaxRowCount.Value - 1)
                         {
                             //throw new BusinessValidationFailedException($"问题{item.QuestionName}最大相同问题数为{item.MaxRowCount.Value},当前已存在{rowCount}条！");
-                            throw new BusinessValidationFailedException($"当前器官上已有{rowCount}个病灶！");
+                            throw new BusinessValidationFailedException($"当前器官上已有{rowCount}个靶病灶！");
                         }
                     }
 
diff --git a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
index 10eb98c9d..ef406a99e 100644
--- a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
+++ b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
@@ -779,6 +779,11 @@ namespace IRaCIS.Core.Domain.Share
         /// 非淋巴结靶病灶
         /// </summary>
         NonNodularTargetLesions = 2,
+
+        /// <summary>
+        /// 通用
+        /// </summary>
+        General = 3,
     }
 
     /// <summary>