Merge branch 'master' of http://192.168.1.2:8033/IRaCIS_Core_Api

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

@@ -79,6 +79,14 @@ namespace IRaCIS.Core.Application.ViewModel
         public Guid Id { get; set; }
     }
 
+    public class BatchDeteteCriterionMedicineQuestionInDto
+    {
+        public Guid TrialReadingCriterionId { get; set; }
+
+        public List<Guid> Ids { get; set; }
+    }
+
+
     public class TrialDataFromSystem : ReadingMedicineTrialQuestion
     {
         public Guid SystemQuestionId { get; set; }

IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicineQuestionService.cs

@@ -452,13 +452,26 @@ namespace IRaCIS.Core.Application.Service
 			}
 		}
 
+        /// <summary>
+        /// 批量删除医学审核问题
+        /// </summary>
+        /// <param name="inDto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<IResponseOutput> BatchDeteteCriterionMedicineQuestion(BatchDeteteCriterionMedicineQuestionInDto inDto)
+		{
+			await _readingMedicineTrialQuestionRepository.BatchDeleteNoTrackingAsync(x => inDto.Ids.Contains(x.Id));
+	    	var result=	await _readingMedicineTrialQuestionRepository.SaveChangesAsync();
+			return ResponseOutput.Result(result);
+        }
 
-		/// <summary>
-		/// 从系统里面选择问题添加到项目里面
-		/// </summary>
-		/// <param name="inDto"></param>
-		/// <returns></returns>
-		[HttpPost]
+
+        /// <summary>
+        /// 从系统里面选择问题添加到项目里面
+        /// </summary>
+        /// <param name="inDto"></param>
+        /// <returns></returns>
+        [HttpPost]
 		public async Task<IResponseOutput> AddTrialDataFromSystem(AddTrialDataFromSystemInDto inDto)
 		{
 			// 直接写??

IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs

@@ -355,6 +355,11 @@ namespace IRaCIS.Core.Application.Contracts
             }
         }
 
+        /// <summary>
+        /// 是否加急
+        /// </summary>
+        public bool IsUrgent { get; set; } = false;
+
         /// <summary>
         /// 阅片平台
         /// </summary>
@@ -940,7 +945,13 @@ namespace IRaCIS.Core.Application.Contracts
         /// </summary>
         public bool IsOncologyReading { get; set; }
 
-      public  List<AddOrUpdateTrialCriterionAdditional> TrialCriterionAdditionalAssessmentTypeList { get; set; }=new List<AddOrUpdateTrialCriterionAdditional>();
+
+        /// <summary>
+        /// 是否加急
+        /// </summary>
+        public bool IsUrgent { get; set; } = false;
+
+        public  List<AddOrUpdateTrialCriterionAdditional> TrialCriterionAdditionalAssessmentTypeList { get; set; }=new List<AddOrUpdateTrialCriterionAdditional>();
 
     }
 

IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs

@@ -596,6 +596,7 @@ namespace IRaCIS.Core.Application
                 IsGlobalReading = inDto.IsGlobalReading,
                 IsArbitrationReading = inDto.IsArbitrationReading,
                 IsOncologyReading = inDto.IsOncologyReading,
+                IsUrgent= inDto.IsUrgent,
                 IsAdditionalAssessment = inDto.IsAdditionalAssessment,
                 IsAutoCreate = inDto.IsAutoCreate
 

IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs

@@ -116,9 +116,14 @@ namespace IRaCIS.Core.Domain.Models
 		public CriterionType CriterionType { get; set; }
 
 		/// <summary>
-		///  eCRF报告是否显示在图像页面
+		/// 是否加急
 		/// </summary>
-		public bool IseCRFShowInDicomReading { get; set; } = false;
+        public bool IsUrgent { get; set; } = false;
+
+        /// <summary>
+        ///  eCRF报告是否显示在图像页面
+        /// </summary>
+        public bool IseCRFShowInDicomReading { get; set; } = false;
 
 		#region 阅片单元配置 新加