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

@@ -1185,20 +1185,6 @@
             <param name="Id"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.Application.Service.DoctorService.UpdatePaymentMode(IRaCIS.Application.Contracts.PaymentModeDto)">
-            <summary>
-            修改支付方式
-            </summary>
-            <param name="inDto"></param>
-            <returns></returns>
-        </member>
-        <member name="M:IRaCIS.Core.Application.Service.DoctorService.GetPaymentMode(System.Guid)">
-            <summary>
-            获取支付方式
-            </summary>
-            <param name="Id"></param>
-            <returns></returns>
-        </member>
         <member name="M:IRaCIS.Core.Application.Service.DoctorService.GetBasicInfo(System.Guid)">
              <summary>
             详情、编辑-获取 医生基本信息 BasicInfo
@@ -16849,31 +16835,6 @@
             工作兼职En
             </summary>
         </member>
-        <member name="P:IRaCIS.Application.Contracts.PaymentModeDto.BankNum">
-            <summary>
-            银行卡号
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Application.Contracts.PaymentModeDto.BankName">
-            <summary>
-            银行名称
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Application.Contracts.PaymentModeDto.OpeningBank">
-            <summary>
-            开户行
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Application.Contracts.PaymentModeDto.IdCard">
-            <summary>
-            身份证号
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Application.Contracts.PaymentModeDto.BankPhoneNum">
-            <summary>
-            银行手机号
-            </summary>
-        </member>
         <member name="P:IRaCIS.Application.Contracts.UpdateGneralSituationDto.Summarize">
             <summary>
             概述
@@ -17142,13 +17103,6 @@
             <param name="doctorId"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Application.Interfaces.IDoctorService.GetPaymentMode(System.Guid)">
-             <summary>
-            获取支付信息
-             </summary>
-             <param name="Id"></param>
-             <returns></returns>
-        </member>
         <member name="M:IRaCIS.Application.Interfaces.IDoctorService.GetSummarizeInfo(System.Guid)">
             <summary>
             获取概述

IRaCIS.Core.Application/MassTransit/Consumer/SubjectVisitQCAndCheckConsumer.cs

