修改
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
parent
209d932757
commit
00c6705161
|
@ -16645,6 +16645,11 @@
|
||||||
流程配置是否确认
|
流程配置是否确认
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
|
<member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.ReadingToolList">
|
||||||
|
<summary>
|
||||||
|
阅片工具
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
<member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.TrialId">
|
<member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.TrialId">
|
||||||
<summary>
|
<summary>
|
||||||
项目ID
|
项目ID
|
||||||
|
|
|
@ -1859,6 +1859,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public ReadingVersion ReadingVersionEnum { get; set; }
|
public ReadingVersion ReadingVersionEnum { get; set; }
|
||||||
|
|
||||||
|
public List<string> ReadingToolList { get; set; } = new List<string>();
|
||||||
|
|
||||||
public ReadingCategory ReadingCategory { get; set; }
|
public ReadingCategory ReadingCategory { get; set; }
|
||||||
|
|
||||||
public decimal VisitNum { get; set; }
|
public decimal VisitNum { get; set; }
|
||||||
|
|
|
@ -3180,6 +3180,7 @@ namespace IRaCIS.Core.Application.Service
|
||||||
x.CriterionType,
|
x.CriterionType,
|
||||||
x.IseCRFShowInDicomReading,
|
x.IseCRFShowInDicomReading,
|
||||||
x.IsReadingTaskViewInOrder,
|
x.IsReadingTaskViewInOrder,
|
||||||
|
x.ReadingToolList,
|
||||||
}).FirstNotNullAsync();
|
}).FirstNotNullAsync();
|
||||||
|
|
||||||
task.IsReadingShowPreviousResults = criterionInfo.IsReadingShowPreviousResults;
|
task.IsReadingShowPreviousResults = criterionInfo.IsReadingShowPreviousResults;
|
||||||
|
@ -3236,6 +3237,7 @@ namespace IRaCIS.Core.Application.Service
|
||||||
task.IsShowStudyName= trialInfo.IsShowStudyName;
|
task.IsShowStudyName= trialInfo.IsShowStudyName;
|
||||||
task.IsBaseLine = isBaseLine;
|
task.IsBaseLine = isBaseLine;
|
||||||
task.ReadingVersionEnum = criterionInfo.ReadingVersionEnum;
|
task.ReadingVersionEnum = criterionInfo.ReadingVersionEnum;
|
||||||
|
task.ReadingToolList = criterionInfo.ReadingToolList;
|
||||||
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)
|
||||||
|
|
|
@ -376,6 +376,13 @@ namespace IRaCIS.Core.Application.Contracts
|
||||||
|
|
||||||
public class GetTrialReadingInfoOutDto
|
public class GetTrialReadingInfoOutDto
|
||||||
{
|
{
|
||||||
|
public ReadingVersion ReadingVersionEnum { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 阅片工具
|
||||||
|
/// </summary>
|
||||||
|
public List<string> ReadingToolList { get; set; }
|
||||||
|
|
||||||
public string TrialModalitys { get; set; }
|
public string TrialModalitys { get; set; }
|
||||||
|
|
||||||
public bool IsImageFilter { get; set; }
|
public bool IsImageFilter { get; set; }
|
||||||
|
@ -901,6 +908,8 @@ namespace IRaCIS.Core.Application.Contracts
|
||||||
|
|
||||||
public class SetCriterionReadingInfoInDto
|
public class SetCriterionReadingInfoInDto
|
||||||
{
|
{
|
||||||
|
public List<string> ReadingToolList { get; set; } = new List<string>() { };
|
||||||
|
|
||||||
public bool IsImageFilter { get; set; }
|
public bool IsImageFilter { get; set; }
|
||||||
public string CriterionModalitys { get; set; }
|
public string CriterionModalitys { get; set; }
|
||||||
|
|
||||||
|
|
|
@ -562,6 +562,7 @@ namespace IRaCIS.Core.Application
|
||||||
|
|
||||||
await _readingQuestionCriterionTrialRepository.UpdatePartialFromQueryAsync(inDto.TrialReadingCriterionId, x => new ReadingQuestionCriterionTrial()
|
await _readingQuestionCriterionTrialRepository.UpdatePartialFromQueryAsync(inDto.TrialReadingCriterionId, x => new ReadingQuestionCriterionTrial()
|
||||||
{
|
{
|
||||||
|
ReadingToolList=inDto.ReadingToolList,
|
||||||
IsImageFilter = inDto.IsImageFilter,
|
IsImageFilter = inDto.IsImageFilter,
|
||||||
ImageDownloadEnum = inDto.ImageDownloadEnum,
|
ImageDownloadEnum = inDto.ImageDownloadEnum,
|
||||||
ImageUploadEnum = inDto.ImageUploadEnum,
|
ImageUploadEnum = inDto.ImageUploadEnum,
|
||||||
|
|
|
@ -166,6 +166,11 @@ public class ReadingQuestionCriterionTrial : BaseAddAuditEntity
|
||||||
/// 阅片版本
|
/// 阅片版本
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public ReadingVersion ReadingVersionEnum { get; set; } = ReadingVersion.RT0;
|
public ReadingVersion ReadingVersionEnum { get; set; } = ReadingVersion.RT0;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 阅片工具
|
||||||
|
/// </summary>
|
||||||
|
public List<string> ReadingToolList { get; set; } = new List<string>();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
19439
IRaCIS.Core.Infra.EFCore/Migrations/20250424013108_ReadingToolList.Designer.cs
generated
Normal file
19439
IRaCIS.Core.Infra.EFCore/Migrations/20250424013108_ReadingToolList.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 ReadingToolList : Migration
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Up(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.AddColumn<string>(
|
||||||
|
name: "ReadingToolList",
|
||||||
|
table: "ReadingQuestionCriterionTrial",
|
||||||
|
type: "nvarchar(max)",
|
||||||
|
nullable: false,
|
||||||
|
defaultValue: "[]");
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Down(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.DropColumn(
|
||||||
|
name: "ReadingToolList",
|
||||||
|
table: "ReadingQuestionCriterionTrial");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -5840,6 +5840,10 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
|
||||||
.HasColumnType("int")
|
.HasColumnType("int")
|
||||||
.HasComment("阅片工具");
|
.HasComment("阅片工具");
|
||||||
|
|
||||||
|
b.Property<string>("ReadingToolList")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("nvarchar(max)");
|
||||||
|
|
||||||
b.Property<int>("ReadingType")
|
b.Property<int>("ReadingType")
|
||||||
.HasColumnType("int")
|
.HasColumnType("int")
|
||||||
.HasComment("阅片模式");
|
.HasComment("阅片模式");
|
||||||
|
|
Loading…
Reference in New Issue