S-010

IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalAnswerService.cs

@@ -199,7 +199,10 @@ namespace IRaCIS.Core.Application.Service
                   SubjectId=x.SubjectId,
 					SubjectCode=x.Subject.Code,
                     TrialId=inDto.TrialId,
-					ClinicalDataTrialSetId = x.ClinicalDataTrialSet.Id,
+                    ClinicalDataLevel= x.ClinicalDataTrialSet.ClinicalDataLevel,
+                    ClinicalUploadType= x.ClinicalDataTrialSet.ClinicalUploadType,
+
+                    ClinicalDataTrialSetId = x.ClinicalDataTrialSet.Id,
 					ClinicalDataSetEnName= x.ClinicalDataTrialSet.ClinicalDataSetEnName,
 					ClinicalDataSetName = x.ClinicalDataTrialSet.ClinicalDataSetName,
 				});
@@ -320,8 +323,20 @@ namespace IRaCIS.Core.Application.Service
                 TrialId= inDto.TrialId,
 				Id = inDto.ClinicalFormId ?? NewId.NextGuid(),
 				ReadingId = inDto.ReadingId,
-				VisitId = inDto.VisitId,
 			};
+
+
+            var existsClinical = await _clinicalFormRepository.Where(x =>
+            x.SubjectId == inDto.SubjectId
+            && x.ClinicalDataTrialSetId == inDto.ClinicalDataTrialSetId
+            ).WhereIf(inDto.ReadingId != null, x => x.ReadingId == inDto.ReadingId)
+            .Where(x => x.ClinicalDataTrialSet.UploadRole != UploadRole.CRC && (x.ClinicalDataTrialSet.ClinicalDataLevel != ClinicalLevel.ImageRead
+            || x.ClinicalDataTrialSet.ClinicalDataLevel != ClinicalLevel.OncologyRead)).AnyAsync();
+
+            if (existsClinical)
+            {
+                throw new BusinessValidationFailedException("已经添加过临床数据,不允许多次添加！");
+            }
 			try
             {
 				var checkDateQuestionId = await _trialClinicalQuestionRepository.Where(x => x.TrialClinicalId == inDto.ClinicalDataTrialSetId && x.IsCheckDate).Select(x => x.Id).FirstNotNullAsync();

IRaCIS.Core.Application/Service/Reading/Dto/ClinicalAnswerDto.cs

@@ -30,7 +30,18 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
 		public Guid TrialId { get; set; }
 
-		public string SubjectCode { get; set; }
+        /// <summary>
+        /// 临床级别
+        /// </summary>
+        public ClinicalLevel ClinicalDataLevel { get; set; }
+
+
+        /// <summary>
+        /// 上传方式
+        /// </summary>
+        public ClinicalUploadType ClinicalUploadType { get; set; }
+
+        public string SubjectCode { get; set; }
 		public Guid ClinicalDataTrialSetId { get; set; }
 
         public string ClinicalDataSetName { get; set; }
@@ -259,11 +270,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 	}
 	public class SubmitClinicalFormInDto
     {
-        /// <summary>
-        /// VisitId
-        /// </summary>
-        public Guid? VisitId { get; set; }
-
         /// <summary>
         /// VisitId
         /// </summary>

IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalForm.cs

@@ -44,11 +44,6 @@ namespace IRaCIS.Core.Domain.Models
         /// </summary>
 		public Guid ClinicalDataTrialSetId { get; set; }
 
-        /// <summary>
-        /// VisitId
-        /// </summary>
-        public Guid? VisitId { get; set; }
-
         /// <summary>
         /// VisitId
         /// </summary>