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

标记的排序修改

Test_IRC_Net8
he 2025-06-23 14:13:51 +08:00
parent b143ffbcfc
commit 04422cd795
3 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DicomSeriesModel.cs
View File

@ -68,6 +68,10 @@ namespace IRaCIS.Core.Application.Contracts.Dicom.DTO
public int? NumberOfFrames { get; set; }
public DateTime CreateTime { get; set; }
public int? QuestionSort { get; set; }
public int? RowSort { get; set; }
}
public class InstanceBasicInfo
{

17
IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs
View File

@ -20,6 +20,7 @@ namespace IRaCIS.Core.Application.Services
IRepository<VisitTask> _visitTaskRepository,
IRepository<ReadingTableAnswerRowInfo> _readingTableAnswerRowInfoRepository,
IRepository<ReadingCustomTag> _readingCustomTagRepository,
IRepository<ReadingTaskQuestionMark> _readingTaskQuestionMark,
IRepository<NoneDicomStudyFile> _noneDicomStudyFileRepository,
IRepository<Subject> _subjectRepository,
IRepository<DicomInstance> _dicomInstanceRepository,
@ -570,6 +571,7 @@ namespace IRaCIS.Core.Application.Services
InstanceId = x.InstanceId,
NumberOfFrames = x.NumberOfFrames,
CreateTime=x.CreateTime,
}).ToListAsync();
@ -584,9 +586,20 @@ namespace IRaCIS.Core.Application.Services
NumberOfFrames = x.NumberOfFrames,
CreateTime = x.CreateTime,
}).ToListAsync();
rowInfoList.AddRange(customoList);
var questionMarkList = await _readingTaskQuestionMark.Where(x => x.VisitTaskId == indto.VisitTaskId && x.StudyId != null).Select(x => new StudyInstanceInfo()
{
ShowOrder = x.ReadingQuestionTrial==null?0: x.ReadingQuestionTrial.ShowOrder,
RowIndex = 0m,
SeriesId = x.SeriesId,
StudyId = x.StudyId,
InstanceId = x.InstanceId,
NumberOfFrames = x.NumberOfFrames,
CreateTime = x.CreateTime,
}).ToListAsync();
rowInfoList.AddRange(questionMarkList);
var thisStudyIds = rowInfoList.OrderBy(x => x.ShowOrder).ThenBy(x => x.RowIndex).Select(x => x.StudyId).Distinct().ToList();
var thisSeriesIdIds = rowInfoList.Where(x => x.SeriesId != null).OrderBy(x => x.ShowOrder).ThenBy(x => x.RowIndex).Select(x => x.SeriesId).Distinct().ToList();
if (rowInfoList.Count > 0)
@ -646,7 +659,7 @@ namespace IRaCIS.Core.Application.Services
});
item.InstanceInfoList = item.InstanceInfoList.OrderBy(x => x.RowDate).ToList();
item.InstanceInfoList = item.InstanceInfoList.OrderBy(x => x.ShowOrder).ThenBy(x=>x.RowIndex).ThenBy(x=>x.RowDate).ToList();
item.InstanceCount = item.InstanceInfoList.Count;

4
IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskQuestionMark.cs
View File

@ -8,7 +8,7 @@ public class ReadingTaskQuestionMark : BaseAddAuditEntity
#region 导航属性
[JsonIgnore]
[ForeignKey("QuestionId")]
public ReadingQuestionTrial ReadingQuestionTrial { get; set; }
public ReadingQuestionTrial? ReadingQuestionTrial { get; set; }
[JsonIgnore]
[ForeignKey("VisitTaskId")]
@ -16,7 +16,7 @@ public class ReadingTaskQuestionMark : BaseAddAuditEntity
#endregion
public Guid VisitTaskId { get; set; }
public Guid QuestionId { get; set; }
public Guid? QuestionId { get; set; }
public Guid? InstanceId { get; set; }