修改质疑

IRaCIS.Core.Application/Service/ImageAndDoc/DicomArchiveService.cs

@@ -202,6 +202,7 @@ namespace IRaCIS.Core.Application.Services
 
             var dicModalityList = _dictionaryRepository.Where(t => t.Code == "Modality").SelectMany(t => t.ChildList.Select(c => c.Value)).ToList();
 
+
             dicomStudy = new DicomStudy
             {
                 Id = studyId,
@@ -209,7 +210,7 @@ namespace IRaCIS.Core.Application.Services
                 /* StudyTime = dataset.GetSingleValueOrDefault(DicomTag.StudyDate, DateTime.Now).Add(dataset.GetSingleValueOrDefault(DicomTag.StudyTime, DateTime.Now).TimeOfDay),*///dataset.GetDateTime(DicomTag.StudyDate, DicomTag.StudyTime),
                 StudyTime = dataset.GetSingleValueOrDefault(DicomTag.StudyDate, string.Empty) == string.Empty ? null : dataset.GetSingleValue<DateTime>(DicomTag.StudyDate).Add(dataset.GetSingleValueOrDefault(DicomTag.StudyTime, string.Empty) == string.Empty ? TimeSpan.Zero : dataset.GetSingleValue<DateTime>(DicomTag.StudyTime).TimeOfDay),
                 Modalities = modality,
-                ModalityForEdit = dicModalityList.Contains(modality) ? (modality=="MR"?"MRI": modality) : String.Empty,
+                ModalityForEdit = modality == "MR" ? "MRI": (dicModalityList.Contains(modality) ? modality : String.Empty),
                 Description = dataset.GetSingleValueOrDefault(DicomTag.StudyDescription, string.Empty),
                 InstitutionName = dataset.GetSingleValueOrDefault(DicomTag.InstitutionName, string.Empty),
                 PatientId = dataset.GetSingleValueOrDefault(DicomTag.PatientID, string.Empty),

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

@@ -201,6 +201,11 @@ namespace IRaCIS.Core.Application.Contracts.DTO
 
     public class QCChallengeWithUser : QCChallengeCommand
     {
+
+        public string VisitName { get; set; }
+        public string BlindName { get; set; } = string.Empty;
+        public string SubjectCode { get; set; }
+
         public Guid? CurrentActionUserId { get; set; }
 
         public string CurrentActionUserName { get; set; } = String.Empty;

IRaCIS.Core.Application/Service/QC/QCOperationService.cs

@@ -1329,11 +1329,15 @@ namespace IRaCIS.Core.Application.Image.QA
                 return ResponseOutput.NotOk("您已经被移出项目，没有操作权限。");
             }
 
+
+            if(auditState== AuditStateEnum.QCPassed)
+            {
                 //判断质疑是否都关闭了
                 if (await _repository.AnyAsync<QCChallenge>(t => t.SubjectVisitId == subjectVisitId && t.IsClosed == false))
                 {
                     return ResponseOutput.NotOk("当前访视有影像质控质疑未关闭，不能进行此操作。");
                 }
+            }
 
            
 
@@ -1514,6 +1518,8 @@ namespace IRaCIS.Core.Application.Image.QA
 
                 }
 
+                await _qcChallengeRepository.BatchUpdateNoTrackingAsync(t => t.IsClosed == false, u => new QCChallenge() { IsClosed = true, CloseResonEnum = QCChallengeCloseEnum.Unresolvable });
+
 
             }
             dbSubjectVisit.Auditor = _userInfo.Id;

IRaCIS.Core.Application/Service/QC/_MapConfig.cs

@@ -370,7 +370,11 @@ namespace IRaCIS.Core.Application.Service
                  .ForMember(d => d.CurrentActionUserName, u => u.MapFrom(t => t.SubjectVisit.CurrentActionUser.UserName))
 
                  .ForMember(d => d.SubjectId, u => u.MapFrom(t => t.SubjectVisit.SubjectId))
-                .ForMember(d => d.ChallengeCode, u => u.MapFrom(s => s.ChallengeCode));
+                .ForMember(d => d.ChallengeCode, u => u.MapFrom(s => s.ChallengeCode))
+
+                   .ForMember(d => d.SubjectCode, u => u.MapFrom(s => s.SubjectVisit.Subject.Code))
+                   .ForMember(d => d.VisitName, u => u.MapFrom(s => s.SubjectVisit.VisitName))
+                   .ForMember(d => d.BlindName, u => u.MapFrom(s => s.SubjectVisit.BlindName));
 
 
             CreateMap<QCChallenge, ChallengeAndDialog>()
@@ -381,7 +385,13 @@ namespace IRaCIS.Core.Application.Service
 
                  .ForMember(d => d.SubjectId, u => u.MapFrom(t => t.SubjectVisit.SubjectId))
                  .ForMember(d => d.DialogList, u => u.MapFrom(t => t.DialogList.OrderBy(t => t.CreateTime)))
-                 .ForMember(d => d.ChallengeCode, u => u.MapFrom(s => s.ChallengeCode));
+                 .ForMember(d => d.ChallengeCode, u => u.MapFrom(s => s.ChallengeCode))
+
+                   .ForMember(d => d.SubjectCode, u => u.MapFrom(s => s.SubjectVisit.Subject.Code))
+                   .ForMember(d => d.VisitName, u => u.MapFrom(s => s.SubjectVisit.VisitName))
+                   .ForMember(d => d.BlindName, u => u.MapFrom(s => s.SubjectVisit.BlindName))
+
+                 ;
 
             // 一致性核查文件
             CreateMap<ConsistencyCheckFile, GetConsistencyCheckFileDto>()