Compare commits
No commits in common. "1b7080782423a1ce55e7701ab43f82dfc5dcd872" and "5d51ac562abbdd530ee4fe1d8eae24997685eae9" have entirely different histories.
1b70807824
...
5d51ac562a
|
|
@ -9772,21 +9772,6 @@
|
||||||
问题英文分组
|
问题英文分组
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionSystemView.ExportIdentification">
|
|
||||||
<summary>
|
|
||||||
导出标识
|
|
||||||
</summary>
|
|
||||||
</member>
|
|
||||||
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionSystemView.ClassifyAlgorithms">
|
|
||||||
<summary>
|
|
||||||
分类算法
|
|
||||||
</summary>
|
|
||||||
</member>
|
|
||||||
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionSystemView.ClassifyQuestionId">
|
|
||||||
<summary>
|
|
||||||
分类问题Id
|
|
||||||
</summary>
|
|
||||||
</member>
|
|
||||||
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionSystemView.ValueType">
|
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionSystemView.ValueType">
|
||||||
<summary>
|
<summary>
|
||||||
数值类型
|
数值类型
|
||||||
|
|
@ -10157,21 +10142,6 @@
|
||||||
导出标识
|
导出标识
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionSystemInDto.ExportResultStr">
|
|
||||||
<summary>
|
|
||||||
导出结果
|
|
||||||
</summary>
|
|
||||||
</member>
|
|
||||||
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionSystemInDto.ClassifyAlgorithms">
|
|
||||||
<summary>
|
|
||||||
分类算法
|
|
||||||
</summary>
|
|
||||||
</member>
|
|
||||||
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionSystemInDto.ClassifyQuestionId">
|
|
||||||
<summary>
|
|
||||||
分类问题Id
|
|
||||||
</summary>
|
|
||||||
</member>
|
|
||||||
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionSystemInDto.ValueType">
|
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionSystemInDto.ValueType">
|
||||||
<summary>
|
<summary>
|
||||||
数值类型
|
数值类型
|
||||||
|
|
|
||||||
|
|
@ -112,89 +112,11 @@ public class UrgentMedicalReviewAddedEventConsumer(
|
||||||
}
|
}
|
||||||
|
|
||||||
//IR 回复医学反馈通知MIM
|
//IR 回复医学反馈通知MIM
|
||||||
public class UrgentIRRepliedMedicalReviewConsumer(
|
public class UrgentIRRepliedMedicalReviewConsumer : IConsumer<UrgentIRRepliedMedicalReview>
|
||||||
IRepository<User> _userRepository,
|
|
||||||
IRepository<TaskMedicalReview> _taskMedicalReviewRepository,
|
|
||||||
IRepository<Trial> _trialRepository,
|
|
||||||
IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrialRepository,
|
|
||||||
IRepository<VisitTask> _visitTaskRepository,
|
|
||||||
IRepository<Dictionary> _dictionaryRepository,
|
|
||||||
IRepository<EmailNoticeConfig> _emailNoticeConfigrepository,
|
|
||||||
IOptionsMonitor<SystemEmailSendConfig> systemEmailConfig) : IConsumer<UrgentIRRepliedMedicalReview>
|
|
||||||
{
|
{
|
||||||
private readonly SystemEmailSendConfig _systemEmailConfig = systemEmailConfig.CurrentValue;
|
public Task Consume(ConsumeContext<UrgentIRRepliedMedicalReview> context)
|
||||||
|
|
||||||
|
|
||||||
//IR 回复医学反馈通知MIM
|
|
||||||
public async Task Consume(ConsumeContext<UrgentIRRepliedMedicalReview> context)
|
|
||||||
{
|
{
|
||||||
//Console.WriteLine("发送【加急的医学反馈任务 通知MIM】邮件!!!");
|
throw new NotImplementedException();
|
||||||
//var isEn_US = CultureInfo.CurrentCulture.Name == StaticData.CultureInfo.en_US;
|
|
||||||
|
|
||||||
//var medicalReviewId = context.Message.MedicalReviewId;
|
|
||||||
|
|
||||||
//var medicalReview = await _taskMedicalReviewRepository.Where(x => x.Id == medicalReviewId).Include(x => x.VisitTask).Include(x => x.MedicalManagerUser).FirstOrDefaultAsync();
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//if (medicalReview.MedicalManagerUserId == null)
|
|
||||||
//{
|
|
||||||
// Console.WriteLine("MIMId为空 ID" + medicalReviewId);
|
|
||||||
// return;
|
|
||||||
//}
|
|
||||||
//var criterion = await _readingQuestionCriterionTrialRepository.FirstOrDefaultAsync(x => x.Id == medicalReview.VisitTask.TrialReadingCriterionId);
|
|
||||||
//var userinfo = await _userRepository.Where(x => x.Id == medicalReview.MedicalManagerUserId).FirstOrDefaultAsync();
|
|
||||||
|
|
||||||
//var taskInfo = await _visitTaskRepository.Where(x => x.Id == medicalReview.VisitTaskId).Include(x => x.SourceSubjectVisit).Include(x => x.ReadModule).Include(x => x.Subject).FirstNotNullAsync();
|
|
||||||
|
|
||||||
|
|
||||||
//var messageToSend = new MimeMessage();
|
|
||||||
////发件地址
|
|
||||||
//messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
|
|
||||||
//messageToSend.To.Add(new MailboxAddress(String.Empty, userinfo.EMail));
|
|
||||||
|
|
||||||
//var trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == medicalReview.TrialId);
|
|
||||||
//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=taskInfo.ReadingCategory.GetEnumInt(), },
|
|
||||||
// new DictionaryDto (){DictionaryCode= "MedicalReviewDoctorUserIdea",EnumValue=medicalReview.DoctorUserIdeaEnum.GetEnumInt(), },
|
|
||||||
// new DictionaryDto (){DictionaryCode= "MedicalReviewAuditState",EnumValue=medicalReview.AuditState.GetEnumInt(), },
|
|
||||||
// new DictionaryDto (){DictionaryCode= "YesOrNo",EnumValue=taskInfo.IsUrgent.ToString(), }
|
|
||||||
// }
|
|
||||||
//});
|
|
||||||
|
|
||||||
//Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input =>
|
|
||||||
//{
|
|
||||||
// var topicStr = string.Format(input.topicStr, companyName, trialInfo.ResearchProgramNo);
|
|
||||||
// var htmlBodyStr = string.Format(
|
|
||||||
// CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
|
|
||||||
// userinfo.FullName, // 用户名
|
|
||||||
// trialInfo.ExperimentName, // 项目
|
|
||||||
// criterion.CriterionName, // 阅片标准
|
|
||||||
// taskInfo.BlindSubjectCode.IsNullOrEmpty() ? taskInfo.Subject.Code : taskInfo.BlindSubjectCode, // 受试者
|
|
||||||
// taskInfo.TaskBlindName, // 访视
|
|
||||||
// dictionValue[0], // 任务类型
|
|
||||||
// dictionValue[1], // 阅片人是否同意
|
|
||||||
// dictionValue[2], // 审核状态
|
|
||||||
// dictionValue[3] // 是否加急
|
|
||||||
// );
|
|
||||||
|
|
||||||
// return (topicStr, htmlBodyStr);
|
|
||||||
//};
|
|
||||||
|
|
||||||
//await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(_emailNoticeConfigrepository, EmailBusinessScenario.EligibilityVerification_MedicalQC, messageToSend, emailConfigFunc);
|
|
||||||
|
|
||||||
//await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -471,7 +471,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||||
|
|
||||||
public bool IsCopy { get; set; } = false;
|
public bool IsCopy { get; set; } = false;
|
||||||
|
|
||||||
|
|
||||||
public Guid? ClassifyTableQuestionId { get; set; }
|
public Guid? ClassifyTableQuestionId { get; set; }
|
||||||
|
|
||||||
public string ClassifyAlgorithms { get; set; } = string.Empty;
|
public string ClassifyAlgorithms { get; set; } = string.Empty;
|
||||||
|
|
@ -1140,24 +1139,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||||
public class ReadingQuestionSystemView
|
public class ReadingQuestionSystemView
|
||||||
{
|
{
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 导出标识
|
|
||||||
/// </summary>
|
|
||||||
[Comment("导出标识")]
|
[Comment("导出标识")]
|
||||||
public ExportIdentification? ExportIdentification { get; set; }
|
public ExportIdentification? ExportIdentification { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 分类算法
|
|
||||||
/// </summary>
|
|
||||||
[Comment("分类算法")]
|
|
||||||
public string ClassifyAlgorithms { get; set; } = string.Empty;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 分类问题Id
|
|
||||||
/// </summary>
|
|
||||||
[Comment("分类问题Id")]
|
|
||||||
public Guid? ClassifyQuestionId { get; set; }
|
|
||||||
|
|
||||||
public string ExportResultStr { get; set; } = "[]";
|
public string ExportResultStr { get; set; } = "[]";
|
||||||
|
|
||||||
public List<ExportResult> ExportResult
|
public List<ExportResult> ExportResult
|
||||||
|
|
@ -1736,22 +1721,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public ExportIdentification? ExportIdentification { get; set; }
|
public ExportIdentification? ExportIdentification { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 导出结果
|
[Comment("导出结果")]
|
||||||
/// </summary>
|
|
||||||
public string ExportResultStr { get; set; } = "[]";
|
public string ExportResultStr { get; set; } = "[]";
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 分类算法
|
|
||||||
/// </summary>
|
|
||||||
|
|
||||||
public string ClassifyAlgorithms { get; set; } = string.Empty;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 分类问题Id
|
|
||||||
/// </summary>
|
|
||||||
public Guid? ClassifyQuestionId { get; set; }
|
|
||||||
|
|
||||||
public List<ExportResult> ExportResult { get; set; } = new List<ExportResult>();
|
public List<ExportResult> ExportResult { get; set; } = new List<ExportResult>();
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
|
||||||
|
|
@ -197,12 +197,6 @@ public class ReadingQuestionSystem : BaseAddAuditEntity
|
||||||
[Comment("导出结果")]
|
[Comment("导出结果")]
|
||||||
public string ExportResultStr { get; set; } = "[]";
|
public string ExportResultStr { get; set; } = "[]";
|
||||||
|
|
||||||
[Comment("分类算法")]
|
|
||||||
public string ClassifyAlgorithms { get; set; } = string.Empty;
|
|
||||||
|
|
||||||
[Comment("分类问题Id")]
|
|
||||||
public Guid? ClassifyQuestionId { get; set; }
|
|
||||||
|
|
||||||
[NotMapped]
|
[NotMapped]
|
||||||
public List<ExportResult> ExportResult
|
public List<ExportResult> ExportResult
|
||||||
{
|
{
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,43 +0,0 @@
|
||||||
using System;
|
|
||||||
using Microsoft.EntityFrameworkCore.Migrations;
|
|
||||||
|
|
||||||
#nullable disable
|
|
||||||
|
|
||||||
namespace IRaCIS.Core.Infra.EFCore.Migrations
|
|
||||||
{
|
|
||||||
/// <inheritdoc />
|
|
||||||
public partial class questionc : Migration
|
|
||||||
{
|
|
||||||
/// <inheritdoc />
|
|
||||||
protected override void Up(MigrationBuilder migrationBuilder)
|
|
||||||
{
|
|
||||||
migrationBuilder.AddColumn<string>(
|
|
||||||
name: "ClassifyAlgorithms",
|
|
||||||
table: "ReadingQuestionSystem",
|
|
||||||
type: "nvarchar(400)",
|
|
||||||
maxLength: 400,
|
|
||||||
nullable: false,
|
|
||||||
defaultValue: "",
|
|
||||||
comment: "分类算法");
|
|
||||||
|
|
||||||
migrationBuilder.AddColumn<Guid>(
|
|
||||||
name: "ClassifyQuestionId",
|
|
||||||
table: "ReadingQuestionSystem",
|
|
||||||
type: "uniqueidentifier",
|
|
||||||
nullable: true,
|
|
||||||
comment: "分类问题Id");
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
protected override void Down(MigrationBuilder migrationBuilder)
|
|
||||||
{
|
|
||||||
migrationBuilder.DropColumn(
|
|
||||||
name: "ClassifyAlgorithms",
|
|
||||||
table: "ReadingQuestionSystem");
|
|
||||||
|
|
||||||
migrationBuilder.DropColumn(
|
|
||||||
name: "ClassifyQuestionId",
|
|
||||||
table: "ReadingQuestionSystem");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -5408,16 +5408,6 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
|
||||||
b.Property<Guid>("Id")
|
b.Property<Guid>("Id")
|
||||||
.HasColumnType("uniqueidentifier");
|
.HasColumnType("uniqueidentifier");
|
||||||
|
|
||||||
b.Property<string>("ClassifyAlgorithms")
|
|
||||||
.IsRequired()
|
|
||||||
.HasMaxLength(400)
|
|
||||||
.HasColumnType("nvarchar(400)")
|
|
||||||
.HasComment("分类算法");
|
|
||||||
|
|
||||||
b.Property<Guid?>("ClassifyQuestionId")
|
|
||||||
.HasColumnType("uniqueidentifier")
|
|
||||||
.HasComment("分类问题Id");
|
|
||||||
|
|
||||||
b.Property<int>("ConvertShowType")
|
b.Property<int>("ConvertShowType")
|
||||||
.HasColumnType("int")
|
.HasColumnType("int")
|
||||||
.HasComment("转化显示类型");
|
.HasComment("转化显示类型");
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue