修改中心调研

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -9460,11 +9460,11 @@
             <returns></returns>
         </member>
         <member name="M:IRaCIS.Core.Application.Contracts.TrialSiteSurveyService.SendVerifyCode(IRaCIS.Core.Application.Contracts.SiteSurveySendVerifyCode)">
-            <summary>
+             <summary>
-            发送验证码
+            site 调研 发送验证码
-            </summary>
+             </summary>
-            <param name="userInfo"></param>
+             <param name="userInfo"></param>
-            <returns></returns>
+             <returns></returns>
         </member>
         <member name="M:IRaCIS.Core.Application.Contracts.TrialSiteSurveyService.VerifySendCode(IRaCIS.Core.Application.Contracts.LoginDto,IRaCIS.Core.Application.Auth.ITokenService)">
             <summary>
@@ -9520,14 +9520,6 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.Application.Contracts.TrialSiteSurveyService.SubmissionRejection(System.Guid,System.Guid)">
-            <summary>
-            驳回
-            </summary>
-            <param name="trialId"></param>
-            <param name="trialSiteSurveyId"></param>
-            <returns></returns>
-        </member>
         <member name="M:IRaCIS.Core.Application.Contracts.TrialSiteSurveyService.TrialSurveySubmit(IRaCIS.Core.Application.Contracts.TrialSiteSurvyeSubmitDTO)">
             <summary>
              提交   后台自动识别是谁提交

IRaCIS.Core.Application/Service/Common/ExcelExportService.cs

@@ -155,7 +155,6 @@ namespace IRaCIS.Core.Application.Service.Common
                 .Where(t => groupSelectIdQuery.Contains(t.TrialSiteSurveyId))
                 .WhereIf(queryParam.UserTypeId != null, t => t.UserTypeId == queryParam.UserTypeId)
                 .WhereIf(queryParam.IsGenerateAccount != null, t => t.IsGenerateAccount == queryParam.IsGenerateAccount)
-                .WhereIf(queryParam.TrialRoleNameId != null, t => t.TrialRoleNameId == queryParam.TrialRoleNameId)
                 .WhereIf(queryParam.State != null && queryParam.State != TrialSiteUserStateEnum.OverTime, t => t.InviteState == queryParam.State)
                 .WhereIf(queryParam.State != null && queryParam.State == TrialSiteUserStateEnum.OverTime, t => t.InviteState == TrialSiteUserStateEnum.HasSend && t.ExpireTime < DateTime.Now)
                 .WhereIf(!string.IsNullOrEmpty(queryParam.UserName), t => (t.LastName + " / " + t.FirstName).Contains(queryParam.UserName))

IRaCIS.Core.Application/Service/SiteSurvey/DTO/TrialSiteSurveyViewModel.cs

@@ -84,7 +84,6 @@ namespace IRaCIS.Core.Application.Contracts
 
 
         public bool? IsGenerateAccount { get; set; }
-        public Guid? TrialRoleNameId { get; set; }
 
         public TrialSiteUserStateEnum? State { get; set; }
 

IRaCIS.Core.Application/Service/SiteSurvey/DTO/TrialSiteUserSurveyViewModel.cs

@@ -48,9 +48,7 @@ namespace IRaCIS.Core.Application.Contracts
             }
         }
 
-        public string TrialRoleName { get; set; }
 
-        public string TrialRoleCode { get; set; }
 
         public UserTypeEnum? UserTypeEnum { get; set; }
 
@@ -98,7 +96,7 @@ namespace IRaCIS.Core.Application.Contracts
 
         [DictionaryTranslateAttribute("YesOrNo")]
         public bool IsGenerateAccount { get; set; }
-        public Guid TrialRoleNameId { get; set; }
+        public int TrialRoleCode { get; set; }
 
         public string OrganizationName { get; set; } = string.Empty;
     }

IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs

@@ -263,7 +263,8 @@ namespace IRaCIS.Core.Application.Contracts
             {
                 //找到最新的调研表
 
-                var currentLatest = await _trialSiteSurveyRepository.Where(t => t.TrialId == userInfo.TrialId && t.SiteId == userInfo.SiteId, true).OrderByDescending(t => t.CreateTime).FirstOrDefaultAsync();
+                var currentLatest = await _trialSiteSurveyRepository.Where(t => t.TrialId == userInfo.TrialId && t.SiteId == userInfo.SiteId, true)
+                     .Include(u => u.TrialSiteEquipmentSurveyList).Include(u => u.TrialSiteUserSurveyList).OrderByDescending(t => t.CreateTime).FirstOrDefaultAsync();
 
                 if (currentLatest == null)
                 {
@@ -304,7 +305,7 @@ namespace IRaCIS.Core.Application.Contracts
                 copy.TrialSiteEquipmentSurveyList.ForEach(t => t.Id = Guid.Empty);
                 copy.TrialSiteUserSurveyList.ForEach(t => { t.Id = Guid.Empty; t.IsGenerateSuccess = false; });
 
-                currentEntity = await _repository.AddAsync(copy);
+                currentEntity = await _trialSiteSurveyRepository.AddAsync(copy);
 
             }
 
@@ -448,7 +449,6 @@ namespace IRaCIS.Core.Application.Contracts
                 .Where(t => groupSelectIdQuery.Contains(t.TrialSiteSurveyId))
                 .WhereIf(queryParam.UserTypeId != null, t => t.UserTypeId == queryParam.UserTypeId)
                 .WhereIf(queryParam.IsGenerateAccount != null, t => t.IsGenerateAccount == queryParam.IsGenerateAccount)
-                .WhereIf(queryParam.TrialRoleNameId != null, t => t.TrialRoleNameId == queryParam.TrialRoleNameId)
                 .WhereIf(queryParam.State != null && queryParam.State != TrialSiteUserStateEnum.OverTime, t => t.InviteState == queryParam.State)
                 .WhereIf(!string.IsNullOrEmpty(queryParam.UserName), t => (t.LastName + " / " + t.FirstName).Contains(queryParam.UserName))
                 .WhereIf(!string.IsNullOrEmpty(queryParam.OrganizationName), t => t.OrganizationName.Contains(queryParam.OrganizationName))
@@ -619,7 +619,7 @@ namespace IRaCIS.Core.Application.Contracts
                 t.IsGenerateSuccess,
                 t.UserTypeId,
                 UserTypeEnum = (UserTypeEnum?)t.UserTypeRole.UserTypeEnum,
-                t.TrialRoleName.Code,
+                t.TrialRoleCode,
                 t.Email
             }).ToListAsync();
 
