From d193834e056a12615dec683a4f35d524749d4c60 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Wed, 30 Jul 2025 14:05:08 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=B4=A8=E7=96=91=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=A4=8D=E6=A0=B8=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs | 1 + IRaCIS.Core.Application/Service/QC/_MapConfig.cs | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs index 3f34cfa0a..5e111d11f 100644 --- a/IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs +++ b/IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs @@ -201,6 +201,7 @@ namespace IRaCIS.Core.Application.Contracts.DTO public class QCChallengeWithUser : QCChallengeCommand { + public SecondReviewState SecondReviewState { get; set; } public bool IsBaseLine { get; set; } public string VisitName { get; set; } public string BlindName { get; set; } = string.Empty; diff --git a/IRaCIS.Core.Application/Service/QC/_MapConfig.cs b/IRaCIS.Core.Application/Service/QC/_MapConfig.cs index 8c8ae3bed..fd4d75e1f 100644 --- a/IRaCIS.Core.Application/Service/QC/_MapConfig.cs +++ b/IRaCIS.Core.Application/Service/QC/_MapConfig.cs @@ -653,6 +653,7 @@ namespace IRaCIS.Core.Application.Service .ForMember(d => d.SubjectId, u => u.MapFrom(t => t.SubjectVisit.SubjectId)) .ForMember(d => d.ChallengeCode, u => u.MapFrom(s => s.ChallengeCode)) + .ForMember(d => d.SecondReviewState, u => u.MapFrom(s => s.SubjectVisit.SecondReviewState)) .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.IsBaseLine, u => u.MapFrom(s => s.SubjectVisit.IsBaseLine)) @@ -669,7 +670,7 @@ 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.SecondReviewState, u => u.MapFrom(s => s.SubjectVisit.SecondReviewState)) .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.IsBaseLine, u => u.MapFrom(s => s.SubjectVisit.IsBaseLine)) @@ -701,6 +702,7 @@ namespace IRaCIS.Core.Application.Service .ForMember(d => d.TrialSiteCode, u => u.MapFrom(s => s.SubjectVisit.TrialSite.TrialSiteCode)) .ForMember(d => d.VisitName, u => u.MapFrom(s => s.SubjectVisit.VisitName)) .ForMember(d => d.RequestBackState, u => u.MapFrom(s => s.SubjectVisit.RequestBackState)) + //.ForMember(d => d.SecondReviewState, u => u.MapFrom(s => s.SubjectVisit.SecondReviewState)) .ForMember(d => d.VisitNum, u => u.MapFrom(s => s.SubjectVisit.VisitNum)) .ForMember(d => d.BlindName, u => u.MapFrom(s => s.SubjectVisit.BlindName)) //.ForMember(d => d.ClosedUserUserName, u => u.MapFrom(s => s.ClosedUser.UserName)) From f32a66a89b94d4b21e67cc74cca968b3cf6e2443 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Wed, 30 Jul 2025 14:08:01 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=B9=E8=AF=9D?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=A4=8D=E6=A0=B8=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs | 1 + IRaCIS.Core.Application/Service/QC/_MapConfig.cs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs index ad95c2d6a..73a71df38 100644 --- a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs +++ b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs @@ -1883,6 +1883,7 @@ namespace IRaCIS.Core.Application.Contracts public class QCCRCChallengeViewModel { + public SecondReviewState SecondReviewState { get; set; } public bool IsSubjectQuit { get; set; } public Guid? PreliminaryAuditUserId { get; set; } diff --git a/IRaCIS.Core.Application/Service/QC/_MapConfig.cs b/IRaCIS.Core.Application/Service/QC/_MapConfig.cs index fd4d75e1f..dca2bf440 100644 --- a/IRaCIS.Core.Application/Service/QC/_MapConfig.cs +++ b/IRaCIS.Core.Application/Service/QC/_MapConfig.cs @@ -702,7 +702,7 @@ namespace IRaCIS.Core.Application.Service .ForMember(d => d.TrialSiteCode, u => u.MapFrom(s => s.SubjectVisit.TrialSite.TrialSiteCode)) .ForMember(d => d.VisitName, u => u.MapFrom(s => s.SubjectVisit.VisitName)) .ForMember(d => d.RequestBackState, u => u.MapFrom(s => s.SubjectVisit.RequestBackState)) - //.ForMember(d => d.SecondReviewState, u => u.MapFrom(s => s.SubjectVisit.SecondReviewState)) + .ForMember(d => d.SecondReviewState, u => u.MapFrom(s => s.SubjectVisit.SecondReviewState)) .ForMember(d => d.VisitNum, u => u.MapFrom(s => s.SubjectVisit.VisitNum)) .ForMember(d => d.BlindName, u => u.MapFrom(s => s.SubjectVisit.BlindName)) //.ForMember(d => d.ClosedUserUserName, u => u.MapFrom(s => s.ClosedUser.UserName))