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

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -10558,6 +10558,20 @@
         <member name="M:IRaCIS.Core.Application.Image.QA.QCOperationService.ReplaceQCTaskActionUser(System.Guid,System.Guid)">
             <summary>替换当前领取人 </summary>
         </member>
+        <member name="M:IRaCIS.Core.Application.Image.QA.QCOperationService.CollectNextIQCQuality(IRaCIS.Core.Application.Contracts.GetNextIQCQualityInDto)">
+            <summary>
+            领取下一个质控任务
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Image.QA.QCOperationService.GetNextIQCQuality(IRaCIS.Core.Application.Contracts.GetNextIQCQualityInDto)">
+            <summary>
+            获取下一个质控任务
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.Image.QA.QCOperationService.ObtainOrCancelQCTask(System.Guid,System.Guid,System.Boolean)">
             <summary>
             手动领取 或者取消 QC任务

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

@@ -499,6 +499,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         public Guid VisitTaskId { get; set; }
 
         public Guid TrialId { get; set; }
+
+        /// <summary>
+        /// 问题分类
+        /// </summary>
+        public QuestionClassify? QuestionClassify { get; set; }
     }
 
     public class ReadingTableAnswerRowInfoBase
@@ -719,6 +724,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
     {
         [NotDefault]
         public Guid VisitTaskId { get; set; }
+
+        /// <summary>
+        /// 问题分类
+        /// </summary>
+        public QuestionClassify? QuestionClassify { get; set; }
     }
 
     public class GetReadingTableQuestionOutDto
@@ -795,6 +805,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public List<OrganInfo> OrganInfos { get; set; } = new List<OrganInfo>();
 
+        /// <summary>
+        /// 问题分类
+        /// </summary>
+        public QuestionClassify? QuestionClassify { get; set; }
         public bool IsGetallQuestion { get; set; } = false;
 
         /// <summary>
@@ -947,6 +961,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         public Guid TrialId { get; set; }
 
         public Guid VisitTaskId { get; set; }
+
+        /// <summary>
+        /// 问题分类
+        /// </summary>
+        public QuestionClassify? QuestionClassify { get; set; }
     }
 
     #endregion

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

@@ -336,6 +336,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public ValueOfType? ValueType { get; set; }
 
+        /// <summary>
+        /// 问题分类
+        /// </summary>
+        public QuestionClassify? QuestionClassify { get; set; }
+
         /// <summary>
         /// 单位
         /// </summary>
@@ -439,6 +444,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public ValueOfType? ValueType { get; set; }
 
+        /// <summary>
+        /// 问题分类
+        /// </summary>
+        public QuestionClassify? QuestionClassify { get; set; }
+
         /// <summary>
         /// 数据来源
         /// </summary>
@@ -974,6 +984,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public ValueOfType? ValueType { get; set; }
 
+        /// <summary>
+        /// 问题分类
+        /// </summary>
+        public QuestionClassify? QuestionClassify { get; set; }
+
         /// <summary>
         /// 单位
         /// </summary>
@@ -1038,6 +1053,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public ValueOfType? ValueType { get; set; }
 
+        /// <summary>
+        /// 问题分类
+        /// </summary>
+        public QuestionClassify? QuestionClassify { get; set; }
+
         /// <summary>
         /// 备注
         /// </summary>
@@ -1555,6 +1575,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public ValueOfType? ValueType { get; set; }
 
+        /// <summary>
+        /// 问题分类
+        /// </summary>
+        public QuestionClassify? QuestionClassify { get; set; }
+
         /// <summary>
         /// 限制编辑
         /// </summary>
@@ -1901,6 +1926,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public ValueOfType? ValueType { get; set; }
 
+        /// <summary>
+        /// 问题分类
+        /// </summary>
+        public QuestionClassify? QuestionClassify { get; set; }
+
         /// <summary>
         /// 数据来源
         /// </summary>

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

@@ -6,6 +6,7 @@
 
 
 using IRaCIS.Core.Application.Service.Reading.Dto;
+using IRaCIS.Core.Domain.Share;
 
 namespace IRaCIS.Core.Application.Contracts
 {
@@ -22,7 +23,7 @@ namespace IRaCIS.Core.Application.Contracts
         Task<GetGlobalReadingInfoOutDto> GetGlobalReadingInfo(GetGlobalReadingInfoInDto inDto);
 
 
-        Task<List<DicomReadingQuestionAnswer>> GetReadingQuestion(Guid trialReadingCriterionId, Guid? visitTaskId);
+        Task<List<DicomReadingQuestionAnswer>> GetReadingQuestion(Guid trialReadingCriterionId, Guid? visitTaskId,QuestionClassify? questionClassify);
 
         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);
