修改
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
parent
37387692dd
commit
b0554119f1
|
@ -8855,6 +8855,11 @@
|
||||||
eCRF报告是否显示在图像页面
|
eCRF报告是否显示在图像页面
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
|
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadingTaskDto.ReadingVersionEnum">
|
||||||
|
<summary>
|
||||||
|
阅片版本
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadingTaskDto.IsReadingTaskViewInOrder">
|
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadingTaskDto.IsReadingTaskViewInOrder">
|
||||||
<summary>
|
<summary>
|
||||||
任务展示访视 读片任务显示是否顺序
|
任务展示访视 读片任务显示是否顺序
|
||||||
|
@ -10511,6 +10516,11 @@
|
||||||
修约小数点
|
修约小数点
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
|
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionCriterionTrialInDto.ReadingVersionEnum">
|
||||||
|
<summary>
|
||||||
|
阅片版本
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionCriterionSystemInDto.CriterionGroup">
|
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionCriterionSystemInDto.CriterionGroup">
|
||||||
<summary>
|
<summary>
|
||||||
标准分组
|
标准分组
|
||||||
|
@ -15837,7 +15847,7 @@
|
||||||
系统邮件配置表
|
系统邮件配置表
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
<member name="M:IRaCIS.Core.Application.Contracts.EmailNoticeConfigService.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.EmailNoticeConfig},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.SystemDocument},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.IdentityUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SystemDocConfirmedIdentityUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Dictionary},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUserRole},Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.SystemEmailSendConfig},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.EmailNoticeUserType},AutoMapper.IMapper,IRaCIS.Core.Domain.Share.IUserInfo,Microsoft.Extensions.Localization.IStringLocalizer)">
|
<member name="M:IRaCIS.Core.Application.Contracts.EmailNoticeConfigService.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.EmailNoticeConfig},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.EmailNoticeUserType},AutoMapper.IMapper,IRaCIS.Core.Domain.Share.IUserInfo,Microsoft.Extensions.Localization.IStringLocalizer)">
|
||||||
<summary>
|
<summary>
|
||||||
系统邮件配置表
|
系统邮件配置表
|
||||||
</summary>
|
</summary>
|
||||||
|
|
|
@ -1854,6 +1854,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||||
|
|
||||||
public bool IsBaseLine { get; set; }
|
public bool IsBaseLine { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 阅片版本
|
||||||
|
/// </summary>
|
||||||
|
public ReadingVersion ReadingVersionEnum { get; set; }
|
||||||
|
|
||||||
public ReadingCategory ReadingCategory { get; set; }
|
public ReadingCategory ReadingCategory { get; set; }
|
||||||
|
|
||||||
public decimal VisitNum { get; set; }
|
public decimal VisitNum { get; set; }
|
||||||
|
|
|
@ -792,6 +792,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int? DigitPlaces { get; set; } = 2;
|
public int? DigitPlaces { get; set; } = 2;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 阅片版本
|
||||||
|
/// </summary>
|
||||||
|
public ReadingVersion? ReadingVersionEnum { get; set; }
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -16,6 +16,7 @@ namespace IRaCIS.Core.Application.Service.RC
|
||||||
IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrialRepository,
|
IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrialRepository,
|
||||||
IRepository<ReadingQuestionTrial> _readingQuestionTrialRepository,
|
IRepository<ReadingQuestionTrial> _readingQuestionTrialRepository,
|
||||||
IRepository<ReadingTaskQuestionAnswer> _readingTaskQuestionAnswer,
|
IRepository<ReadingTaskQuestionAnswer> _readingTaskQuestionAnswer,
|
||||||
|
IRepository<Dictionary> _dictionarRepository,
|
||||||
IRepository<ReadingCriterionPage> _readingCriterionPageRepository,
|
IRepository<ReadingCriterionPage> _readingCriterionPageRepository,
|
||||||
IRepository<ReadingSystemCriterionDictionary> _readingCriterionDictionaryRepository,
|
IRepository<ReadingSystemCriterionDictionary> _readingCriterionDictionaryRepository,
|
||||||
IRepository<ReadingTrialCriterionDictionary> _readingTrialCriterionDictionaryRepository,
|
IRepository<ReadingTrialCriterionDictionary> _readingTrialCriterionDictionaryRepository,
|
||||||
|
@ -384,7 +385,14 @@ namespace IRaCIS.Core.Application.Service.RC
|
||||||
[HttpPost]
|
[HttpPost]
|
||||||
public async Task<IResponseOutput> AddOrUpdateReadingQuestionCriterionTrial(AddOrUpdateReadingQuestionCriterionTrialInDto indto)
|
public async Task<IResponseOutput> AddOrUpdateReadingQuestionCriterionTrial(AddOrUpdateReadingQuestionCriterionTrialInDto indto)
|
||||||
{
|
{
|
||||||
|
if (indto.ReadingVersionEnum == null)
|
||||||
|
{
|
||||||
|
var dic = await _dictionarRepository.Where(x => x.Parent.Code == "ReadingVersion").ToListAsync();
|
||||||
|
|
||||||
|
var maxDic = dic.Select(x => int.Parse(x.Code)).Max();
|
||||||
|
|
||||||
|
indto.ReadingVersionEnum=(ReadingVersion)maxDic;
|
||||||
|
}
|
||||||
var entity = await _readingQuestionCriterionTrialRepository.InsertOrUpdateAsync(indto, true);
|
var entity = await _readingQuestionCriterionTrialRepository.InsertOrUpdateAsync(indto, true);
|
||||||
return ResponseOutput.Ok(entity.Id.ToString());
|
return ResponseOutput.Ok(entity.Id.ToString());
|
||||||
}
|
}
|
||||||
|
@ -654,9 +662,15 @@ namespace IRaCIS.Core.Application.Service.RC
|
||||||
List<ReadingQuestionCriterionTrial> needAddCriterionList = await _readingQuestionCriterionSystemRepository.Where(x => !trialUsrSystemIds.Contains(x.Id) && x.IsEnable && !trialCriterionNames.Contains(x.CriterionName)).ProjectTo<ReadingQuestionCriterionTrial>(_mapper.ConfigurationProvider).ToListAsync();
|
List<ReadingQuestionCriterionTrial> needAddCriterionList = await _readingQuestionCriterionSystemRepository.Where(x => !trialUsrSystemIds.Contains(x.Id) && x.IsEnable && !trialCriterionNames.Contains(x.CriterionName)).ProjectTo<ReadingQuestionCriterionTrial>(_mapper.ConfigurationProvider).ToListAsync();
|
||||||
|
|
||||||
List<ReadingQuestionTrial> needAddQuestionList = new List<ReadingQuestionTrial>();
|
List<ReadingQuestionTrial> needAddQuestionList = new List<ReadingQuestionTrial>();
|
||||||
|
|
||||||
|
var dic = await _dictionarRepository.Where(x => x.Parent.Code == "ReadingVersion").ToListAsync();
|
||||||
|
|
||||||
|
var maxDic = dic.Select(x => int.Parse(x.Code)).Max();
|
||||||
|
|
||||||
needAddCriterionList.ForEach(x =>
|
needAddCriterionList.ForEach(x =>
|
||||||
{
|
{
|
||||||
//x.IsEnable = false;
|
//x.IsEnable = false;
|
||||||
|
x.ReadingVersionEnum = (ReadingVersion)maxDic;
|
||||||
x.TrialId = trialId;
|
x.TrialId = trialId;
|
||||||
x.ReadingQuestionCriterionSystemId = x.Id;
|
x.ReadingQuestionCriterionSystemId = x.Id;
|
||||||
x.Id = NewId.NextGuid();
|
x.Id = NewId.NextGuid();
|
||||||
|
|
|
@ -3176,6 +3176,7 @@ namespace IRaCIS.Core.Application.Service
|
||||||
x.IsReadingShowPreviousResults,
|
x.IsReadingShowPreviousResults,
|
||||||
x.IsReadingShowSubjectInfo,
|
x.IsReadingShowSubjectInfo,
|
||||||
x.DigitPlaces,
|
x.DigitPlaces,
|
||||||
|
x.ReadingVersionEnum,
|
||||||
x.CriterionType,
|
x.CriterionType,
|
||||||
x.IseCRFShowInDicomReading,
|
x.IseCRFShowInDicomReading,
|
||||||
x.IsReadingTaskViewInOrder,
|
x.IsReadingTaskViewInOrder,
|
||||||
|
@ -3234,6 +3235,7 @@ namespace IRaCIS.Core.Application.Service
|
||||||
task.ReadingTaskState = visitTaskInfo.ReadingTaskState;
|
task.ReadingTaskState = visitTaskInfo.ReadingTaskState;
|
||||||
task.IsShowStudyName= trialInfo.IsShowStudyName;
|
task.IsShowStudyName= trialInfo.IsShowStudyName;
|
||||||
task.IsBaseLine = isBaseLine;
|
task.IsBaseLine = isBaseLine;
|
||||||
|
task.ReadingVersionEnum = criterionInfo.ReadingVersionEnum;
|
||||||
task.IsExistUnprocessedFeedback = await _userFeedBackRepository.AnyAsync(x => x.VisitTaskId == task.VisitTaskId && x.State == 0);
|
task.IsExistUnprocessedFeedback = await _userFeedBackRepository.AnyAsync(x => x.VisitTaskId == task.VisitTaskId && x.State == 0);
|
||||||
// 添加默认答案
|
// 添加默认答案
|
||||||
if (inDto.VisitTaskId == null && visitTaskInfo.ReadingTaskState != ReadingTaskState.HaveSigned)
|
if (inDto.VisitTaskId == null && visitTaskInfo.ReadingTaskState != ReadingTaskState.HaveSigned)
|
||||||
|
|
|
@ -161,6 +161,29 @@ public class ReadingQuestionCriterionTrial : BaseAddAuditEntity
|
||||||
|
|
||||||
[Comment("是否影像筛选")]
|
[Comment("是否影像筛选")]
|
||||||
public bool IsImageFilter { get; set; }
|
public bool IsImageFilter { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 阅片版本
|
||||||
|
/// </summary>
|
||||||
|
public ReadingVersion ReadingVersionEnum { get; set; } = ReadingVersion.RT0;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 阅片版本
|
||||||
|
/// </summary>
|
||||||
|
public enum ReadingVersion
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// RT0
|
||||||
|
/// </summary>
|
||||||
|
RT0 = 0,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// RT1
|
||||||
|
/// </summary>
|
||||||
|
RT1 = 1,
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public enum ReadingImageDownload
|
public enum ReadingImageDownload
|
||||||
|
|
19435
IRaCIS.Core.Infra.EFCore/Migrations/20250422055505_ReadingVersionEnum.Designer.cs
generated
Normal file
19435
IRaCIS.Core.Infra.EFCore/Migrations/20250422055505_ReadingVersionEnum.Designer.cs
generated
Normal file
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,29 @@
|
||||||
|
using Microsoft.EntityFrameworkCore.Migrations;
|
||||||
|
|
||||||
|
#nullable disable
|
||||||
|
|
||||||
|
namespace IRaCIS.Core.Infra.EFCore.Migrations
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
public partial class ReadingVersionEnum : Migration
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Up(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.AddColumn<int>(
|
||||||
|
name: "ReadingVersionEnum",
|
||||||
|
table: "ReadingQuestionCriterionTrial",
|
||||||
|
type: "int",
|
||||||
|
nullable: false,
|
||||||
|
defaultValue: 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Down(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.DropColumn(
|
||||||
|
name: "ReadingVersionEnum",
|
||||||
|
table: "ReadingQuestionCriterionTrial");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -5844,6 +5844,9 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
|
||||||
.HasColumnType("int")
|
.HasColumnType("int")
|
||||||
.HasComment("阅片模式");
|
.HasComment("阅片模式");
|
||||||
|
|
||||||
|
b.Property<int>("ReadingVersionEnum")
|
||||||
|
.HasColumnType("int");
|
||||||
|
|
||||||
b.Property<int>("ShowOrder")
|
b.Property<int>("ShowOrder")
|
||||||
.HasColumnType("int")
|
.HasColumnType("int")
|
||||||
.HasComment("排序");
|
.HasComment("排序");
|
||||||
|
|
Loading…
Reference in New Issue