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

修改

Uat_Study
he 2022-10-27 11:06:36 +08:00
parent d0148a27cc
commit 8d1762997c
5 changed files with 36 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2127,6 +2127,11 @@
RowIndex
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTableAnswerRowInfoOutDto.IsDicomReading">
<summary>
是Dicom阅片
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTableAnswerRowInfoOutDto.MeasureData">
<summary>
MeasureData

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

@ -284,7 +284,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public Guid QuestionId { get; set; }
public decimal RowIndex { get; set; }
public Guid RowId { get; set; }
}
public class GetDicomReadingQuestionAnswerInDto
@ -457,6 +457,14 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public string RowIndex { get; set; }
/// <summary>
/// 是Dicom阅片
/// </summary>
public bool IsDicomReading { get; set; } = true;
public string BlindName { get; set; } = string.Empty;
/// <summary>
/// MeasureData
/// </summary>
@ -1161,6 +1169,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public decimal FristAddTaskNum { get; set; } = 0;
public string BlindName { get; set; } = string.Empty;
public bool IsDicomReading { get; set; } = true;
public List<SubmitTableQuestionInfo> AnswerList { get; set; }
}

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

@ -709,6 +709,8 @@ namespace IRaCIS.Application.Services
var rowInfo = tableAnsweRowInfos.Where(y => y.RowIndex == x && y.QuestionId == item.Id).FirstOrDefault();
answers.Add("BlindName", rowInfo.BlindName);
answers.Add("IsDicomReading", rowInfo.IsDicomReading.ToString());
answers.Add("MeasureData", rowInfo == null ? string.Empty : rowInfo.MeasureData);
answers.Add("RowIndex", x.ToString());
answers.Add("RowId", rowInfo.Id.ToString());
@ -886,7 +888,7 @@ namespace IRaCIS.Application.Services
public async Task<IResponseOutput> DeleteReadingRowAnswer(DeleteReadingRowAnswerInDto inDto)
{
var deleteRowInfo = await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId && x.RowIndex == inDto.RowIndex && x.QuestionId == inDto.QuestionId).FirstNotNullAsync();
var deleteRowInfo = await _readingTableAnswerRowInfoRepository.Where(x =>x.Id== inDto.RowId).FirstNotNullAsync();
if (deleteRowInfo == null)
{
return ResponseOutput.Ok(true);
@ -898,8 +900,8 @@ namespace IRaCIS.Application.Services
throw new BusinessValidationFailedException($"当前病灶分裂出其他病灶或者其他病灶合并到了当前病灶,删除失败");
}
await _readingTableQuestionAnswerRepository.DeleteFromQueryAsync(x => x.VisitTaskId == inDto.VisitTaskId && x.RowIndex == inDto.RowIndex && x.QuestionId == inDto.QuestionId);
await _readingTableAnswerRowInfoRepository.DeleteFromQueryAsync(x => x.VisitTaskId == inDto.VisitTaskId && x.RowIndex == inDto.RowIndex && x.QuestionId == inDto.QuestionId);
await _readingTableQuestionAnswerRepository.DeleteFromQueryAsync(x => x.RowId== inDto.RowId);
await _readingTableAnswerRowInfoRepository.DeleteFromQueryAsync(x => x.Id==inDto.RowId);
await _readingTableAnswerRowInfoRepository.SaveChangesAsync();
@ -1026,6 +1028,8 @@ namespace IRaCIS.Application.Services
rowInfo.TrialId = inDto.TrialId;
rowInfo.QuestionId = inDto.QuestionId;
rowInfo.MeasureData = inDto.MeasureData;
rowInfo.BlindName = inDto.BlindName;
rowInfo.IsDicomReading = inDto.IsDicomReading;
rowInfo.IsCurrentTaskAdd = isCurrentTaskAdd;
rowInfo.FristAddTaskNum = inDto.FristAddTaskNum;
rowInfo.RowIndex = inDto.RowIndex;

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

@ -146,21 +146,21 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
);
});
var maxNewLesionsRowIndex = tableRowAnswers.Where(x => x.QuestionId == newLesionQuestion.Id).OrderByDescending(x => x.RowIndex).Select(x => x.RowIndex).FirstOrDefault();
var maxNewLesionsRowIndex = tableRowAnswers.Where(x => x.QuestionId == alwaysNewLesionsQuestion.Id).OrderByDescending(x => x.RowIndex).Select(x => x.RowIndex).FirstOrDefault();
maxNewLesionsRowIndex = Math.Floor(maxNewLesionsRowIndex);
foreach (var item in tableRowAnswers.Where(x => x.QuestionId == newLesionQuestion.Id).OrderBy(x=>x.RowIndex))
{
maxNewLesionsRowIndex++;
item.QuestionId = alwaysNewLesionsQuestion.Id;
item.RowIndex = maxNewLesionsRowIndex;
foreach (var tableAnswer in tableAnswers.Where(y => y.RowId == item.Id))
{
tableAnswer.QuestionId = alwaysNewLesionsQuestion.Id;
tableAnswer.TableQuestionId = alwaysTableQuestionIdDic[tableAnswer.TableQuestionId];
tableAnswer.RowIndex = maxNewLesionsRowIndex;
}
}

8
IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs
View File

@ -49,6 +49,12 @@ namespace IRaCIS.Core.Domain.Models
public bool IsCanEditPosition { get; set; } = false;
/// <summary>
/// 是Dicom阅片
/// </summary>
public bool IsDicomReading { get; set; } = true;
/// <summary>
/// RowIndex
/// </summary>
@ -80,7 +86,7 @@ namespace IRaCIS.Core.Domain.Models
/// </summary>
public Guid? MergeRowId { get; set; }
public string BlindName { get; set; } = string.Empty;
/// <summary>
/// 第一次添加的任务ID