From 045c6bfc9f8ad1cb8c85bd4d3bfa65dc1a63bb47 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Tue, 27 Jun 2023 18:05:00 +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

---
 .../ClinicalData/ClinicalDataSetService.cs        | 15 +++++++++++++--
 IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs      |  7 ++++++-
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalDataSetService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalDataSetService.cs
index 726d5388f..75207345c 100644
--- a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalDataSetService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalDataSetService.cs
@@ -61,7 +61,13 @@ namespace IRaCIS.Application.Services
         [HttpPost]
         public async Task<IResponseOutput> ApplySystemClinical(ApplySystemClinicalInDto inDto)
         {
-            if (_systemClinicalQuestionRepository.Where(x => x.SystemClinicalId == inDto.SystemClinicalId && x.IsCheckDate).Count() != 1)
+
+            var isNeedVerify = await _clinicalDataSystemSetRepository.AnyAsync(x => x.Id == inDto.SystemClinicalId && (x.ClinicalDataLevel == ClinicalLevel.ImageRead || x.ClinicalDataLevel == ClinicalLevel.OncologyRead)
+			&& x.ClinicalUploadType == ClinicalUploadType.Structuring && x.UploadRole == UploadRole.CRC
+            );
+
+
+			if (_systemClinicalQuestionRepository.Where(x => isNeedVerify&& x.SystemClinicalId == inDto.SystemClinicalId && x.IsCheckDate).Count() != 1)
             {
                 throw new BusinessValidationFailedException(_localizer["ClinicalDataSet_Apply"]);
               
@@ -87,7 +93,12 @@ namespace IRaCIS.Application.Services
         [HttpPost]
         public async Task<IResponseOutput> ApplyTrialClinical(ApplyTrialClinicalInDto inDto)
         {
-            if (_trialClinicalQuestionRepository.Where(x => x.TrialClinicalId == inDto.TrialClinicalId && x.IsCheckDate).Count() != 1)
+
+			var isNeedVerify = await _clinicalDataTrialSetRepository.AnyAsync(x => x.Id == inDto.TrialClinicalId && (x.ClinicalDataLevel == ClinicalLevel.ImageRead|| x.ClinicalDataLevel==ClinicalLevel.OncologyRead)
+		  && x.ClinicalUploadType == ClinicalUploadType.Structuring && x.UploadRole == UploadRole.CRC
+		 );
+
+			if (_trialClinicalQuestionRepository.Where(x => isNeedVerify&& x.TrialClinicalId == inDto.TrialClinicalId && x.IsCheckDate).Count() != 1)
             {
                 throw new BusinessValidationFailedException(_localizer["ClinicalDataSet_Apply"]);
 
diff --git a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
index 64b2ce88a..826d10683 100644
--- a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
+++ b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
@@ -1239,7 +1239,12 @@ namespace IRaCIS.Core.Domain.Share
         [Display(Name = "PDF")]
         PDF = 1,
 
-    }
+		/// <summary>
+		/// 结构化录入
+		/// </summary>
+		Structuring = 2,
+
+	}
 
     /// <summary>
     /// 数据类型