@@ -108,97 +108,19 @@ public class CRCSubmitedAndQCToAuditEventConsumer(
 
 
 /// <summary>
-/// CRC 回复质控质疑 通知QC  Code012，013
+/// CRC 回复质控质疑 通知QC
 /// </summary>
-public class CRCRepliedQCChallengeEventConsumer(
+public class CRCRepliedQCChallengeEventConsumer : IConsumer<CRCRepliedQCChallengeEvent>
-      IRepository<User> _userRepository,
-        IRepository<TrialUser> _trialUseRepository,
-       IRepository<SubjectVisit> _subjectVisitRepository,
-      IRepository<Trial> _trialRepository,
-      IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrialRepository,
-      IRepository<VisitTask> _visitTaskRepository,
-         IRepository<Dictionary> _dictionaryRepository,
-      IRepository<EmailNoticeConfig> _emailNoticeConfigrepository,
-      IOptionsMonitor<SystemEmailSendConfig> systemEmailConfig) : IConsumer<CRCRepliedQCChallengeEvent>
 {
-
+    public Task Consume(ConsumeContext<CRCRepliedQCChallengeEvent> context)
-    private readonly SystemEmailSendConfig _systemEmailConfig = systemEmailConfig.CurrentValue;
-    public async Task Consume(ConsumeContext<CRCRepliedQCChallengeEvent> context)
     {
-        //Console.WriteLine("发送(Code012，013) 【加急项目所有IQC待领取质控任务】邮件！！！");
+        throw new NotImplementedException();
-        //var isEn_US = CultureInfo.CurrentCulture.Name == StaticData.CultureInfo.en_US;
+    }
-
-        //var subjectVisitId = context.Message.SubjectVisitId;
-
-        //var subjectVisit = await _subjectVisitRepository.Where(x => x.Id == subjectVisitId).Include(x => x.Subject).FirstOrDefaultAsync();
-
-        //var trialUser = await _trialUseRepository.Where(x => x.TrialId == subjectVisit.TrialId).Include(x => x.User).Select(x => x.User).ToListAsync();
-
-        //var userinfoList = trialUser.Where(x => x.UserTypeEnum == UserTypeEnum.IQC).ToList();
-
-
-        //var trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == subjectVisit.TrialId);
-
-        //var auditStateCode = "AuditStatePE";
-
-        //if (trialInfo.QCProcessEnum == TrialQCProcess.DoubleAudit)
-        //{
-        //    auditStateCode = "AuditStateRC";
-        //}
-
-        //foreach (var userinfo in userinfoList)
-        //{
-        //    var messageToSend = new MimeMessage();
-        //    //发件地址
-        //    messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
-        //    messageToSend.To.Add(new MailboxAddress(String.Empty, userinfo.EMail));
-
-
-        //    var companyName = isEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
-
-
-        //    var dictionValue = await CommonEmailHelper.TranslationDictionary(new TranslationDictionaryDto()
-        //    {
-
-        //        DictionaryRepository = _dictionaryRepository,
-        //        IsEn_US = isEn_US,
-        //        DictionaryList = new List<DictionaryDto>()
-        //    {
-        //     new DictionaryDto (){DictionaryCode= auditStateCode,EnumValue=subjectVisit.AuditState.GetEnumInt(), }, //审核状态
-
-        //    }
-        //    });
-
-        //    Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input =>
-        //    {
-        //        var subjectCode = subjectVisit.Subject.Code;
-        //        var topicStr = string.Format(input.topicStr, trialInfo.ResearchProgramNo, subjectCode, subjectVisit.VisitName);
-        //        var htmlBodyStr = string.Format(
-        //           CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
-        //           userinfo.FullName,              // 用户名  {0}
-        //           trialInfo.ExperimentName,        // 项目   {1}
-        //           subjectCode, // 受试者 {2}
-        //           subjectVisit.VisitName,             // 访视  {3}
-        //           dictionValue[0],    // 审核状态 {4}
-        //           _systemEmailConfig.SiteUrl             // 链接                  {5}
-        //            );
-
-        //        return (topicStr, htmlBodyStr);
-        //    };
-
-        //    await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(_emailNoticeConfigrepository,
-
-        //     context.Message.IsPd ? EmailBusinessScenario.PDVerification_PendingImageQCClaim : EmailBusinessScenario.EligibilityVerification_PendingClaim,
-
-        //        messageToSend, emailConfigFunc);
-
-        //    await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
-        //}
 }
 
 
 /// <summary>
-/// QC回复 质控质疑，通知CRC 
+/// QC回复 质控质疑，通知CRC
 /// </summary>
 public class QCRepliedQCChallengeEventConsumer : IConsumer<QCRepliedQCChallengeEvent>
 {

IRaCIS.Core.Application/Service/Doctor/DoctorService.cs

@@ -211,7 +211,7 @@ namespace IRaCIS.Core.Application.Service
         /// <param name="inDto"></param>
         /// <returns></returns>
         [HttpPost]
-        public async Task<bool> UpdateGneralSituation(UpdateGneralSituationDto inDto)
+        public async Task UpdateGneralSituation(UpdateGneralSituationDto inDto)
         {
 
             await _doctorRepository.UpdatePartialFromQueryAsync(x => x.Id == inDto.Id, x => new Doctor()
@@ -219,8 +219,7 @@ namespace IRaCIS.Core.Application.Service
                 Summarize = inDto.Summarize,
                 SummarizeEn = inDto.SummarizeEn,
             });
-            var success= await _doctorRepository.SaveChangesAsync();
+            await _doctorRepository.SaveChangesAsync();
-            return success;
         }
 
 
@@ -243,14 +242,12 @@ namespace IRaCIS.Core.Application.Service
         /// <param name="inDto"></param>
         /// <returns></returns>
         [HttpPost]
-        public async Task<bool> UpdatePaymentMode(PaymentModeDto inDto)
+        public async Task UpdatePaymentMode(PaymentModeDto inDto)
         {
 
             var doctor = await _doctorRepository.FirstOrDefaultAsync(t => t.Id == inDto.Id).IfNullThrowException();
             _mapper.Map(inDto, doctor);
             var success = await _doctorDictionaryRepository.SaveChangesAsync();
-
-            return success;
         }
 
 

IRaCIS.Core.Infra.EFCore/Migrations/20241022051923_doctorinfo10221319.cs

@@ -1,102 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace IRaCIS.Core.Infra.EFCore.Migrations
-{
-    /// <inheritdoc />
-    public partial class doctorinfo10221319 : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<string>(
-                name: "BankName",
-                table: "Doctor",
-                type: "nvarchar(400)",
-                maxLength: 400,
-                nullable: false,
-                defaultValue: "");
-
-            migrationBuilder.AddColumn<string>(
-                name: "BankNum",
-                table: "Doctor",
-                type: "nvarchar(400)",
-                maxLength: 400,
-                nullable: false,
-                defaultValue: "");
-
-            migrationBuilder.AddColumn<string>(
-                name: "BankPhoneNum",
-                table: "Doctor",
-                type: "nvarchar(400)",
-                maxLength: 400,
-                nullable: false,
-                defaultValue: "");
-
-            migrationBuilder.AddColumn<string>(
-                name: "IdCard",
-                table: "Doctor",
-                type: "nvarchar(400)",
-                maxLength: 400,
-                nullable: false,
-                defaultValue: "");
-
-            migrationBuilder.AddColumn<string>(
-                name: "OpeningBank",
-                table: "Doctor",
-                type: "nvarchar(400)",
-                maxLength: 400,
-                nullable: false,
-                defaultValue: "");
-
-            migrationBuilder.AddColumn<string>(
-                name: "Summarize",
-                table: "Doctor",
-                type: "nvarchar(400)",
-                maxLength: 400,
-                nullable: false,
-                defaultValue: "");
-
-            migrationBuilder.AddColumn<string>(
-                name: "SummarizeEn",
-                table: "Doctor",
-                type: "nvarchar(400)",
-                maxLength: 400,
-                nullable: false,
-                defaultValue: "");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "BankName",
-                table: "Doctor");
-
-            migrationBuilder.DropColumn(
-                name: "BankNum",
-                table: "Doctor");
-
-            migrationBuilder.DropColumn(
-                name: "BankPhoneNum",
-                table: "Doctor");
-
-            migrationBuilder.DropColumn(
-                name: "IdCard",
-                table: "Doctor");
-
-            migrationBuilder.DropColumn(
-                name: "OpeningBank",
-                table: "Doctor");
-
-            migrationBuilder.DropColumn(
-                name: "Summarize",
-                table: "Doctor");
-
-            migrationBuilder.DropColumn(
-                name: "SummarizeEn",
-                table: "Doctor");
-        }
-    }
-}

