Compare commits

..

No commits in common. "461a59b6785da7da4e52f76c6df470cb66d615bb" and "8a26c4285755337bc12a2a8c9bcf95e8635c83ca" have entirely different histories.

4 changed files with 5 additions and 32 deletions

View File

@ -12055,12 +12055,11 @@
<param name="inDto"></param> <param name="inDto"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:IRaCIS.Core.Application.Service.ReadingImageTaskService.SaveTableQuestionMark(IRaCIS.Core.Application.Service.Reading.Dto.SaveTableQuestionMarkInDto,System.String)"> <member name="M:IRaCIS.Core.Application.Service.ReadingImageTaskService.SaveTableQuestionMark(IRaCIS.Core.Application.Service.Reading.Dto.SaveTableQuestionMarkInDto)">
<summary> <summary>
保存表格问题标记 保存表格问题标记
</summary> </summary>
<param name="inDto"></param> <param name="inDto"></param>
<param name="param"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:IRaCIS.Core.Application.Service.ReadingImageTaskService.GetPreviousOtherPicturePath(IRaCIS.Core.Application.Service.Reading.Dto.GetPreviousOtherPicturePathInDto)"> <member name="M:IRaCIS.Core.Application.Service.ReadingImageTaskService.GetPreviousOtherPicturePath(IRaCIS.Core.Application.Service.Reading.Dto.GetPreviousOtherPicturePathInDto)">

View File

@ -102,11 +102,9 @@ namespace IRaCIS.Core.Application.Service
/// 保存表格问题标记 /// 保存表格问题标记
/// </summary> /// </summary>
/// <param name="inDto"></param> /// <param name="inDto"></param>
/// <param name="param"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
[Route("/ReadingImageTask/SaveTableQuestionMark/{param}")] public async Task<SaveTableQuestionMarkInDto> SaveTableQuestionMark(SaveTableQuestionMarkInDto inDto)
public async Task<SaveTableQuestionMarkInDto> SaveTableQuestionMark(SaveTableQuestionMarkInDto inDto, string param)
{ {
inDto.FirstAddTaskId = await _readingTaskQuestionMarkRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId && x.TableQuestionId == inDto.TableQuestionId && x.RowId == inDto.RowId).Select(x => x.FirstAddTaskId).FirstOrDefaultAsync(); inDto.FirstAddTaskId = await _readingTaskQuestionMarkRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId && x.TableQuestionId == inDto.TableQuestionId && x.RowId == inDto.RowId).Select(x => x.FirstAddTaskId).FirstOrDefaultAsync();
@ -136,7 +134,7 @@ namespace IRaCIS.Core.Application.Service
{ {
IsChangeOtherTask = false, IsChangeOtherTask = false,
VisitTaskId = inDto.VisitTaskId, VisitTaskId = inDto.VisitTaskId,
ComputationTrigger = (ComputationTrigger)int.Parse(param), ComputationTrigger = ComputationTrigger.SaveTableQuestionMark,
}); });
return inDto; return inDto;

View File

@ -2828,9 +2828,9 @@ public enum PET5PSScore
PatchDataStatistics = 9, PatchDataStatistics = 9,
/// <summary> /// <summary>
/// 保存肝脏分段 /// 保存表格问题标记
/// </summary> /// </summary>
SaveLiverSegments = 10, SaveTableQuestionMark = 10,
} }
/// <summary> /// <summary>

View File

@ -2986,30 +2986,6 @@ namespace IRaCIS.Core.Infra.EFCore.Common
} }
foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(ReadingTaskQuestionMark)))
{
var type = AuditOpt.Add;
var entity = item.Entity as ReadingTaskQuestionMark;
var answer = entitys.Where(x => x.Entity.GetType() == typeof(ReadingTableQuestionAnswer)).Select(x => x.Entity as ReadingTableQuestionAnswer)
.Where(x => x.RowId == entity.RowId).Select(x => x.Answer).FirstOrDefault();
var liverSegmentation = await _dbContext.ReadingTableQuestionAnswer.Where(x => x.RowId == entity.RowId && x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.liverSegmentation).Select(x => x.Answer).FirstOrDefaultAsync();
await InsertInspection<ReadingTaskQuestionMark>(entity, type, x => new InspectionConvertDTO()
{
VisitTaskId = entity.VisitTaskId,
ObjectRelationParentId = entity.VisitTaskId,
},new {
Answer= answer,
LiverSegmentation= liverSegmentation,
});
}
//病灶这里操作 ReadingTableAnswerRowInfo ReadingTableQuestionAnswer //病灶这里操作 ReadingTableAnswerRowInfo ReadingTableQuestionAnswer
foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(ReadingTableAnswerRowInfo))) foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(ReadingTableAnswerRowInfo)))