IRC_NewDev
parent
88931a4a56
commit
8b7cc8a220
|
@ -4867,6 +4867,21 @@
|
||||||
序号标记
|
序号标记
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
|
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.MergeLesionInDto.MergeRowId">
|
||||||
|
<summary>
|
||||||
|
融合的病灶
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.MergeLesionInDto.MeltingInToLesionList">
|
||||||
|
<summary>
|
||||||
|
融向的病灶
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.MergeLesionInDto.LesionState">
|
||||||
|
<summary>
|
||||||
|
融合后病灶状态
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetCustomTagInDto.VisitTaskId">
|
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetCustomTagInDto.VisitTaskId">
|
||||||
<summary>
|
<summary>
|
||||||
任务Id
|
任务Id
|
||||||
|
|
|
@ -334,10 +334,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public List<Guid> MeltingInToLesionList { get; set; }
|
public List<Guid> MeltingInToLesionList { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
///// <summary>
|
||||||
/// 融合后病灶状态
|
///// 融合后病灶状态
|
||||||
/// </summary>
|
///// </summary>
|
||||||
public string LesionState { get; set; }
|
//public string LesionState { get; set; }
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1465,24 +1465,30 @@ namespace IRaCIS.Application.Services
|
||||||
[TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
|
[TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
|
||||||
public async Task MergeLesion(MergeLesionInDto inDto)
|
public async Task MergeLesion(MergeLesionInDto inDto)
|
||||||
{
|
{
|
||||||
await VerifyTaskIsSign(inDto.VisitTaskId);
|
await VerifyTaskIsSign(inDto.VisitTaskId);
|
||||||
await this.VerifyIsBaseLineTask(inDto.VisitTaskId);
|
await this.VerifyIsBaseLineTask(inDto.VisitTaskId);
|
||||||
var mergeRow =await _readingTableAnswerRowInfoRepository.Where(x => x.Id == inDto.MergeRowId).FirstNotNullAsync();
|
var mergeRow = await _readingTableAnswerRowInfoRepository.Where(x => x.Id == inDto.MergeRowId).FirstNotNullAsync();
|
||||||
if (inDto.LesionState != string.Empty)
|
|
||||||
{
|
await _readingTableQuestionAnswerRepository.BatchUpdateNoTrackingAsync(x => x.RowId == mergeRow.Id && x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.State, x => new ReadingTableQuestionAnswer()
|
||||||
await _readingTableQuestionAnswerRepository.BatchUpdateNoTrackingAsync(x => x.RowId == mergeRow.Id && x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.State, x => new ReadingTableQuestionAnswer()
|
{
|
||||||
{
|
Answer = TargetState.Loss.GetEnumInt(),
|
||||||
Answer = inDto.LesionState,
|
});
|
||||||
});
|
|
||||||
}
|
|
||||||
|
await _readingTableAnswerRowInfoRepository.UpdatePartialFromQueryAsync(inDto.MergeRowId, x => new ReadingTableAnswerRowInfo()
|
||||||
await _readingTableAnswerRowInfoRepository.UpdatePartialFromQueryAsync(inDto.MergeRowId, x => new ReadingTableAnswerRowInfo()
|
{
|
||||||
{
|
MeltingInToLesion = JsonConvert.SerializeObject(inDto.MeltingInToLesionList),
|
||||||
MeltingInToLesion=JsonConvert.SerializeObject(inDto.MeltingInToLesionList),
|
SplitOrMergeType = SplitOrMergeType.Merge,
|
||||||
SplitOrMergeType = SplitOrMergeType.Merge,
|
});
|
||||||
});
|
await _readingTableAnswerRowInfoRepository.SaveChangesAsync();
|
||||||
await _readingTableAnswerRowInfoRepository.SaveChangesAsync();
|
|
||||||
}
|
await this._readingCalculateService.CalculateTask(new CalculateTaskInDto()
|
||||||
|
{
|
||||||
|
IsChangeOtherTask = false,
|
||||||
|
VisitTaskId = inDto.VisitTaskId,
|
||||||
|
ComputationTrigger = ComputationTrigger.Lesion,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 获取可合并的病灶
|
/// 获取可合并的病灶
|
||||||
|
|
Loading…
Reference in New Issue