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

Merge branch 'master' of http://192.168.1.2:8033/IRaCIS_Core_Api

Uat_Study
hang 2023-05-22 10:39:28 +08:00
parent 05a9ef9410 c41b6b2eb3
commit 90e1f87fb4
5 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -137,7 +137,9 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public decimal FristAddTaskNum { get; set; } public decimal FristAddTaskNum { get; set; }
public ReportLayType ReportLayType { get; set; } = ReportLayType.Group; public ReportLayType ReportLayType { get; set; } = ReportLayType.Group;
public string ReportMark { get; set; } = string.Empty;
/// <summary> /// <summary>
/// 问题英文分组 /// 问题英文分组
@ -574,6 +576,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary> /// </summary>
public Guid CreateUserId { get; set; } public Guid CreateUserId { get; set; }
public int? NumberOfFrames { get; set; } public int? NumberOfFrames { get; set; }
@ -596,6 +599,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary> /// </summary>
public string FromMark { get; set; } = string.Empty; public string FromMark { get; set; } = string.Empty;
public string ReportMark { get; set; } = string.Empty;
public string RowMark { get; set; } = string.Empty; public string RowMark { get; set; } = string.Empty;
} }
@ -1741,10 +1746,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public string FromMark { get; set; } = string.Empty; public string FromMark { get; set; } = string.Empty;
/// <summary> public string ReportMark { get; set; } = string.Empty;
/// 标记工具
/// </summary> /// <summary>
public string MarkTool { get; set; } = string.Empty; /// 标记工具
/// </summary>
public string MarkTool { get; set; } = string.Empty;
public decimal RowIndex { get; set; } public decimal RowIndex { get; set; }

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

@ -1914,7 +1914,9 @@ namespace IRaCIS.Application.Services
rowInfo.IsCurrentTaskAdd = isCurrentTaskAdd; rowInfo.IsCurrentTaskAdd = isCurrentTaskAdd;
rowInfo.NumberOfFrames = inDto.NumberOfFrames; rowInfo.NumberOfFrames = inDto.NumberOfFrames;
rowInfo.MarkTool = inDto.MarkTool; rowInfo.MarkTool = inDto.MarkTool;
rowInfo.FristAddTaskNum = taskinfo.VisitTaskNum; rowInfo.ReportMark = inDto.ReportMark;
rowInfo.FristAddTaskNum = taskinfo.VisitTaskNum;
rowInfo.FristAddTaskId = inDto.VisitTaskId; rowInfo.FristAddTaskId = inDto.VisitTaskId;
rowInfo.PicturePath = inDto.PicturePath; rowInfo.PicturePath = inDto.PicturePath;
rowInfo.RowIndex = inDto.RowIndex; rowInfo.RowIndex = inDto.RowIndex;
@ -1975,6 +1977,7 @@ namespace IRaCIS.Application.Services
VisitTaskId = rowInfo.VisitTaskId, VisitTaskId = rowInfo.VisitTaskId,
StudyId = rowInfo.StudyId, StudyId = rowInfo.StudyId,
IsCanEditPosition = rowInfo.IsCanEditPosition, IsCanEditPosition = rowInfo.IsCanEditPosition,
ReportMark = rowInfo.ReportMark
}) ; }) ;

3
IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs
View File

@ -246,7 +246,10 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
{ {
x.FristAddTaskId = x.FristAddTaskId==beforeConvertedTaskId? visitTaskId: x.FristAddTaskId; x.FristAddTaskId = x.FristAddTaskId==beforeConvertedTaskId? visitTaskId: x.FristAddTaskId;
x.QuestionId = otherLesionQuestion.Id; x.QuestionId = otherLesionQuestion.Id;
x.OrderMark = otherLesionQuestion.OrderMark; x.OrderMark = otherLesionQuestion.OrderMark;
x.FromMark = x.FristAddTaskId == beforeConvertedTaskId ? string.Empty : x.RowMark;
x.ReportMark = x.RowMark;
x.RowMark = otherLesionQuestion.OrderMark + x.RowIndex.GetLesionMark(); x.RowMark = otherLesionQuestion.OrderMark + x.RowIndex.GetLesionMark();
} }

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

@ -251,7 +251,9 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
RowIndex = rowoindex, RowIndex = rowoindex,
BlindName = rowinfo != null ? rowinfo.BlindName : string.Empty, BlindName = rowinfo != null ? rowinfo.BlindName : string.Empty,
ReportLayType = ReportLayType.Lesions, ReportLayType = ReportLayType.Lesions,
}); ReportMark = rowinfo != null ? rowinfo.ReportMark : string.Empty,
}) ;
} }

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

@ -153,7 +153,12 @@ namespace IRaCIS.Core.Domain.Models
/// </summary> /// </summary>
public string FromMark { get; set; } = string.Empty; public string FromMark { get; set; } = string.Empty;
public bool IsDeleted { get; set; } /// <summary>
/// 报告页面显示来自于哪个标记
/// </summary>
public string ReportMark { get; set; } = string.Empty;
public bool IsDeleted { get; set; }
public DateTime? DeletedTime { get; set; } public DateTime? DeletedTime { get; set; }