xx

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

@@ -176,6 +176,8 @@ namespace IRaCIS.Core.Application.Contracts
     public class QCCRCChallengeViewModel
     {
         public Guid? PreliminaryAuditUserId { get; set; }
+        public Guid? CurrentActionUserId { get; set; }
+
         public bool IsBaseLine { get; set; }
         public bool IsUrgent { get; set; }
         public Guid? ClinicalDataSignUserId { get; set; }

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

@@ -198,8 +198,9 @@ namespace IRaCIS.Core.Application.Service
 
             //CRC 质疑列表
             CreateMap<QCChallenge, QCCRCChallengeViewModel>()
-                .ForMember(d => d.PreliminaryAuditUserName, u => u.MapFrom(s => s.SubjectVisit.PreliminaryAuditUser.UserName))
-                .ForMember(d => d.PreliminaryAuditUserId, u => u.MapFrom(s => s.SubjectVisit.PreliminaryAuditUserId))
+               .ForMember(d => d.PreliminaryAuditUserName, u => u.MapFrom(s => s.SubjectVisit.PreliminaryAuditUser.UserName))
+               .ForMember(d => d.PreliminaryAuditUserId, u => u.MapFrom(s => s.SubjectVisit.PreliminaryAuditUserId))
+               .ForMember(d => d.CurrentActionUserId, u => u.MapFrom(s => s.SubjectVisit.CurrentActionUserId))
               .ForMember(d => d.SiteId, u => u.MapFrom(s => s.SubjectVisit.SiteId))
               .ForMember(d => d.AuditState, u => u.MapFrom(s => s.SubjectVisit.AuditState))
               .ForMember(d => d.IsUrgent, u => u.MapFrom(s => s.SubjectVisit.IsUrgent))

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

@@ -1,11 +1,9 @@
 using IRaCIS.Application.Interfaces;
 using IRaCIS.Application.Contracts;
-using IRaCIS.Core.Infra.EFCore;
 using IRaCIS.Core.Application.Filter;
 using IRaCIS.Core.Domain.Share;
 using Microsoft.AspNetCore.Mvc;
 using IRaCIS.Core.Application.Service.Inspection.Interface;
-using IRaCIS.Core.Infrastructure;
 using Newtonsoft.Json;
 using IRaCIS.Core.Domain.Common;