Merge branch 'Test_IRC_Net8' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test_IRC_Net8

IRaCIS.Core.Application/Service/Doctor/DTO/DoctorModel.cs

@@ -813,7 +813,7 @@ namespace IRaCIS.Application.Contracts
         /// </summary>
         public string Remark { get; set; }
 
-
+        public bool IsIRUpload { get; set; } = false;
 
         /// <summary>
         /// 文件类型
@@ -870,12 +870,15 @@ namespace IRaCIS.Application.Contracts
         /// </summary>
         public DateTime CreateTime { get; set; }
 
+        public bool IsIRUpload { get; set; }
+
 
 
     }
 
     public class GetDoctorCriterionFileInDto
     {
+
         public Guid DoctorId { get; set; }
 
         /// <summary>

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

@@ -322,6 +322,13 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public Guid? ClassifyTableQuestionId { get; set; }
 
+        /// <summary>
+        /// 分类问题类型
+        /// </summary>
+        public ClassifyType? ClassifyType { get; set; }
+
+
+
         public string ClassifyAlgorithms { get; set; } = string.Empty;
 
 
@@ -465,6 +472,9 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         public string ExportResultStr { get; set; } = "[]";
 
         public List<ExportResult> ExportResult { get; set; }
+
+        [Comment("图片数量")]
+        public int? ImageCount { get; set; }
     }
 
     ///<summary> ReadingTableQuestionSystemAddOrEdit  列表查询参数模型</summary>
@@ -481,6 +491,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public Guid? ClassifyTableQuestionId { get; set; }
 
+        /// <summary>
+        /// 分类问题类型
+        /// </summary>
+        public ClassifyType? ClassifyType { get; set; }
+
         public string ClassifyAlgorithms { get; set; } = string.Empty;
 
         /// <summary>
@@ -581,7 +596,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public List<ExportResult> ExportResult { get; set; }
 
-
+        [Comment("图片数量")]
+        public int? ImageCount { get; set; }
         public List<string> ParentTriggerValueList { get; set; } = new List<string>();
         public List<string> RelevanceValueList { get; set; } = new List<string>();
 
@@ -1146,6 +1162,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public string GroupEnName { get; set; } = string.Empty;
 
+
+        /// <summary>
+        /// 分类问题类型
+        /// </summary>
+        public ClassifyType? ClassifyType { get; set; }
         public List<string> ParentTriggerValueList { get; set; } = new List<string>();
         public List<string> RelevanceValueList { get; set; } = new List<string>();
         public List<CalculateInfo> CalculateQuestionList { get; set; }
@@ -1161,6 +1182,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         [Comment("导出标识")]
         public ExportIdentification? ExportIdentification { get; set; }
 
+        /// <summary>
+        /// 分类问题类型
+        /// </summary>
+        public ClassifyType? ClassifyType { get; set; }
+
         /// <summary>
         /// 分类算法
         /// </summary>
@@ -1606,6 +1632,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public string Type { get; set; }
 
+        public List<string> TypeList { get; set; } = new List<string>();
+
     }
 
     public class GetTrialGroupNameOutDto
@@ -1744,7 +1772,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
     public class AddOrUpdateReadingQuestionSystemInDto
     {
 
-
+        /// <summary>
+        /// 分类问题类型
+        /// </summary>
+        public ClassifyType? ClassifyType { get; set; }
 
         /// <summary>
         /// 导出标识
@@ -1987,6 +2018,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public Guid? Id { get; set; }
 
+        /// <summary>
+        /// 分类问题类型
+        /// </summary>
+        public ClassifyType? ClassifyType { get; set; }
+
         /// <summary>
         /// 导出标识
         /// </summary>

IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs

@@ -93,7 +93,8 @@ namespace IRaCIS.Core.Application.Service
             var result = await _readingQuestionTrialRepository
 
          .Where(x => x.ReadingQuestionCriterionTrialId == inDto.TrialCriterionId)
-          .WhereIf(!inDto.Type.IsNullOrEmpty(), x => x.Type == inDto.Type)
+         .WhereIf(!inDto.Type.IsNullOrEmpty(), x => x.Type == inDto.Type)
+         .WhereIf(inDto.TypeList.Count()>0, x => inDto.TypeList.Contains(x.Type))
          .OrderBy(x => x.ShowOrder)
          .Select(x => new GetCalculateQuestionsOutDto
          ()
@@ -380,7 +381,7 @@ namespace IRaCIS.Core.Application.Service
         {
             var types = new List<string>()
             {
-                "select","radio"
+                "select","radio","class",
             };
             var questionList = await _readingTableQuestionSystemRepository.Where(x => x.ReadingQuestionId == inDto.ReadingQuestionId)
                    .Where(x => types.Contains(x.Type))
@@ -610,7 +611,7 @@ namespace IRaCIS.Core.Application.Service
         {
             var types = new List<string>()
             {
-                "select","radio"
+                "select","radio","class",
             };
             var questionList = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == inDto.ReadingQuestionCriterionTrialId)
                    .Where(x => types.Contains(x.Type))