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

Merge branch 'Test.IRC' of http://192.168.3.69:3000/XCKJ/irc-netcore-api into Test.IRC

IRC_NewDev
hang 2023-10-08 10:44:12 +08:00
parent b8cbec9462 3d60c3af49
commit c402878262
4 changed files with 43 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -812,9 +812,17 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public string GroupName { get; set; }
/// <summary>
/// 分类算法
/// </summary>
public string ClassifyAlgorithms { get; set; } = string.Empty;
public Guid? GroupId { get; set; }
/// <summary>
/// 分类问题Id
/// </summary>
public Guid? ClassifyQuestionId { get; set; }
public Guid? GroupId { get; set; }
/// <summary>
/// 全局阅片显示类型
@ -1775,6 +1783,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public Guid? Id { get; set; }
public bool IsAdditional { get; set; }
/// <summary>
/// 分类算法
/// </summary>
public string ClassifyAlgorithms { get; set; } = string.Empty;
/// <summary>
/// 分类问题Id
/// </summary>
public Guid? ClassifyQuestionId { get; set; }
public Guid TrialId { get; set; }
/// <summary>

2
IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
View File

@ -2040,7 +2040,7 @@ namespace IRaCIS.Application.Services
rowInfo.Id = inDto.RowId == null ? NewId.NextGuid() : inDto.RowId.Value;
result.RowId = rowInfo.Id;
rowInfo.IsCurrentTaskAdd = isCurrentTaskAdd;
rowInfo.FristAddTaskId = inDto.RowId == null ? rowInfo.Id : rowInfo.FristAddTaskId;
rowInfo.FristAddTaskId = inDto.RowId == null ? inDto.VisitTaskId : rowInfo.FristAddTaskId;
if (inDto.RowId == null)
{

12
IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
View File

@ -886,13 +886,20 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
List<QuestionMark?> needCopyMarks = new List<QuestionMark?>()
{
QuestionMark.IsLymph,
QuestionMark.Lesion,
QuestionMark.Organ,
QuestionMark.Location,
QuestionMark.Part,
QuestionMark.LowPPDLDi,
QuestionMark.LowPPDSDi,
QuestionMark.NadirPPD,
QuestionMark.LowPPDVisit,
QuestionMark.LowPPDVisit,
};
var rowIndexList = copyTableAnswers.Select(x => x.RowIndex).Distinct().ToList();
// 找到靶病灶问题Id
@ -951,6 +958,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
VisitTaskId= visitTaskId,
FirstAddTaskId=x.FirstAddTaskId,
QuestionId=x.QuestionId,
QuestionType=x.QuestionType,
}).ToListAsync();

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

@ -252,9 +252,19 @@ namespace IRaCIS.Core.Domain.Models
public string GroupEnName { get; set; } = string.Empty;
/// <summary>
/// 是否复制病灶
/// 分类算法
/// </summary>
public bool IsCopyLesions { get; set; } = false;
public string ClassifyAlgorithms { get; set; } = string.Empty;
/// <summary>
/// 分类问题Id
/// </summary>
public Guid? ClassifyQuestionId { get; set; }
/// <summary>
/// 是否复制病灶
/// </summary>
public bool IsCopyLesions { get; set; } = false;
/// <summary>
/// 分组ID