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

修改

Uat_Study
he 2022-12-09 15:47:37 +08:00
parent d88ab99adb
commit 5cf998bb9b
5 changed files with 228 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2265,6 +2265,86 @@
序号标记
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableAnswerRowInfoBase.QuestionId">
<summary>
第一层的Question
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableAnswerRowInfoBase.VisitTaskId">
<summary>
VisitTaskId
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableAnswerRowInfoBase.TrialId">
<summary>
TrialId
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableAnswerRowInfoBase.InstanceId">
<summary>
InstanceId
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableAnswerRowInfoBase.SeriesId">
<summary>
SeriesId
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableAnswerRowInfoBase.StudyId">
<summary>
StudyId
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableAnswerRowInfoBase.IsDicomReading">
<summary>
是Dicom阅片
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableAnswerRowInfoBase.RowIndex">
<summary>
RowIndex
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableAnswerRowInfoBase.MeasureData">
<summary>
MeasureData
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableAnswerRowInfoBase.CreateTime">
<summary>
CreateTime
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableAnswerRowInfoBase.IsCurrentTaskAdd">
<summary>
是否是当前任务添加
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableAnswerRowInfoBase.SplitRowId">
<summary>
SplitRowId
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableAnswerRowInfoBase.MergeRowId">
<summary>
MergeRowId
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableAnswerRowInfoBase.PicturePath">
<summary>
截图地址
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableAnswerRowInfoBase.FristAddTaskNum">
<summary>
第一次添加的任务ID
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableAnswerRowInfoBase.CreateUserId">
<summary>
CreateUserId
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.CopyTableAnswerDto.QuestionMark">
<summary>
问题标识
@ -4246,6 +4326,21 @@
自定义计算标记
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.CalculateRelationDto.ValueType">
<summary>
数值类型
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.CalculateRelationDto.Unit">
<summary>
单位
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.CalculateRelationDto.CustomUnit">
<summary>
自定义单位
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionTrialViewInDto.ReadingQuestionCriterionTrialId">
<summary>
系统标准Id

122
IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
View File

@ -311,7 +311,127 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public Guid TrialId { get; set; }
}
public class CopyTableAnswerRowInfo : ReadingTableAnswerRowInfo
public class ReadingTableAnswerRowInfoBase
{
public Guid Id { get; set; }
/// <summary>
/// 第一层的Question
/// </summary>
public Guid QuestionId { get; set; }
/// <summary>
/// VisitTaskId
/// </summary>
public Guid VisitTaskId { get; set; }
/// <summary>
/// TrialId
/// </summary>
public Guid TrialId { get; set; }
/// <summary>
/// InstanceId
/// </summary>
public Guid? InstanceId { get; set; }
/// <summary>
/// SeriesId
/// </summary>
public Guid? SeriesId { get; set; }
/// <summary>
/// StudyId
/// </summary>
public Guid? StudyId { get; set; }
public bool IsCanEditPosition { get; set; } = false;
/// <summary>
/// 是Dicom阅片
/// </summary>
public bool IsDicomReading { get; set; } = true;
/// <summary>
/// RowIndex
/// </summary>
public decimal RowIndex { get; set; }
/// <summary>
/// MeasureData
/// </summary>
public string MeasureData { get; set; } = string.Empty;
/// <summary>
/// CreateTime
/// </summary>
public DateTime CreateTime { get; set; }
/// <summary>
/// 是否是当前任务添加
/// </summary>
public bool IsCurrentTaskAdd { get; set; } = false;
/// <summary>
/// SplitRowId
/// </summary>
public Guid? SplitRowId { get; set; }
/// <summary>
/// MergeRowId
/// </summary>
public Guid? MergeRowId { get; set; }
public string BlindName { get; set; } = string.Empty;
public string OrderMark { get; set; } = string.Empty;
/// <summary>
/// 截图地址
/// </summary>
public string PicturePath { get; set; } = string.Empty;
/// <summary>
/// 第一次添加的任务ID
/// </summary>
public decimal FristAddTaskNum { get; set; } = 0;
public SplitOrMergeType? SplitOrMergeType { get; set; }
/// <summary>
/// CreateUserId
/// </summary>
public Guid CreateUserId { get; set; }
public int? NumberOfFrames { get; set; }
public Guid UpdateUserId { get; set; }
//string UpdateUserName { get; set; }
public DateTime UpdateTime { get; set; }
public bool IsDeleted { get; set; }
public DateTime? DeletedTime { get; set; }
public Guid? DeleteUserId { get; set; }
public string RowMark { get; set; } = string.Empty;
}
public class CopyTableAnswerRowInfo : ReadingTableAnswerRowInfoBase
{
public Guid OriginalId { get; set; }
}

