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

修改多帧接口
continuous-integration/drone/push Build is passing Details

IRC_NewDev
hang 2024-05-22 10:06:38 +08:00
parent 1fbf635582
commit ca96c67e96
3 changed files with 58 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
View File

@ -5636,6 +5636,11 @@
裁判百分比或绝对值的相差值
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GlobalQuestionInfo.JudgeDifferenceType">
<summary>
裁判百分比或绝对值的相差值匹配规则
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GlobalQuestionInfo.QuestionType">
<summary>
问题类型
@ -5746,11 +5751,21 @@
裁判百分比或绝对值的相差值
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.SetTrialCriterionJudgeQuestionAnswerGroupInDto.JudgeDifferenceType">
<summary>
裁判百分比或绝对值的相差值匹配规则
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTrialCriterionJudgeQuestionListOutDto.JudgeDifferenceValue">
<summary>
裁判百分比或绝对值的相差值
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTrialCriterionJudgeQuestionListOutDto.JudgeDifferenceType">
<summary>
裁判百分比或绝对值的相差值匹配规则
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTrialCriterionJudgeQuestionListOutDto.QuestionGenre">
<summary>
问题类型
@ -5866,11 +5881,21 @@
裁判百分比或绝对值的相差值
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GroupTaskAnswerDto.JudgeDifferenceType">
<summary>
裁判百分比或绝对值的相差值匹配规则
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.TaskAnswerDto.JudgeDifferenceValue">
<summary>
裁判百分比或绝对值的相差值
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.TaskAnswerDto.JudgeDifferenceType">
<summary>
裁判百分比或绝对值的相差值匹配规则
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.TableQuestionDataInfo.Id">
<summary>

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

@ -1,4 +1,6 @@
namespace IRaCIS.Core.Application.Contracts.Dicom.DTO
using System.Text.Json.Serialization;
namespace IRaCIS.Core.Application.Contracts.Dicom.DTO
{
public class DicomSeriesDTO
{
@ -70,6 +72,11 @@
public int NumberOfFrames { get; set; }
public int InstanceNumber { get; set; }
[JsonIgnore]
public int ShowOrder { get; set; }
[JsonIgnore]
public decimal RowIndex { get; set; }
}
public class DicomSeriesWithLabelDTO : DicomSeriesDTO

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

@ -289,8 +289,8 @@ namespace IRaCIS.Core.Application.Services
NumberOfFrames = k.NumberOfFrames,
HtmlPath = k.HtmlPath,
Path = k.Path,
InstanceNumber=k.InstanceNumber,
InstanceNumber = k.InstanceNumber,
}).ToList();
}
@ -548,20 +548,20 @@ namespace IRaCIS.Core.Application.Services
{
item.SeriesInstanceUid = string.Empty;
item.InstanceList = thisRowinfo.Where(y => y.InstanceId != null).OrderBy(x => x.ShowOrder).ThenBy(x => x.RowIndex).Select(y => y.InstanceId!.Value).Distinct().ToList();
var markInstanceIdList = thisRowinfo.Where(y => y.InstanceId != null).OrderBy(x => x.ShowOrder).ThenBy(x => x.RowIndex).Select(y => y.InstanceId!.Value).Distinct().ToList();
var tempInstanceList = await _repository.Where<DicomInstance>(t => item.InstanceList.Contains(t.Id)).OrderBy(t => t.InstanceNumber)
.Select(t => new TempInstance
{
item.InstanceInfoList = await _repository.Where<DicomInstance>(t => markInstanceIdList.Contains(t.Id)).OrderBy(t => t.InstanceNumber).Select(k =>
new InstanceBasicInfo()
{
Id = k.Id,
NumberOfFrames = k.NumberOfFrames,
HtmlPath = k.HtmlPath,
Path = k.Path,
InstanceNumber = k.InstanceNumber,
Id = t.Id,
Path = t.Path,
NumberOfFrames = t.NumberOfFrames,
InstanceNumber = t.InstanceNumber
}).ToListAsync();
}).ToListAsync();
tempInstanceList.ForEach(x =>
item.InstanceInfoList.ForEach(x =>
{
var item = thisRowinfo.FirstOrDefault(y => y.InstanceId == x.Id);
@ -573,29 +573,10 @@ namespace IRaCIS.Core.Application.Services
});
item.InstanceInfoList.OrderBy(x => x.ShowOrder).ThenBy(x => x.RowIndex).ToList();
item.InstancePathList = tempInstanceList.OrderBy(x => x.ShowOrder).ThenBy(x => x.RowIndex).SelectMany(u =>
{
if (u.NumberOfFrames > 1)
{
var pathList = new List<string>();
for (int i = 1; i <= u.NumberOfFrames; i++)
{
pathList.Add(u.Path + "?frame=" + (i - 1));
}
return pathList;
}
else
{
return new List<string> { u.Path };
}
})
.ToList();
item.InstanceCount = item.InstanceList.Count;
item.InstanceCount = item.InstanceInfoList.Count;
item.Description = "Key Series";
@ -654,33 +635,16 @@ namespace IRaCIS.Core.Application.Services
t.SeriesList.ForEach(series =>
{
series.InstanceList = instanceList.Where(t => t.SeriesId == series.Id).OrderBy(t => t.InstanceNumber).Select(k => k.Id).ToList();
series.InstanceInfoList = instanceList.Where(t => t.SeriesId == series.Id).OrderBy(t => t.InstanceNumber).Select(k =>
new InstanceBasicInfo()
{
Id = k.Id,
NumberOfFrames = k.NumberOfFrames,
HtmlPath = k.HtmlPath,
Path = k.Path,
InstanceNumber = k.InstanceNumber,
series.InstanceHtmlPathList = instanceList.Where(t => t.SeriesId == series.Id && t.HtmlPath != string.Empty).OrderBy(t => t.InstanceNumber).Select(k => k.HtmlPath).ToList();
//处理多帧
series.InstancePathList = instanceList.Where(s => s.SeriesId == series.Id).OrderBy(t => t.InstanceNumber)
.SelectMany(u =>
{
if (u.NumberOfFrames > 1)
{
var pathList = new List<string>();
for (int i = 1; i <= u.NumberOfFrames; i++)
{
pathList.Add(u.Path + "?frame=" + (i - 1));
}
return pathList;
}
else
{
return new List<string> { u.Path };
}
})
.ToList();
}).ToList();
series.WindowWidth = instanceList.FirstOrDefault()!.WindowWidth;
series.WindowCenter = instanceList.FirstOrDefault()!.WindowCenter;
@ -688,7 +652,7 @@ namespace IRaCIS.Core.Application.Services
//设置为阅片与否 不更改数据库检查 的instance数量 和 SeriesCount 所以这里要实时统计
t.SeriesCount = t.SeriesList.Count;
t.InstanceCount = t.SeriesList.SelectMany(t => t.InstanceList).Count();
t.InstanceCount = t.SeriesList.SelectMany(t => t.InstanceInfoList).Count();
}