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

@@ -12975,12 +12975,7 @@
         </member>
         <member name="T:IRaCIS.Core.Application.MassTransit.Consumer.CRCSubmitedAndQCToAuditEventConsumer">
             <summary>
-            CRC 提交了 通知QC进行质控  Code005，006
+            CRC 提交了 通知QC进行质控
-            </summary>
-        </member>
-        <member name="M:IRaCIS.Core.Application.MassTransit.Consumer.CRCSubmitedAndQCToAuditEventConsumer.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.User},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectVisit},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingQuestionCriterionTrial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.VisitTask},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Dictionary},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.EmailNoticeConfig},Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.SystemEmailSendConfig})">
-            <summary>
-            CRC 提交了 通知QC进行质控  Code005，006
             </summary>
         </member>
         <member name="T:IRaCIS.Core.Application.MassTransit.Consumer.CRCRepliedQCChallengeEventConsumer">

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

@@ -1,14 +1,9 @@
 using IRaCIS.Core.Application.MassTransit.Command;
-using IRaCIS.Core.Application.Service.Reading.Dto;
 using IRaCIS.Core.Domain;
 using IRaCIS.Core.Domain.BaseModel;
-using IRaCIS.Core.Infra.EFCore.Common;
 using MassTransit;
-using Microsoft.Extensions.Options;
-using MimeKit;
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -17,93 +12,13 @@ namespace IRaCIS.Core.Application.MassTransit.Consumer;
 
 
 /// <summary>
-/// CRC 提交了 通知QC进行质控  Code005，006
+/// CRC 提交了 通知QC进行质控
 /// </summary>
-public class CRCSubmitedAndQCToAuditEventConsumer(
+public class CRCSubmitedAndQCToAuditEventConsumer : IConsumer<CRCSubmitedAndQCToAuditEvent>
-      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<CRCSubmitedAndQCToAuditEvent>
 {
-    private readonly SystemEmailSendConfig _systemEmailConfig = systemEmailConfig.CurrentValue;
+    public Task Consume(ConsumeContext<CRCSubmitedAndQCToAuditEvent> context)
-    public async Task Consume(ConsumeContext<CRCSubmitedAndQCToAuditEvent> context)
     {
-        //Console.WriteLine("发送(005,006) 【加急项目所有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);
-
-        //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= "ReadingCategory",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, taskInfo.TaskBlindName);
-        //        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.ReReadingApplyState == ReReadingApplyState.TrialGroupHaveApplyed ? EmailBusinessScenario.ReReadFromPMApproval : EmailBusinessScenario.ReReadFromIRApproval,
-
-        //        messageToSend, emailConfigFunc);
-
-        //    await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
-        //}
     }
 }
 

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

@@ -78,7 +78,7 @@ namespace IRaCIS.Core.Application.Service
 
         }
 
-        [HttpDelete, Route("{id:guid}")]
+        [HttpDelete, Route("{doctorId:guid}")]
         public async Task<IResponseOutput> DeleteEducationInfo(Guid id)
         {
             var success = await _educationRepository.BatchDeleteNoTrackingAsync(o => o.Id == id);

IRaCIS.Core.Domain/_DomainEvent/SubjectVisitStateChangedEvent.cs

@@ -15,7 +15,6 @@ public class CRCSubmitedAndQCToAuditEvent : DomainEvent
 {
     public Guid SubjectVisitId { get; set; }
 
-    public bool IsPd { get; set; }
 
 }
 

IRaCIS.Core.Infra.EFCore/Interceptor/AddDomainExt.cs

@@ -82,7 +82,7 @@ public static class DBContext_Ext
                     originAuditState == AuditStateEnum.None && subjectVisit.AuditState == AuditStateEnum.ToAudit
                     )
                 {
-                    subjectVisit.AddDomainEvent(new CRCSubmitedAndQCToAuditEvent() { SubjectVisitId = subjectVisit.Id,IsPd= subjectVisit.PDState == PDStateEnum.PDProgress });
+                    subjectVisit.AddDomainEvent(new CRCSubmitedAndQCToAuditEvent() { SubjectVisitId = subjectVisit.Id });
                 }
 
                 //一致性核查通知PM发送邮件