+            var result = await GetReadingQuestion(taskInfo.TrialReadingCriterionId, taskInfo.Id, inDto.QuestionClassify);
 
             return (result, new
             {
@@ -720,7 +720,7 @@ namespace IRaCIS.Application.Services
         /// <param name="visitTaskId"></param>
         /// <returns></returns>
         [NonDynamicMethod]
-        public async Task<List<DicomReadingQuestionAnswer>> GetReadingQuestion(Guid trialReadingCriterionId, Guid? visitTaskId)
+        public async Task<List<DicomReadingQuestionAnswer>> GetReadingQuestion(Guid trialReadingCriterionId, Guid? visitTaskId, QuestionClassify? questionClassify)
         {
 
 
@@ -729,6 +729,7 @@ namespace IRaCIS.Application.Services
 
             //排除表格问题
             var questions = await _readingQuestionTrialRepository
+                .WhereIf(questionClassify!=null,x=>x.QuestionClassify== questionClassify)
                 .WhereIf(criterionIdInfo.IseCRFShowInDicomReading, x => x.ReadingQuestionCriterionTrialId == trialReadingCriterionId && x.Type != ReadingQestionType.Table)
                 .WhereIf(!criterionIdInfo.IseCRFShowInDicomReading, x => x.IsShowInDicom && x.ReadingQuestionCriterionTrialId == trialReadingCriterionId && x.Type != ReadingQestionType.Table)
 
@@ -893,6 +894,7 @@ namespace IRaCIS.Application.Services
                     TableAnswers = tableAnswers,
                     TableAnsweRowInfos = tableAnsweRowInfos,
                     OrganInfos = organList,
+                    QuestionClassify=inDto.QuestionClassify,
                 }
 
 
@@ -943,7 +945,8 @@ namespace IRaCIS.Application.Services
                     TableAnswers = tableAnswers,
                     TableAnsweRowInfos = tableAnsweRowInfos,
                     IsGetallQuestion = true,
-                    OrganInfos = organList
+                    OrganInfos = organList,
+                    QuestionClassify=inDto.QuestionClassify,
 
                 }
               ), new
@@ -964,7 +967,9 @@ namespace IRaCIS.Application.Services
         {
             var criterionInfo = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == inDto.TrialReadingCriterionId).FirstNotNullAsync();
 
-            var qusetionList = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == inDto.TrialReadingCriterionId).ProjectTo<TrialReadQuestionData>(_mapper.ConfigurationProvider, new
+            var qusetionList = await _readingQuestionTrialRepository
+                .WhereIf(inDto.QuestionClassify!=null,x=>x.QuestionClassify==inDto.QuestionClassify)
+                .Where(x => x.ReadingQuestionCriterionTrialId == inDto.TrialReadingCriterionId).ProjectTo<TrialReadQuestionData>(_mapper.ConfigurationProvider, new
             {
 
                 isEn_Us = _userInfo.IsEn_Us
@@ -1040,7 +1045,9 @@ namespace IRaCIS.Application.Services
             var groupList = new List<TrialReadQuestionData>();
             var qusetionIds = qusetionList.Select(x => x.Id).ToList();
 
-            var tableQuestionList = await _readingTableQuestionTrialRepository.Where(x => qusetionIds.Contains(x.ReadingQuestionId))
+            var tableQuestionList = await _readingTableQuestionTrialRepository
+                   .WhereIf(inDto.QuestionClassify != null, x => x.QuestionClassify == inDto.QuestionClassify)
+                .Where(x => qusetionIds.Contains(x.ReadingQuestionId))
                 .ProjectTo<TableQuestionTrial>(_mapper.ConfigurationProvider, new
                 {
 

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

@@ -297,6 +297,18 @@ namespace IRaCIS.Core.Domain.Share
         Automatic = 1
     }
 
+    /// <summary>
+    /// 问题分类
+    /// </summary>
+    public enum QuestionClassify
+    {
+        /// <summary>
+        /// PET
+        /// </summary>
+        PET = 0,
+
+    }
+
 
     /// <summary>
     /// 自定义计算标记

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

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

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

@@ -261,6 +261,11 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public Guid? GroupId { get; set; }
 
+        /// <summary>
+        /// 问题分类
+        /// </summary>
+        public QuestionClassify? QuestionClassify { get; set; }
+
         [JsonIgnore]
 		[ForeignKey("GroupId")]
 		public ReadingQuestionTrial GroupInfo { get; set; }

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

@@ -173,6 +173,11 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public string? FileType { get; set; }
 
+        /// <summary>
+        /// 问题分类
+        /// </summary>
+        public QuestionClassify? QuestionClassify { get; set; }
+
         [ForeignKey("DependParentId")]
 		[JsonIgnore]
 		public ReadingTableQuestionSystem DependParentQuestion { get; set; }

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

@@ -195,6 +195,11 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public string? FileType { get; set; }
 
+        /// <summary>
+        /// 问题分类
+        /// </summary>
+        public QuestionClassify? QuestionClassify { get; set; }
+
         [JsonIgnore]
 		[ForeignKey("DependParentId")]
 		public ReadingTableQuestionTrial DependParentQuestion { get; set; }