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

IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs

@@ -1,4 +1,5 @@
 using IRaCIS.Application.Contracts;
+using IRaCIS.Core.Application.MediatR.CommandAndQueries;
 using IRaCIS.Core.Domain.Share;
 using Newtonsoft.Json;
 
@@ -478,6 +479,23 @@ namespace IRaCIS.Core.Application.Contracts.DTO
         public bool? IsCRCNeedReply { get; set; }
 
         public UserTypeEnum UserTypeEnum { get; set; }
+
+        public string ParamInfo { get; set; }
+
+        public List<ParamInfoDto> ParamInfoList
+        {
+            get {
+                try
+                {
+                   return  JsonConvert.DeserializeObject<List<ParamInfoDto>>(ParamInfo);
+                }
+                catch (Exception e)
+                {
+
+                    return new List<ParamInfoDto>();
+                }
+            }
+        }
     }
 
 

IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs

@@ -545,7 +545,7 @@ namespace IRaCIS.Application.Services
                 {ClinicalLevel.Subject,4 },
             };
 
-            result.OrderBy(x => keys[x.ClinicalDataLevel]).ToList();
+            result = result.OrderBy(x => keys[x.ClinicalDataLevel]).ToList();
 
             return (result, new
             {

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

@@ -385,6 +385,7 @@ namespace IRaCIS.Application.Services
 
                 }).OrderBy(x => x.VisitTaskNum).ToListAsync();
 
+
             if (!taskInfo.TrialReadingCriterion.IsReadingTaskViewInOrder)
             {
                 result = result.Where(x => x.VisitTaskId == inDto.VisitTaskId).ToList();