From e0613c1f2def0736aed7a5b3d79a7532b4ecf3da Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Mon, 15 Apr 2024 15:54:46 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.Application/IRaCIS.Core.Application.xml      | 7 +++++++
 IRaCIS.Core.Application/Service/QC/QCOperationService.cs | 5 +++--
 IRaCIS.Core.Application/Triggers/SubjectVisitTrigger.cs  | 4 +++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 3e9cfbdce..0da7c3bf2 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -13281,6 +13281,13 @@
             <param name="id"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Application.Services.ReadingClinicalDataService.GetStudyClinicalData(IRaCIS.Core.Application.Service.Reading.Dto.GetStudyClinicalDataInDto)">
+            <summary>
+            获取检查类型临床数据
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Application.Services.ReadingClinicalDataService.GetCRCClinicalData(IRaCIS.Core.Application.Service.Reading.Dto.GetCRCClinicalDataInDto)">
             <summary>
             获取CRC上传的文件
diff --git a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs
index 71d460c9b..16e29bac4 100644
--- a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs
+++ b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs
@@ -1230,12 +1230,13 @@ namespace IRaCIS.Core.Application.Image.QA
         //[Authorize(Policy = IRaCISPolicy.CRC)]
         public async Task<IResponseOutput> CRCRequestToQC(CRCRequestToQCCommand cRCRequestToQCCommand)
         {
-
+			List<string> modalitieTypess = new List<string>() { "PT、CT", "CT、PT", "PET-CT" };
 			// 验证临床数据 是否有Pet类型
 			#region 验证临床数据 是否有Pet类型
 			foreach (var item in cRCRequestToQCCommand.SubjectVisitIds)
 			{
-				if (await _dicomStudyRepository.AnyAsync(x => x.SubjectVisitId == item && (x.ModalityForEdit.Contains("PT")&& x.ModalityForEdit.Contains("CT"))))
+			
+				if (await _dicomStudyRepository.AnyAsync(x => x.SubjectVisitId == item && modalitieTypess.Contains(x.Modalities)))
 				{
 					var visit = await _subjectVisitRepository.Where(x => x.Id == item).FirstNotNullAsync();
 					var clinicalData = await this._readingClinicalDataService.GetStudyClinicalData(new Service.Reading.Dto.GetStudyClinicalDataInDto()
diff --git a/IRaCIS.Core.Application/Triggers/SubjectVisitTrigger.cs b/IRaCIS.Core.Application/Triggers/SubjectVisitTrigger.cs
index 6c4336d22..04e0c5d44 100644
--- a/IRaCIS.Core.Application/Triggers/SubjectVisitTrigger.cs
+++ b/IRaCIS.Core.Application/Triggers/SubjectVisitTrigger.cs
@@ -72,7 +72,9 @@ namespace IRaCIS.Core.Application.Triggers
                 // 检查类型  ModalityForEdit
                 // 检查模态  Modalities
                 var modalities = context.Entity.Modalities;
-                if (modalities.Contains("PT") && modalities.Contains("CT"))
+                List<string> modalitieTypess = new List<string>() { "PT、CT", "CT、PT", "PET-CT"};
+
+				if (modalitieTypess.Contains(modalities))
                 {
 					await _iClinicalAnswerService.AddStudyClinical(new Service.Reading.Dto.AddStudyClinicalInDto()
 					{