XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8
continuous-integration/drone/push Build is passing Details

Test_IRC_Net8
hang 2025-06-04 10:20:52 +08:00
parent 74230da400 df104ec527
commit 5c0917f14e
12 changed files with 19723 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
View File

@ -10262,6 +10262,16 @@
影像标记
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionTrialAddOrEdit.ImageTool">
<summary>
影像工具
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionTrialAddOrEdit.ImageToolAttribute">
<summary>
影像工具属性
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionTrialAddOrEdit.ClassifyType">
<summary>
分类问题类型
@ -10623,6 +10633,16 @@
影像标记
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionTrialView.ImageTool">
<summary>
影像工具
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionTrialView.ImageToolAttribute">
<summary>
影像工具属性
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionTrialView.GroupName">
<summary>
分组
@ -11513,6 +11533,16 @@
影像标记
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionTrialInDto.ImageTool">
<summary>
影像工具
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionTrialInDto.ImageToolAttribute">
<summary>
影像工具属性
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionTrialInDto.Id">
<summary>
Id

2
IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs
View File

@ -235,7 +235,7 @@ namespace IRaCIS.Core.Application.ViewModel
//重阅原始编号
//public string ReReadingOriginalTaskCode { get; set; }
public string ApplicantName { get; set; }
public Guid Id { get; set; }

1
IRaCIS.Core.Application/Service/Allocation/_MapConfig.cs
View File

@ -160,6 +160,7 @@ namespace IRaCIS.Core.Application.Service
CreateMap<VisitTaskReReading, ReReadingTaskView>()
.ForMember(o => o.ApplicantName, t => t.MapFrom(u => u.CreateUserRole.IdentityUser.FullName))
.ForMember(o => o.ReReadingNewTaskCode, t => t.MapFrom(u => u.NewReReadingTask.TaskCode))
.ForMember(o => o.OriginalReReadingTask, t => t.MapFrom(u => u.OriginalReReadingTask))
;

2
IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs
View File

@ -905,7 +905,7 @@ namespace IRaCIS.Core.Application.Contracts
public string ApplicantName { get; set; }
public string? ReReadingNewTaskCode { get; set; }

1
IRaCIS.Core.Application/Service/QC/_MapConfig.cs
View File

@ -156,6 +156,7 @@ namespace IRaCIS.Core.Application.Service
CreateMap<VisitTaskReReading, ReReadingTaskExportDto>().IncludeMembers(t => t.OriginalReReadingTask)
.ForMember(o => o.ReReadingNewTaskCode, t => t.MapFrom(u => u.NewReReadingTask.TaskCode))
.ForMember(o => o.ApplicantName, t => t.MapFrom(u => u.CreateUserRole.IdentityUser.FullName))
/*.ForMember(o => o.ApplyTask, t => t.MapFrom(u => u.OriginalReReadingTask))*/;
CreateMap<VisitTask, ReReadingTaskExportDto>()

31
IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
View File

@ -324,6 +324,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public ImageMark? ImageMarkEnum { get; set; }
/// <summary>
/// 影像工具
/// </summary>
public string ImageTool { get; set; } = string.Empty;
/// <summary>
/// 影像工具属性
/// </summary>
public string ImageToolAttribute { get; set; } = string.Empty;
public Guid? ClassifyTableQuestionId { get; set; }
/// <summary>
@ -932,6 +942,17 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// 影像标记
/// </summary>
public ImageMark? ImageMarkEnum { get; set; }
/// <summary>
/// 影像工具
/// </summary>
public string ImageTool { get; set; } = string.Empty;
/// <summary>
/// 影像工具属性
/// </summary>
public string ImageToolAttribute { get; set; } = string.Empty;
public Guid Id { get; set; }
[Comment("导出结果")]
@ -2358,6 +2379,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public ImageMark? ImageMarkEnum { get; set; }
/// <summary>
/// 影像工具
/// </summary>
public string ImageTool { get; set; } = string.Empty;
/// <summary>
/// 影像工具属性
/// </summary>
public string ImageToolAttribute { get; set; } = string.Empty;
/// <summary>
/// Id
/// </summary>

15
IRaCIS.Core.Application/Service/ReadingCalculate/MRIPDFFCalculateService.cs
View File

