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

Merge branch 'Test.IRC' of http://192.168.3.69:2000/XCKJ/irc-netcore-api into Test.IRC

IRC_NewDev
hang 2023-10-16 15:45:47 +08:00
parent 2c80ca7812 75b5458c02
commit 4acbe5b560
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1923,21 +1923,21 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public int? NumberOfFrames { get; set; } public int? NumberOfFrames { get; set; }
public string FromMark { get; set; } = string.Empty; public string? FromMark { get; set; }
public string ReportMark { get; set; } = string.Empty; public string? ReportMark { get; set; }
/// <summary> /// <summary>
/// 标记工具 /// 标记工具
/// </summary> /// </summary>
public string MarkTool { get; set; } = string.Empty; public string? MarkTool { get; set; }
public decimal RowIndex { get; set; } public decimal RowIndex { get; set; }
/// <summary> /// <summary>
/// 截图地址 /// 截图地址
/// </summary> /// </summary>
public string PicturePath { get; set; } = string.Empty; public string? PicturePath { get; set; }
/// <summary> /// <summary>
/// 任务Id /// 任务Id
@ -1949,9 +1949,9 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary> /// </summary>
public Guid TrialId { get; set; } public Guid TrialId { get; set; }
public string MeasureData { get; set; } = string.Empty; public string? MeasureData { get; set; }
public string? OtherMeasureData { get; set; } = string.Empty; public string? OtherMeasureData { get; set; }
public Guid? SeriesId { get; set; } public Guid? SeriesId { get; set; }
@ -1969,7 +1969,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
} }
} }
public bool IsCanEditPosition { get; set; } = false; public bool? IsCanEditPosition { get; set; }
public decimal FristAddTaskNum { get; set; } = 0; public decimal FristAddTaskNum { get; set; } = 0;
@ -1977,7 +1977,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public decimal? WL { get; set; } public decimal? WL { get; set; }
public string BlindName { get; set; } = string.Empty; public string? BlindName { get; set; }
public bool IsDicomReading { get; set; } = true; public bool IsDicomReading { get; set; } = true;

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

@ -1902,12 +1902,12 @@ namespace IRaCIS.Application.Services
if (targetlymphQuestion != null) if (targetlymphQuestion != null)
{ {
// 判断是否为淋巴结 // 判断是否为淋巴结
if (inDto.QuestionId == targetTablequestionList[0].ReadingQuestionId && inDto.AnswerList.Any(x => x.TableQuestionId == targetlymphQuestion.Id && x.Answer.EqEnum(ReadingYesOrNo.Yes))) if (inDto.QuestionId == targetTablequestionList[0].ReadingQuestionId && inDto.AnswerList.Any(x => x.TableQuestionId == targetlymphQuestion.Id && x.Answer.EqEnum(ReadingYesOrNo.No)))
{ {
if (await _readingTableQuestionAnswerRepository.CountAsync(x => x.VisitTaskId == inDto.VisitTaskId && x.TableQuestionId == targetlymphQuestion.Id && x.Answer == ReadingYesOrNo.Yes.GetEnumInt() && x.RowId != inDto.RowId) >= 2) if (await _readingTableQuestionAnswerRepository.CountAsync(x => x.VisitTaskId == inDto.VisitTaskId && x.TableQuestionId == targetlymphQuestion.Id && x.Answer == ReadingYesOrNo.No.GetEnumInt() && x.RowId != inDto.RowId) >= 2)
{ {
// 靶病灶只能添加两个淋巴结病灶 // 靶病灶只能添加两个非淋巴结病灶
throw new BusinessValidationFailedException(_localizer["ReadingImage_LuganoMaxTowTarget"]); throw new BusinessValidationFailedException(_localizer["ReadingImage_LuganoMaxTowNoTarget"]);
} }
} }
@ -2094,8 +2094,8 @@ namespace IRaCIS.Application.Services
else else
{ {
await _readingTableAnswerRowInfoRepository.NotUpdateEmptyAsync(inDto) ; await _readingTableAnswerRowInfoRepository.UpdateFromDTOAsync(inDto) ;
foreach (var item in inDto.AnswerList) foreach (var item in inDto.AnswerList)
{ {