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

修改

IRC_NewDev
he 2024-02-20 16:23:13 +08:00
parent b147ee1c99
commit 5a76275571
3 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1364,6 +1364,7 @@ namespace IRaCIS.Application.Services
answers.Add("RowIndex", x.ToString()); answers.Add("RowIndex", x.ToString());
answers.Add("RowId", rowInfo==null?string.Empty: rowInfo.Id.ToString()); answers.Add("RowId", rowInfo==null?string.Empty: rowInfo.Id.ToString());
answers.Add("MarkTool", rowInfo.MarkTool); answers.Add("MarkTool", rowInfo.MarkTool);
answers.Add("MeltingInToLesionMarks", rowInfo.MeltingInToLesionMarks);
answers.Add("StudyId", rowInfo.StudyId.ToString()); answers.Add("StudyId", rowInfo.StudyId.ToString());
answers.Add("OrganInfoId", rowInfo.OrganInfoId.ToString()); answers.Add("OrganInfoId", rowInfo.OrganInfoId.ToString());
answers.Add("IsFristAdd", (rowInfo.FristAddTaskId== TaskId).ToString()); answers.Add("IsFristAdd", (rowInfo.FristAddTaskId== TaskId).ToString());
@ -1469,17 +1470,23 @@ namespace IRaCIS.Application.Services
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();
var meltingRows = await _readingTableAnswerRowInfoRepository.Where(x => inDto.MeltingInToLesionList.Contains(x.Id)).Include(x => x.ReadingQuestionTrial).ToListAsync();
var marks= meltingRows.OrderBy(x=>x.RowIndex).Select(x => x.ReadingQuestionTrial.OrderMark+x.RowIndex.GetLesionMark() ).ToList():
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 = TargetState.Loss.GetEnumInt(),
}); });
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, MeltingInToLesionMarks = string.Join(',', marks),
});
SplitOrMergeType = SplitOrMergeType.Merge,
}) ;
await _readingTableAnswerRowInfoRepository.SaveChangesAsync(); await _readingTableAnswerRowInfoRepository.SaveChangesAsync();
await this._readingCalculateService.CalculateTask(new CalculateTaskInDto() await this._readingCalculateService.CalculateTask(new CalculateTaskInDto()

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

@ -1106,7 +1106,9 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
x.InstanceId = null; x.InstanceId = null;
x.MeasureData = string.Empty; x.MeasureData = string.Empty;
x.PicturePath = string.Empty; x.PicturePath = string.Empty;
});
});
tableRowAnswers.ForEach(x => tableRowAnswers.ForEach(x =>
{ {

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

@ -212,6 +212,11 @@ namespace IRaCIS.Core.Domain.Models
/// </summary> /// </summary>
public string MeltingInToLesion { get; set; } = "[]"; public string MeltingInToLesion { get; set; } = "[]";
/// <summary>
/// 融向病灶的名称
/// </summary>
public string MeltingInToLesionMarks { get; set; } = string.Empty;
public List<Guid> MeltingInToLesionList { get { public List<Guid> MeltingInToLesionList { get {
try try