@ -729,6 +729,21 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
throw new BusinessValidationFailedException(_localizer["MRIPDFF_AllNeedToBeMark"]);
}
try
{
List<QuestionMark?> questionMarkList = new List<QuestionMark?>() { QuestionMark.FirstMeasurement, QuestionMark.SecondMeasurement, QuestionMark.ThirdMeasurement };
var measuredValueList = rowInfo.SelectMany(x => x.TableQuestionList).Where(x => questionMarkList.Contains(x.QuestionMark)).Select(x => decimal.Parse(x.Answer)).ToList();
if (measuredValueList.Any(x => x > 100))
{
throw new BusinessValidationFailedException(_localizer["MRIPDFF_MeasurementGT100"]);
}
}
catch (Exception)
{
throw new BusinessValidationFailedException(_localizer["MRIPDFF_MeasurementGT100"]);
}
var notableQuestionList = rowInfo.Where(x => x.TableQuestionList.Any(x => x.QuestionMark == QuestionMark.IsMeasurable && x.Answer.EqEnum(YesOrNoOrNa.No))).ToList();

10
IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs
View File

@ -284,6 +284,16 @@ public class ReadingQuestionTrial : BaseAddAuditEntity
/// </summary>
public ImageMark? ImageMarkEnum { get; set; }
/// <summary>
/// 影像工具
/// </summary>
public string ImageTool { get; set; } = string.Empty;
/// <summary>
/// 影像工具属性
/// </summary>
public string ImageToolAttribute { get; set; } = string.Empty;
[NotMapped]
public List<ExportResult> ExportResult
{

10
IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs
View File

@ -187,6 +187,16 @@ public class ReadingTableQuestionTrial : BaseAddAuditEntity
/// </summary>
public ImageMark? ImageMarkEnum { get; set; }
/// <summary>
/// 影像工具
/// </summary>
public string ImageTool { get; set; } = string.Empty;
/// <summary>
/// 影像工具属性
/// </summary>
public string ImageToolAttribute { get; set; } = string.Empty;
[NotMapped]
public List<ExportResult> ExportResult
{

19537
IRaCIS.Core.Infra.EFCore/Migrations/20250603080736_ImageTool.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

66
IRaCIS.Core.Infra.EFCore/Migrations/20250603080736_ImageTool.cs Normal file
View File

@ -0,0 +1,66 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace IRaCIS.Core.Infra.EFCore.Migrations
{
/// <inheritdoc />
public partial class ImageTool : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<string>(
name: "ImageTool",
table: "ReadingTableQuestionTrial",
type: "nvarchar(400)",
maxLength: 400,
nullable: false,
defaultValue: "");
migrationBuilder.AddColumn<string>(
name: "ImageToolAttribute",
table: "ReadingTableQuestionTrial",
type: "nvarchar(400)",
maxLength: 400,
nullable: false,
defaultValue: "");
migrationBuilder.AddColumn<string>(
name: "ImageTool",
table: "ReadingQuestionTrial",
type: "nvarchar(400)",
maxLength: 400,
nullable: false,
defaultValue: "");
migrationBuilder.AddColumn<string>(
name: "ImageToolAttribute",
table: "ReadingQuestionTrial",
type: "nvarchar(400)",
maxLength: 400,
nullable: false,
defaultValue: "");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "ImageTool",
table: "ReadingTableQuestionTrial");
migrationBuilder.DropColumn(
name: "ImageToolAttribute",
table: "ReadingTableQuestionTrial");
migrationBuilder.DropColumn(
name: "ImageTool",
table: "ReadingQuestionTrial");
migrationBuilder.DropColumn(
name: "ImageToolAttribute",
table: "ReadingQuestionTrial");
}
}
}

20
IRaCIS.Core.Infra.EFCore/Migrations/IRaCISDBContextModelSnapshot.cs
View File

@ -6257,6 +6257,16 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
b.Property<int?>("ImageMarkEnum")
.HasColumnType("int");
b.Property<string>("ImageTool")
.IsRequired()
.HasMaxLength(400)
.HasColumnType("nvarchar(400)");
b.Property<string>("ImageToolAttribute")
.IsRequired()
.HasMaxLength(400)
.HasColumnType("nvarchar(400)");
b.Property<bool>("IsAdditional")
.HasColumnType("bit");
@ -7047,6 +7057,16 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
b.Property<int?>("ImageMarkEnum")
.HasColumnType("int");
b.Property<string>("ImageTool")
.IsRequired()
.HasMaxLength(400)
.HasColumnType("nvarchar(400)");
b.Property<string>("ImageToolAttribute")
.IsRequired()
.HasMaxLength(400)
.HasColumnType("nvarchar(400)");
b.Property<bool>("IsCopy")
.HasColumnType("bit")
.HasComment("复制病灶的时候 是否复制这个问题");