修改自定义标准 病灶复制前值
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
parent
ee13d0ae2e
commit
a56ab0680b
|
|
@ -11081,11 +11081,6 @@
|
||||||
系统标准Id
|
系统标准Id
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionTrialView.IsCopyLesions">
|
|
||||||
<summary>
|
|
||||||
是否复制病灶
|
|
||||||
</summary>
|
|
||||||
</member>
|
|
||||||
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionTrialView.Type">
|
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionTrialView.Type">
|
||||||
<summary>
|
<summary>
|
||||||
类型
|
类型
|
||||||
|
|
@ -11966,11 +11961,6 @@
|
||||||
分类问题Id
|
分类问题Id
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionTrialInDto.IsCopyLesions">
|
|
||||||
<summary>
|
|
||||||
是否复制病灶
|
|
||||||
</summary>
|
|
||||||
</member>
|
|
||||||
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionTrialInDto.GlobalReadingShowType">
|
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionTrialInDto.GlobalReadingShowType">
|
||||||
<summary>
|
<summary>
|
||||||
全局阅片显示类型
|
全局阅片显示类型
|
||||||
|
|
|
||||||
|
|
@ -1061,10 +1061,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public Guid ReadingQuestionCriterionTrialId { get; set; }
|
public Guid ReadingQuestionCriterionTrialId { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 是否复制病灶
|
|
||||||
/// </summary>
|
|
||||||
public bool IsCopyLesions { get; set; } = false;
|
|
||||||
|
|
||||||
public Guid TrialId { get; set; }
|
public Guid TrialId { get; set; }
|
||||||
|
|
||||||
|
|
@ -2463,11 +2459,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||||
public Guid? ClassifyQuestionId { get; set; }
|
public Guid? ClassifyQuestionId { get; set; }
|
||||||
public Guid TrialId { get; set; }
|
public Guid TrialId { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 是否复制病灶
|
|
||||||
/// </summary>
|
|
||||||
public bool IsCopyLesions { get; set; } = false;
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 全局阅片显示类型
|
/// 全局阅片显示类型
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
|
||||||
|
|
@ -433,7 +433,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
||||||
x.SubjectId == taskinfo.SubjectId && x.ReadingTaskState == ReadingTaskState.HaveSigned && x.VisitTaskNum < taskinfo.VisitTaskNum && x.TaskState == TaskState.Effect && x.ArmEnum == taskinfo.ArmEnum
|
x.SubjectId == taskinfo.SubjectId && x.ReadingTaskState == ReadingTaskState.HaveSigned && x.VisitTaskNum < taskinfo.VisitTaskNum && x.TaskState == TaskState.Effect && x.ArmEnum == taskinfo.ArmEnum
|
||||||
).OrderByDescending(x => x.VisitTaskNum).Select(x => x.Id).FirstOrDefaultAsync();
|
).OrderByDescending(x => x.VisitTaskNum).Select(x => x.Id).FirstOrDefaultAsync();
|
||||||
|
|
||||||
var copyTableAnswers = await _readingTableQuestionAnswerRepository.Where(x => x.VisitTaskId == LastVisitTaskId && x.ReadingQuestionTrial.IsCopyLesions).Select(x => new CopyTableAnswerDto()
|
var copyTableAnswers = await _readingTableQuestionAnswerRepository.Where(x => x.VisitTaskId == LastVisitTaskId && x.ReadingTableQuestionTrial.IsCopy).Select(x => new CopyTableAnswerDto()
|
||||||
{
|
{
|
||||||
Answer = x.Answer,
|
Answer = x.Answer,
|
||||||
QuestionId = x.QuestionId,
|
QuestionId = x.QuestionId,
|
||||||
|
|
@ -445,7 +445,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
||||||
TrialId = x.TrialId,
|
TrialId = x.TrialId,
|
||||||
}).ToListAsync();
|
}).ToListAsync();
|
||||||
|
|
||||||
var tableRowAnswers = await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == LastVisitTaskId && x.ReadingQuestionTrial.IsCopyLesions).ProjectTo<CopyTableAnswerRowInfo>(_mapper.ConfigurationProvider).ToListAsync();
|
var tableRowAnswers = await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == LastVisitTaskId && x.ReadingQuestionTrial.ReadingTableQuestionTrialList.Any(x=>x.IsCopy)).ProjectTo<CopyTableAnswerRowInfo>(_mapper.ConfigurationProvider).ToListAsync();
|
||||||
|
|
||||||
tableRowAnswers.ForEach(x =>
|
tableRowAnswers.ForEach(x =>
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -265,9 +265,6 @@ public class ReadingQuestionTrial : BaseAddAuditEntity
|
||||||
[Comment("分类问题Id")]
|
[Comment("分类问题Id")]
|
||||||
public Guid? ClassifyQuestionId { get; set; }
|
public Guid? ClassifyQuestionId { get; set; }
|
||||||
|
|
||||||
[Comment("是否复制病灶")]
|
|
||||||
public bool IsCopyLesions { get; set; } = false;
|
|
||||||
|
|
||||||
[Comment("分组ID")]
|
[Comment("分组ID")]
|
||||||
public Guid? GroupId { get; set; }
|
public Guid? GroupId { get; set; }
|
||||||
[Comment("分组分类")]
|
[Comment("分组分类")]
|
||||||
|
|
|
||||||
20421
IRaCIS.Core.Infra.EFCore/Migrations/20251020091402_IsCopyLesions.Designer.cs
generated
Normal file
20421
IRaCIS.Core.Infra.EFCore/Migrations/20251020091402_IsCopyLesions.Designer.cs
generated
Normal file
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,30 @@
|
||||||
|
using Microsoft.EntityFrameworkCore.Migrations;
|
||||||
|
|
||||||
|
#nullable disable
|
||||||
|
|
||||||
|
namespace IRaCIS.Core.Infra.EFCore.Migrations
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
public partial class IsCopyLesions : Migration
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Up(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.DropColumn(
|
||||||
|
name: "IsCopyLesions",
|
||||||
|
table: "ReadingQuestionTrial");
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Down(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.AddColumn<bool>(
|
||||||
|
name: "IsCopyLesions",
|
||||||
|
table: "ReadingQuestionTrial",
|
||||||
|
type: "bit",
|
||||||
|
nullable: false,
|
||||||
|
defaultValue: false,
|
||||||
|
comment: "是否复制病灶");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -6550,10 +6550,6 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
|
||||||
b.Property<bool>("IsAdditional")
|
b.Property<bool>("IsAdditional")
|
||||||
.HasColumnType("bit");
|
.HasColumnType("bit");
|
||||||
|
|
||||||
b.Property<bool>("IsCopyLesions")
|
|
||||||
.HasColumnType("bit")
|
|
||||||
.HasComment("是否复制病灶");
|
|
||||||
|
|
||||||
b.Property<bool>("IsEnable")
|
b.Property<bool>("IsEnable")
|
||||||
.HasColumnType("bit");
|
.HasColumnType("bit");
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue