xx

IRaCIS.Core.API/Controllers/InspectionController.cs

@@ -100,6 +100,7 @@ namespace IRaCIS.Core.API.Controllers
         [UnitOfWork]
         public async Task<IResponseOutput> AbandonTrial(DataInspectionDto<AbandonTrial> opt)
         {
+            var cc = _userInfo.RequestUrl;
             var fun = await _trialConfigService.AbandonTrial(opt.OptCommand.trialId,opt.OptCommand.isAbandon);
             return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo,null, fun);
         }

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;
 

IRaCIS.Core.Application/TestService.cs

@@ -49,7 +49,9 @@ namespace IRaCIS.Application.Services
             var a = 123;
 
             var b = _localizer["test{0}", "测试"];
-            return _localizer["test{0}", "测试"];
+            //return _localizer["test{0}", "测试"];
+
+            return  _userInfo.RequestUrl;
         }
     }
 

IRaCIS.Core.Domain.Share/AuthUser/IUserInfo.cs

@@ -40,5 +40,7 @@ namespace IRaCIS.Core.Domain.Share
         string IP { get; }
 
         bool IsEn_Us { get;  }
+
+        string RequestUrl { get; }
     }
 }

IRaCIS.Core.Domain.Share/AuthUser/UserInfo.cs

@@ -45,7 +45,7 @@ namespace IRaCIS.Core.Domain.Share
             }
         }
 
-        
+
         /// <summary>
         /// 用户名
         /// </summary>
@@ -147,7 +147,7 @@ namespace IRaCIS.Core.Domain.Share
 
                 if (userType != null && !string.IsNullOrEmpty(userType.Value))
                 {
-                    return int.Parse(userType.Value)==(int)UserTypeEnum.SuperAdmin;
+                    return int.Parse(userType.Value) == (int)UserTypeEnum.SuperAdmin;
                 }
                 return false;
             }
@@ -190,7 +190,7 @@ namespace IRaCIS.Core.Domain.Share
             {
                 var lan = _accessor?.HttpContext?.Request?.Headers["Accept-Language"];
 
-                if ( lan is not null  && !string.IsNullOrEmpty(lan.Value))
+                if (lan is not null && !string.IsNullOrEmpty(lan.Value))
                 {
                     return lan.Value == "en-US,en;q=0.5".ToString();
                 }
@@ -198,6 +198,17 @@ namespace IRaCIS.Core.Domain.Share
             }
         }
 
+
+        public string RequestUrl
+        {
+
+            get
+            {
+                return   _accessor?.HttpContext?.Request?.Path;
+
+            }
+        }
+
     }
 
     public static class ClaimAttributes

IRaCIS.Core.Domain/QC/QCChallengeDialog.cs

@@ -14,7 +14,7 @@ namespace IRaCIS.Core.Domain.Models
                     
 
 
-
+        [foren]
         public User CreateUser { get; set; }