@@ -629,7 +629,7 @@ namespace IRaCIS.Core.Application.Contracts
                 var currentUserList = siteUserList.Where(t => t.TrialSiteSurveyId == trialSiteSurveyId).ToList();
 
 
-                if (!currentUserList.Any(t => t.Code == "1") || !currentUserList.Any(t => t.Code == "5"))
+                if (!currentUserList.Any(t => t.TrialRoleCode == 1) || !currentUserList.Any(t => t.TrialRoleCode == 5))
                 {
                     throw new BusinessValidationFailedException("本次提交，必须有CRC和影像阅片人信息");
                 }

IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteUserSurveyService.cs

@@ -62,7 +62,6 @@ namespace IRaCIS.Core.Application.Contracts
                     }
 
                 }
-
             }
 
 

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

@@ -36,8 +36,6 @@ namespace IRaCIS.Core.Application.AutoMapper
            
             var isEn_Us = false;
             CreateMap<TrialSiteUserSurvey, TrialSiteUserSurveyView>()
-              .ForMember(t => t.TrialRoleName, u => u.MapFrom(d => isEn_Us? d.TrialRoleName.Value:d.TrialRoleName.ValueCN))
-             .ForMember(t => t.TrialRoleCode, u => u.MapFrom(d =>  d.TrialRoleName.Code))
               .ForMember(d => d.UserType, u => u.MapFrom(s => s.UserTypeRole.UserTypeShortName))
                .ForMember(d => d.UserTypeEnum, u => u.MapFrom(s => s.UserTypeRole.UserTypeEnum));
 
@@ -70,7 +68,6 @@ namespace IRaCIS.Core.Application.AutoMapper
 
             CreateMap<TrialSiteUserSurvey, TrialSiteUserSurveyAllDTO>()
                 .ForMember(t=>t.TrialSiteSurvey,u=>u.MapFrom(c=>c.TrialSiteSurvey))
-                 .ForMember(t => t.TrialRoleName, u => u.MapFrom(d => d.TrialRoleName.Value))
              .ForMember(d => d.UserType, u => u.MapFrom(s => s.UserTypeRole.UserTypeShortName))
              .ForMember(d => d.UserTypeEnum, u => u.MapFrom(s => s.UserTypeRole.UserTypeEnum));
 

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

@@ -285,7 +285,6 @@ namespace IRaCIS.Core.Application.Service
                 .ForMember(t => t.TrialSiteUserList, u => u.Ignore());
 
             CreateMap<TrialSiteUserSurvey, TrialSiteUserSummaryDto>()
-                .ForMember(t => t.TrialRoleName, u => u.MapFrom(d => d.TrialRoleName.Value))
                 .ForMember(d => d.UserType, u => u.MapFrom(s => s.UserTypeRole.UserTypeShortName))
                 .ForMember(d => d.UserTypeEnum, u => u.MapFrom(s => s.UserTypeRole.UserTypeEnum))
                 .ForMember(t => t.TrialSiteCode, u => u.MapFrom(d => d.TrialSiteSurvey.TrialSite.TrialSiteCode))

IRaCIS.Core.Domain/SQLFile/20220808.sql

@@ -0,0 +1,2 @@
+
+update TrialSiteUserSurvey  set TrialRoleCode= (select Code from Dictionary where Id=TrialSiteUserSurvey.TrialRoleNameId)

IRaCIS.Core.Domain/SiteSurvey/TrialSiteUserSurvey.cs

@@ -28,11 +28,11 @@ namespace IRaCIS.Core.Domain.Models
         public Guid? UserTypeId { get; set; }
 
 
-        public Guid TrialRoleNameId { get; set; }
+        //public Guid TrialRoleNameId { get; set; }
-
-        public Dictionary TrialRoleName { get; set; }
 
+        //public Dictionary TrialRoleName { get; set; }
 
+        public int? TrialRoleCode { get; set; }
 
 
         /// <summary>

IRaCIS.Core.Infrastructure/_IRaCIS/Output/ApiResponseCodeEnum.cs

@@ -23,17 +23,10 @@ namespace IRaCIS.Core.Infrastructure.Extention
         //程序异常                                     相当于之前的 IsSuccess = false
         ProgramException = 4,
 
-
-
-
         //需要提示 ,需要提示  从Result 取数据       （  0  可以继续处理提交 ,1  不能进行继续处理提交 ,2  刷新列表    )
         NeedTips = 5,  
 
 
-
-
-
-
         //在其他地方登陆，被迫下线
         LoginInOtherPlace = -1,