Merge branch 'Test.IRC' of http://192.168.3.69:2000/XCKJ/irc-netcore-api into Test.IRC

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

@@ -507,6 +507,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public Guid TrialId { get; set; }
 
+          /// <summary>
+        /// 分组分类
+        /// </summary>
+        public List<GroupClassify>? GroupClassifyList { get; set; }
+
         /// <summary>
         /// 问题分类
         /// </summary>

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

@@ -341,6 +341,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public QuestionClassify? QuestionClassify { get; set; }
 
+        /// <summary>
+        /// 分组分类
+        /// </summary>
+        public GroupClassify? GroupClassify { get; set; }
+
         /// <summary>
         /// 单位
         /// </summary>
@@ -450,6 +455,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public QuestionClassify? QuestionClassify { get; set; }
 
+        /// <summary>
+        /// 分组分类
+        /// </summary>
+        public GroupClassify? GroupClassify { get; set; }
+
         /// <summary>
         /// 数据来源
         /// </summary>
@@ -999,6 +1009,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public QuestionClassify? QuestionClassify { get; set; }
 
+        /// <summary>
+        /// 分组分类
+        /// </summary>
+        public GroupClassify? GroupClassify { get; set; }
+
         /// <summary>
         /// 单位
         /// </summary>
@@ -1068,6 +1083,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public QuestionClassify? QuestionClassify { get; set; }
 
+        /// <summary>
+        /// 分组分类
+        /// </summary>
+        public GroupClassify? GroupClassify { get; set; }
+
         public List<string> ParentTriggerValueList { get; set; } = new List<string>();
         public List<string> RelevanceValueList { get; set; } = new List<string>();
 
@@ -1593,6 +1613,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public QuestionClassify? QuestionClassify { get; set; }
 
+        /// <summary>
+        /// 分组分类
+        /// </summary>
+        public GroupClassify? GroupClassify { get; set; }
+
         /// <summary>
         /// 限制编辑
         /// </summary>
@@ -1957,6 +1982,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public QuestionClassify? QuestionClassify { get; set; }
 
+        /// <summary>
+        /// 分组分类
+        /// </summary>
+        public GroupClassify? GroupClassify { get; set; }
+
         /// <summary>
         /// 数据来源
         /// </summary>

IRaCIS.Core.Application/Service/Reading/Interface/IReadingImageTaskService.cs

@@ -23,7 +23,7 @@ namespace IRaCIS.Core.Application.Contracts
         Task<GetGlobalReadingInfoOutDto> GetGlobalReadingInfo(GetGlobalReadingInfoInDto inDto);
 
 
-        Task<List<DicomReadingQuestionAnswer>> GetReadingQuestion(Guid trialReadingCriterionId, Guid? visitTaskId,QuestionClassify? questionClassify);
+        Task<List<DicomReadingQuestionAnswer>> GetReadingQuestion(Guid trialReadingCriterionId, Guid? visitTaskId,QuestionClassify? questionClassify, List<GroupClassify>? groupClassifyList);
 
         Task<GetReadingTableQuestionOutDto> GetReadingTableQuestion(GetReadingTableQuestionOrAnswerInDto inDto);
 

IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs

@@ -704,7 +704,7 @@ namespace IRaCIS.Application.Services
         {
             //await AddDefaultValueToTask(inDto.VisitTaskId);
             var taskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync();
-            var result = await GetReadingQuestion(taskInfo.TrialReadingCriterionId, taskInfo.Id, inDto.QuestionClassify);
+            var result = await GetReadingQuestion(taskInfo.TrialReadingCriterionId, taskInfo.Id, inDto.QuestionClassify,inDto.GroupClassifyList);
 
 
 
@@ -722,7 +722,7 @@ namespace IRaCIS.Application.Services
         /// <param name="visitTaskId"></param>
         /// <returns></returns>
         [NonDynamicMethod]
-        public async Task<List<DicomReadingQuestionAnswer>> GetReadingQuestion(Guid trialReadingCriterionId, Guid? visitTaskId, QuestionClassify? questionClassify)
+        public async Task<List<DicomReadingQuestionAnswer>> GetReadingQuestion(Guid trialReadingCriterionId, Guid? visitTaskId, QuestionClassify? questionClassify, List<GroupClassify>? groupClassifyList)
         {
 
 
@@ -776,7 +776,9 @@ namespace IRaCIS.Application.Services
             //排除表格问题 同时排除组问题
             var groupids = questions.Where(x => x.Type != ReadingQestionType.Group).Select(x => x.GroupId).ToList();
 
-            var result = questions.Where(x => x.Type == ReadingQestionType.Group && groupids.Contains(x.Id)).ToList();
+            var result = questions.Where(x => x.Type == ReadingQestionType.Group && groupids.Contains(x.Id))
+                .WhereIf(groupClassifyList!=null,x=>x.GroupClassify!=null&& groupClassifyList.Contains(x.GroupClassify.Value))
+                .ToList();
 
             foreach (var item in result)
             {
@@ -1562,7 +1564,9 @@ namespace IRaCIS.Application.Services
                     x.FirstAddTaskId,
 
                 }).ToListAsync();
-                await _readingTaskQuestionMarkRepository.BatchDeleteNoTrackingAsync(x => x.VisitTaskId == inDto.VisitTaskId);
+
+                var markquestionId = inDto.Answers.Select(y => y.Id).ToList();
+                await _readingTaskQuestionMarkRepository.BatchDeleteNoTrackingAsync(x => x.VisitTaskId == inDto.VisitTaskId&& markquestionId.Contains(x.QuestionId));
                 var datetime = DateTime.Now;
 
                 var markList = _mapper.Map<List<QuestionMarkInfo>, List<ReadingTaskQuestionMark>>(inDto.QuestionMarkInfoList);

IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs

@@ -67,6 +67,18 @@ namespace IRaCIS.Core.Domain.Share
     }
 
 
+    /// <summary>
+    /// 分组分类
+    /// </summary>
+    public enum GroupClassify
+    {
+       /// <summary>
+       /// 质量问题
+       /// </summary>
+       QualityProblem = 1,
+ 
+    }
+
     /// <summary>
     /// 临床表格问题标识
     /// </summary>

IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs

@@ -203,10 +203,15 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public string? FileType { get; set; }
 
-		/// <summary>
-		/// 问题分类
-		/// </summary>
-		public QuestionClassify? QuestionClassify { get; set; }
+        /// <summary>
+        /// 分组分类
+        /// </summary>
+        public GroupClassify? GroupClassify { get; set; }
+
+        /// <summary>
+        /// 问题分类
+        /// </summary>
+        public QuestionClassify? QuestionClassify { get; set; }
 
 		[JsonIgnore]
 		[ForeignKey("GroupId")]

IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs

@@ -271,6 +271,13 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public Guid? GroupId { get; set; }
 
+
+		/// <summary>
+		/// 分组分类
+		/// </summary>
+		public GroupClassify? GroupClassify { get; set; }
+
+
         /// <summary>
         /// 问题分类
         /// </summary>