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

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

Uat_Study
hang 2023-09-22 15:22:35 +08:00
parent 72b2047862 8b124e1c60
commit 79375f7106
2 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,6 +3,7 @@ using MassTransit;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
@ -2276,6 +2277,42 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
//public List<TableQuestionDataInfo> TableQuestions { get; set; }
public List<GetSystemReadingQuestionOutDto> Childrens { get; set; }
[NotMapped]
public List<string> RelevanceValueList
{
get
{
try
{
return this.RelevanceValue.Split(',').ToList();
}
catch (Exception)
{
return new List<string>();
}
}
}
[NotMapped]
public List<string> ParentTriggerValueList
{
get
{
try
{
return this.ParentTriggerValue.Split(',').ToList();
}
catch (Exception)
{
return new List<string>();
}
}
}
}
public class GetTrialReadingQuestionOutDto

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

@ -419,12 +419,20 @@ namespace IRaCIS.Core.Application.Services
item.InstanceCount = item.InstanceList.Count();
item.Description = "Key Series";
var modalityList = await _repository.Where<DicomSeries>(s => thisSeriesIdIds.Contains(s.Id)).OrderBy(s => s.SeriesNumber).
ThenBy(s => s.SeriesTime).Select(x => x.Modality).Distinct().ToListAsync(); ;
item.Modality = string.Join(",", modalityList);
thisVisitTaskStudy.SeriesList.Add(item);
thisVisitTaskStudy.SeriesCount = thisVisitTaskStudy.SeriesList.Count();
}
result.Add(thisVisitTaskStudy);
}