Uat_Study
parent
b313a89dd6
commit
60a9ed0c31
|
@ -7503,6 +7503,26 @@
|
|||
IR影像阅片
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:IRaCIS.Application.Services.ReadingImageTaskService.SplitLesion(IRaCIS.Core.Application.Service.Reading.Dto.SplitLesionInDto)">
|
||||
<summary>
|
||||
拆分病灶
|
||||
</summary>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:IRaCIS.Application.Services.ReadingImageTaskService.MergeLesion(IRaCIS.Core.Application.Service.Reading.Dto.MergeLesionInDto)">
|
||||
<summary>
|
||||
合并病灶
|
||||
</summary>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:IRaCIS.Application.Services.ReadingImageTaskService.VerifyIsBaseLineTask(System.Guid)">
|
||||
<summary>
|
||||
验证是否为基线访视任务
|
||||
</summary>
|
||||
<param name="visitTaskId"></param>
|
||||
<returns></returns>
|
||||
<exception cref="T:IRaCIS.Core.Infrastructure.BusinessValidationFailedException"></exception>
|
||||
</member>
|
||||
<member name="M:IRaCIS.Application.Services.ReadingImageTaskService.GetReadingTool(IRaCIS.Core.Application.Service.Reading.Dto.GetReadingToolInDto)">
|
||||
<summary>
|
||||
根据任务ID获取ReadingTool
|
||||
|
|
|
@ -390,7 +390,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
|||
/// <summary>
|
||||
/// RowIndex
|
||||
/// </summary>
|
||||
public decimal RowIndex { get; set; }
|
||||
public string RowIndex { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// MeasureData
|
||||
|
|
|
@ -484,7 +484,7 @@ namespace IRaCIS.Application.Services
|
|||
question.Childrens = rowIndexs.Select(x => new ReadingReportDto()
|
||||
{
|
||||
|
||||
QuestionName = question.OrderMark + x.ToString().PadLeft(2, '0'),
|
||||
QuestionName = question.OrderMark + x.GetLesionMark(),
|
||||
RowIndex = x,
|
||||
|
||||
}).ToList();
|
||||
|
@ -549,13 +549,16 @@ namespace IRaCIS.Application.Services
|
|||
/// (QuestionId) 可为空
|
||||
/// </remarks>
|
||||
/// <returns></returns>
|
||||
[HttpPost]
|
||||
public async Task<List<GetTableAnswerRowInfoOutDto>> GetTableAnswerRowInfoList(GetTableAnswerRowInfoInDto inDto)
|
||||
{
|
||||
await this.AddBaseLineAnswerToOtherTask(inDto.VisitTaskId);
|
||||
return await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId)
|
||||
var result= await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId)
|
||||
.WhereIf(inDto.QuestionId != null, x => x.QuestionId == inDto.QuestionId)
|
||||
.ProjectTo<GetTableAnswerRowInfoOutDto>(_mapper.ConfigurationProvider).OrderBy(x => x.ShowOrder).ThenBy(x => x.RowIndex)
|
||||
.ToListAsync();
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
|
@ -63,7 +63,8 @@ namespace IRaCIS.Core.Application.Service
|
|||
|
||||
|
||||
CreateMap<ReadingTableAnswerRowInfo, GetTableAnswerRowInfoOutDto>()
|
||||
.ForMember(d => d.ShowOrder, u => u.MapFrom(s => s.ReadingQuestionTrial.ShowOrder));
|
||||
.ForMember(d => d.ShowOrder, u => u.MapFrom(s => s.ReadingQuestionTrial.ShowOrder))
|
||||
.ForMember(d => d.RowIndex, u => u.MapFrom(s => s.RowIndex.ToString()));
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -15,6 +15,49 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
|||
public static class ReadingCommon
|
||||
{
|
||||
|
||||
public static Dictionary<int, string> SplitLesionDic = new Dictionary<int, string>()
|
||||
{
|
||||
{1, "a" },
|
||||
{2, "b" },
|
||||
{3, "c" },
|
||||
{4, "d" },
|
||||
{5, "e" },
|
||||
{6, "f" },
|
||||
{7, "g" },
|
||||
{8, "h" },
|
||||
{9, "i" },
|
||||
{10, "j" },
|
||||
{11, "k" },
|
||||
{12, "l" },
|
||||
{13, "m" },
|
||||
{14, "n" },
|
||||
{15, "o" },
|
||||
{16, "p" },
|
||||
{17, "q" },
|
||||
{18, "r" },
|
||||
{19, "s" },
|
||||
{20, "t" },
|
||||
{21, "u" },
|
||||
{22, "v" },
|
||||
{23, "w" },
|
||||
{24, "x" },
|
||||
{25, "y" },
|
||||
{26, "z" },
|
||||
|
||||
};
|
||||
|
||||
public static string GetLesionMark(this decimal value)
|
||||
{
|
||||
if (value % 1 == 0)
|
||||
{
|
||||
return decimal.ToInt32(value).ToString().PadLeft(2, '0');
|
||||
}
|
||||
else
|
||||
{
|
||||
return Math.Floor(value).ToString().PadLeft(2, '0') + SplitLesionDic[decimal.ToInt32((value % 1) * 100)];
|
||||
}
|
||||
}
|
||||
|
||||
public static Dictionary<ReadingCategory, decimal> TaskNumDic = new Dictionary<ReadingCategory, decimal>()
|
||||
{
|
||||
{ReadingCategory.Visit, 0 },
|
||||
|
|
Loading…
Reference in New Issue