8
IRaCIS.Core.Application/Service/Reading/_MapConfig.cs
View File

@ -68,9 +68,13 @@ namespace IRaCIS.Core.Application.Service
CreateMap<TumorAssessment, TumorAssessmentView>();
CreateMap<CopyTableAnswerRowInfo, ReadingTableAnswerRowInfo>();
CreateMap<ReadingTableAnswerRowInfo, CopyTableAnswerRowInfo>()
.ForMember(d => d.OriginalId, u => u.MapFrom(s => s.Id))
.ForMember(dest => dest.ReadingQuestionTrial, opt => opt.Ignore());
.ForMember(d => d.OriginalId, u => u.MapFrom(s => s.Id));
//.ForMember(dest => dest.Instance, opt => opt.Ignore())
//.ForMember(dest => dest.ReadingQuestionTrial, opt => opt.Ignore());
#region 阅片问题

14
IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs
View File

@ -328,8 +328,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
{
x.SplitRowId = tableRowAnswers.Where(y => y.OriginalId == x.SplitRowId).Select(y => y.Id).FirstOrDefault();
x.MergeRowId = tableRowAnswers.Where(y => y.OriginalId == x.MergeRowId).Select(y => y.Id).FirstOrDefault();
x.MergeRow = null;
x.SplitRow = null;
});
List<QuestionMark?> notNeedCopyMarks = new List<QuestionMark?>()
@ -396,23 +395,16 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
throw new BusinessValidationFailedException($"PCWG3标准配置异常！");
}
await _visitTaskRepository.UpdatePartialFromQueryAsync(visitTaskId, x => new VisitTask()
{
ReadingTaskState = ReadingTaskState.Reading,
});
var addList = _mapper.Map<List<ReadingTableAnswerRowInfo>>(tableRowAnswers);
await _readingTableAnswerRowInfoRepository.AddRangeAsync(tableRowAnswers);
await _readingTableAnswerRowInfoRepository.AddRangeAsync(addList);
await _readingTableQuestionAnswerRepository.AddRangeAsync(tableAnswers);
await _readingTableQuestionAnswerRepository.SaveChangesAsync();

10
IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs
View File

@ -611,7 +611,6 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
RowId = x.RowId,
QuestionMark = x.ReadingTableQuestionTrial.QuestionMark,
TableQuestionId = x.TableQuestionId,
RowIndex = x.RowIndex,
TrialId = x.TrialId
}).ToListAsync();
@ -662,12 +661,9 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
});
tableRowAnswers.ForEach(x =>
{
x.MergeRow = null;
x.SplitRow = null;
});
await _readingTableAnswerRowInfoRepository.AddRangeAsync(tableRowAnswers);
var addList= _mapper.Map<List<ReadingTableAnswerRowInfo>>(tableRowAnswers);
await _readingTableAnswerRowInfoRepository.AddRangeAsync(addList);
await _readingTableQuestionAnswerRepository.AddRangeAsync(tableAnswers);
await _readingTableQuestionAnswerRepository.SaveChangesAsync();