修改一致性核查颜色

IRaCIS.Core.Application/Service/Allocation/TaskMedicalReviewService.cs

@@ -259,7 +259,7 @@ namespace IRaCIS.Core.Application.Service
                              .ProjectTo<TaskMedicalReviewView>(_mapper.ConfigurationProvider);
 
 
-            var defalutSortArray = new string[] { nameof(TaskMedicalReviewView.AuditState), nameof(TaskMedicalReviewView.SubjectId), nameof(TaskMedicalReviewView.ArmEnum), nameof(TaskMedicalReviewView.VisitTaskNum) };
+            var defalutSortArray = new string[] {  nameof(TaskMedicalReviewView.SubjectId), nameof(TaskMedicalReviewView.ArmEnum), nameof(TaskMedicalReviewView.VisitTaskNum) };
             var pageList = await taskMedicalReviewQueryable.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, inQuery.SortField, inQuery.Asc, string.IsNullOrWhiteSpace(inQuery.SortField), defalutSortArray);
 
             return  ResponseOutput.Ok(pageList, new

IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DicomSeriesModel.cs

@@ -52,6 +52,19 @@ namespace IRaCIS.Core.Application.Contracts.Dicom.DTO
         public string ImageResizePath { get; set; } 
     }
 
+    public class StudyInstanceInfo
+    {
+
+        public int ShowOrder { get; set; }
+
+
+        public decimal RowIndex { get; set; }
+
+        public Guid? SeriesId { get; set; }
+
+        public Guid? StudyId { get; set; }
+        public Guid? InstanceId { get; set; }
+    }
     public class InstanceBasicInfo
     {
         public Guid Id { get; set; }

IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs

@@ -32,6 +32,7 @@ namespace IRaCIS.Core.Application.Services
         private readonly IRepository<DicomInstance> _dicomInstanceRepository;
         private readonly IRepository<VisitTask> _visitTaskRepository;
         private readonly IRepository<ReadingTableAnswerRowInfo> _readingTableAnswerRowInfoRepository;
+        private readonly IRepository<ReadingCustomTag> _readingCustomTagRepository;
         private readonly IRepository<NoneDicomStudyFile> _noneDicomStudyFileRepository;
         private readonly IRepository<ReadingPeriodPlan> _readingPeriodPlanRepository;
         private readonly IRepository<Subject> _subjectRepository;
@@ -50,6 +51,7 @@ namespace IRaCIS.Core.Application.Services
                  IRepository<DicomInstance> dicomInstanceRepository,
                 IRepository<VisitTask> visitTaskRepository,
                    IRepository<ReadingTableAnswerRowInfo> readingTableAnswerRowInfoRepository,
+                     IRepository<ReadingCustomTag> readingCustomTagRepository,
               IRepository<NoneDicomStudyFile> noneDicomStudyFileRepository,
               IRepository<ReadingPeriodPlan> readingPeriodPlanRepository,
             IRepository<Subject> subjectRepository,
@@ -70,6 +72,7 @@ namespace IRaCIS.Core.Application.Services
             this._dicomInstanceRepository = dicomInstanceRepository;
             this._visitTaskRepository = visitTaskRepository;
             this._readingTableAnswerRowInfoRepository = readingTableAnswerRowInfoRepository;
+            this._readingCustomTagRepository = readingCustomTagRepository;
             this._noneDicomStudyFileRepository = noneDicomStudyFileRepository;
             this._readingPeriodPlanRepository = readingPeriodPlanRepository;
             _subjectRepository = subjectRepository;
@@ -574,15 +577,28 @@ namespace IRaCIS.Core.Application.Services
                 //已经签名的任务，加关键序列
                 if (taskInfo.ReadingTaskState == ReadingTaskState.HaveSigned)
                 {
-                    var rowInfoList = await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == indto.VisitTaskId && x.StudyId != null).OrderBy(x => x.ReadingQuestionTrial.ShowOrder).ThenBy(x => x.RowIndex).Select(x => new
+                    var rowInfoList = await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == indto.VisitTaskId && x.StudyId != null).OrderBy(x => x.ReadingQuestionTrial.ShowOrder).ThenBy(x => x.RowIndex).Select(x => new StudyInstanceInfo()
                     {
-                        x.ReadingQuestionTrial.ShowOrder,
-                        x.RowIndex,
-                        x.SeriesId,
-                        x.StudyId,
-                        x.InstanceId,
+                        ShowOrder = x.ReadingQuestionTrial.ShowOrder,
+                        RowIndex = x.RowIndex,
+                        SeriesId = x.SeriesId,
+                        StudyId = x.StudyId,
+                        InstanceId = x.InstanceId,
                     }).ToListAsync();
 
+
+
+                    var customoList = await _readingCustomTagRepository.Where(x => x.VisitTaskId == indto.VisitTaskId && x.StudyId != null).Select(x => new StudyInstanceInfo()
+                    {
+                        ShowOrder = 0,
+                        RowIndex = 0m,
+                        SeriesId = x.SeriesId,
+                        StudyId = x.StudyId,
+                        InstanceId = x.InstanceId,
+                    }).ToListAsync();
+
+                    rowInfoList.AddRange(customoList);
+
                     var thisStudyIds = rowInfoList.OrderBy(x => x.ShowOrder).ThenBy(x => x.RowIndex).Select(x => x.StudyId).Distinct().ToList();
                     var thisSeriesIdIds = rowInfoList.Where(x => x.SeriesId != null).OrderBy(x => x.ShowOrder).ThenBy(x => x.RowIndex).Select(x => x.SeriesId).Distinct().ToList();
                     if (rowInfoList.Count > 0)
@@ -649,7 +665,7 @@ namespace IRaCIS.Core.Application.Services
 
 
 
-                            studyList.Add(thisVisitTaskStudy);
+                            studyList.Insert(0,thisVisitTaskStudy);
 
                         }
 

IRaCIS.Core.Application/_MediatR/Handlers/ConsistencyVerificationHandler.cs

@@ -213,7 +213,7 @@ namespace IRaCIS.Core.Application.MediatR.Handlers
                         else
                         {
                             //"Problems are as follows:
-                            dialogMsg.AppendLine($"<br/><div style='color: yellow'>{_localizer["ConsistencyVerification_Prob"]}</div>");
+                            dialogMsg.AppendLine($"<br/><div style='color: red'>{_localizer["ConsistencyVerification_Prob"]}</div>");
 
                             num = 0;
                             foreach (var item in dbExceptExcel)