修改质疑

2022-11-29 17:53:55 +08:00
parent a051342181
commit 4942089b0c
4 changed files with 30 additions and 8 deletions
@@ -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;
@@ -239,7 +244,7 @@ namespace IRaCIS.Core.Application.Contracts.DTO

    public class ChallengeAndDialog: QCChallengeWithUser
    {
-
+      
        public List<QCChanllengeDialogDTO> DialogList { get; set; } = new List<QCChanllengeDialogDTO>();
    }

@@ -1329,13 +1329,17 @@ namespace IRaCIS.Core.Application.Image.QA
                return ResponseOutput.NotOk("您已经被移出项目，没有操作权限。");
            }

-            //判断质疑是否都关闭了
-            if (await _repository.AnyAsync<QCChallenge>(t => t.SubjectVisitId == subjectVisitId && t.IsClosed == false))
+
+            if(auditState== AuditStateEnum.QCPassed)
            {
-                return ResponseOutput.NotOk("当前访视有影像质控质疑未关闭，不能进行此操作。");
+                //判断质疑是否都关闭了
+                if (await _repository.AnyAsync<QCChallenge>(t => t.SubjectVisitId == subjectVisitId && t.IsClosed == false))
+                {
+                    return ResponseOutput.NotOk("当前访视有影像质控质疑未关闭，不能进行此操作。");
+                }
            }

-
+           

            var trialConfig = await _trialRepository
                  .Select(t => new { TrialId = t.Id, t.QCProcessEnum, t.IsImageConsistencyVerification })
@@ -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;
@@ -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>()