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

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

@@ -165,6 +165,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public string GlobalChangeAnswer { get; set; } = string.Empty;
 
+        public List<CrterionDictionaryGroup> CrterionDictionaryGroup { get; set; }
+
 
     }
 
@@ -271,6 +273,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         public decimal VisitTaskNum { get; set; }
 
         public bool IsCurrentTask { get; set; }
+
+        public List<CrterionDictionaryGroup> CrterionDictionaryGroup { get; set; }
     }
 
     public class MergeLesionInDto
@@ -383,6 +387,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
     {
         public string Answer { get; set; }
 
+        public List<CrterionDictionaryGroup> CrterionDictionaryGroup { get; set; }
+
         public List<DicomReadingQuestionAnswer> Childrens = new List<DicomReadingQuestionAnswer>();
     }
 
@@ -624,6 +630,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
     public class TrialReadQuestionData : ReadingQuestionTrial
     {
 
+        public List<CrterionDictionaryGroup> CrterionDictionaryGroup { get; set; }
+
         public bool IsPage { get; set; } = false;
 
         public string Answer { get; set; }

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

@@ -633,7 +633,21 @@ namespace IRaCIS.Application.Services
 
             if (visitTaskId != null)
             {
-                answers = await _readingTaskQuestionAnswerRepository.Where(x => x.VisitTaskId == visitTaskId).ToListAsync(); ;
+                answers = await _readingTaskQuestionAnswerRepository.Where(x => x.VisitTaskId == visitTaskId).ToListAsync();
+
+                var taskinfo = await _visitTaskRepository.Where(x => x.Id == visitTaskId).FirstNotNullAsync();
+                questions.ForEach(x =>
+                {
+                    x.CrterionDictionaryGroup = taskinfo.CrterionDictionaryGroup;
+                });
+            }
+            else
+            {
+                var crterionDictionaryGroup= new List<CrterionDictionaryGroup>() { CrterionDictionaryGroup.General, CrterionDictionaryGroup.BeforeConvert };
+                questions.ForEach(x =>
+                {
+                    x.CrterionDictionaryGroup = crterionDictionaryGroup;
+                });
             }
 
 
@@ -823,9 +837,27 @@ namespace IRaCIS.Application.Services
 
             }).OrderBy(x => x.ShowOrder).ToListAsync();
 
-         
-            //是否是预览
-            if (inDto.IsGetPreview == false)
+            if (inDto.TaskId != null)
+            {
+                var taskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.TaskId).FirstNotNullAsync();
+
+                qusetionList.ForEach(x =>
+                {
+
+                    x.CrterionDictionaryGroup = taskInfo.CrterionDictionaryGroup;
+                });
+            }
+            else
+            {
+                qusetionList.ForEach(x =>
+                {
+
+                    x.CrterionDictionaryGroup = new List<CrterionDictionaryGroup>() { CrterionDictionaryGroup.General, CrterionDictionaryGroup.BeforeConvert };
+                });
+            }
+
+                //是否是预览
+                if (inDto.IsGetPreview == false)
             {
                 // 是否获取所有问题
                 if (inDto.IsGetallQuestion)