IRaCIS.Core.Infra.EFCore/Migrations/IRaCISDBContextModelSnapshot.cs

@@ -1323,21 +1323,6 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                     b.Property<Guid>("AuditUserId")
                         .HasColumnType("uniqueidentifier");
 
-                    b.Property<string>("BankName")
-                        .IsRequired()
-                        .HasMaxLength(400)
-                        .HasColumnType("nvarchar(400)");
-
-                    b.Property<string>("BankNum")
-                        .IsRequired()
-                        .HasMaxLength(400)
-                        .HasColumnType("nvarchar(400)");
-
-                    b.Property<string>("BankPhoneNum")
-                        .IsRequired()
-                        .HasMaxLength(400)
-                        .HasColumnType("nvarchar(400)");
-
                     b.Property<string>("BlindName")
                         .IsRequired()
                         .HasMaxLength(400)
@@ -1410,11 +1395,6 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                         .HasMaxLength(400)
                         .HasColumnType("nvarchar(400)");
 
-                    b.Property<string>("IdCard")
-                        .IsRequired()
-                        .HasMaxLength(400)
-                        .HasColumnType("nvarchar(400)");
-
                     b.Property<string>("Introduction")
                         .IsRequired()
                         .HasColumnType("nvarchar(max)");
@@ -1433,11 +1413,6 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                     b.Property<int>("Nation")
                         .HasColumnType("int");
 
-                    b.Property<string>("OpeningBank")
-                        .IsRequired()
-                        .HasMaxLength(400)
-                        .HasColumnType("nvarchar(400)");
-
                     b.Property<Guid>("OrganizationId")
                         .HasColumnType("uniqueidentifier");
 
@@ -1553,16 +1528,6 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                         .HasMaxLength(400)
                         .HasColumnType("nvarchar(400)");
 
-                    b.Property<string>("Summarize")
-                        .IsRequired()
-                        .HasMaxLength(400)
-                        .HasColumnType("nvarchar(400)");
-
-                    b.Property<string>("SummarizeEn")
-                        .IsRequired()
-                        .HasMaxLength(400)
-                        .HasColumnType("nvarchar(400)");
-
                     b.Property<DateTime>("UpdateTime")
                         .HasColumnType("datetime2");