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

Merge branch 'Test_IRC_Net8' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test_IRC_Net8
continuous-integration/drone/push Build is passing Details

IRC_NewDev
hang 2024-09-04 11:04:40 +08:00
parent f4426dd280 457544adc3
commit 3d304961d3
5 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,6 +81,8 @@ namespace IRaCIS.Core.Application.Contracts.Dicom.DTO
public Guid? StudyId { get; set; } public Guid? StudyId { get; set; }
public List<int?> KeyFramesList{ get; set; }=new List<int?> { };
public Guid? SeriesId { get; set; } public Guid? SeriesId { get; set; }
[JsonIgnore] [JsonIgnore]

2
IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs
View File

@ -365,6 +365,8 @@ namespace IRaCIS.Core.Application.Contracts.DTO
public Guid StudyId { get; set; } public Guid StudyId { get; set; }
public Guid SubjectVisitId { get; set; }
public int StudyStatus { get; set; } public int StudyStatus { get; set; }
public string StudyCode { get; set; } = string.Empty; public string StudyCode { get; set; } = string.Empty;

2
IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
View File

@ -216,7 +216,7 @@ namespace IRaCIS.Application.Services
var query = _readingClinicalDataRepository.AsQueryable(); var query = _readingClinicalDataRepository.AsQueryable();
if (inDto.StudyId != null) if (inDto.StudyId != null)
{ {
query = query.Where(x => x.StudyId == inDto.StudyId.Value && x.TrialId == inDto.TrialId && x.SubjectId == inDto.SubjectId); query = query.Where(x => x.StudyId == inDto.StudyId.Value && x.ReadingId == inDto.SubjectVisitId);
} }
else else
{ {

9
IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs
View File

@ -172,11 +172,14 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
{ {
public Guid SubjectVisitId { get; set; } public Guid SubjectVisitId { get; set; }
public Guid TrialId { get; set; } public Guid TrialId { get; set; }
public Guid SubjectId { get; set; } //public Guid TrialId { get; set; }
public bool IsBaseline { get; set; } public Guid SubjectId { get; set; }
public bool IsBaseline { get; set; }
public Guid? StudyId { get; set; } public Guid? StudyId { get; set; }

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

@ -586,7 +586,7 @@ namespace IRaCIS.Core.Application.Services
var markInstanceIdList = rowInfoList.Where(y => y.InstanceId != null).OrderBy(x => x.ShowOrder).ThenBy(x => x.RowIndex).Select(y => y.InstanceId!.Value).Distinct().ToList(); var markInstanceIdList = rowInfoList.Where(y => y.InstanceId != null).OrderBy(x => x.ShowOrder).ThenBy(x => x.RowIndex).Select(y => y.InstanceId!.Value).Distinct().ToList();
item.InstanceInfoList = await _dicomInstanceRepository.Where(t => markInstanceIdList.Contains(t.Id)).OrderBy(t => t.InstanceNumber).Select(k => item.InstanceInfoList = await _dicomInstanceRepository.Where(t => markInstanceIdList.Contains(t.Id)).Select(k =>
new InstanceBasicInfo() new InstanceBasicInfo()
{ {
Id = k.Id, Id = k.Id,
@ -601,6 +601,7 @@ namespace IRaCIS.Core.Application.Services
item.InstanceInfoList.ForEach(x => item.InstanceInfoList.ForEach(x =>
{ {
x.KeyFramesList = rowInfoList.Where(y => y.InstanceId == x.Id).Select(y => y.NumberOfFrames).Distinct().ToList();
var item = rowInfoList.FirstOrDefault(y => y.InstanceId == x.Id); var item = rowInfoList.FirstOrDefault(y => y.InstanceId == x.Id);
if (item != null) if (item != null)
{ {