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

Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8
continuous-integration/drone/push Build is passing Details

Test_IRC_Net8
he 2025-11-26 11:37:05 +08:00
parent 0030eac22e 671c071a45
commit 43455da7bc
6 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1005,6 +1005,8 @@ namespace IRaCIS.Core.Application.Contracts
public string VisitName { get; set; } public string VisitName { get; set; }
public Guid SourceSubjectVisitId { get; set; }
public List<DicomStudyBasicInfo> DicomStudyList { get; set; } = new List<DicomStudyBasicInfo>(); public List<DicomStudyBasicInfo> DicomStudyList { get; set; } = new List<DicomStudyBasicInfo>();

13
IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
View File

@ -159,7 +159,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
if (inQuery.IsImageSegmentLabel == true) if (inQuery.IsImageSegmentLabel == true)
{ {
var querySV = _subjectVisitRepository.Where(t => t.Id == inQuery.SubjectVisitId) var querySV = _subjectVisitRepository.WhereIf(inQuery.SubjectVisitId != null, t => t.Id == inQuery.SubjectVisitId)
.WhereIf(inQuery.SubjectId != null, t => t.SubjectId == inQuery.SubjectId) .WhereIf(inQuery.SubjectId != null, t => t.SubjectId == inQuery.SubjectId)
.Select(u => new SubjectVisitMarkUploadDto() .Select(u => new SubjectVisitMarkUploadDto()
{ {
@ -1248,6 +1248,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
var dicomStudyList = list.Where(item => item.DicomStudyList.Count > 0) var dicomStudyList = list.Where(item => item.DicomStudyList.Count > 0)
.Select(item => new SubjectVisitMarkStudyDto .Select(item => new SubjectVisitMarkStudyDto
{ {
SourceSubjectVisitId=item.SourceSubjectVisitId,
VisitTaskId = item.VisitTaskId, VisitTaskId = item.VisitTaskId,
SubjectId = item.SubjectId, SubjectId = item.SubjectId,
SubjectCode = item.SubjectCode, SubjectCode = item.SubjectCode,
@ -1260,6 +1261,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
var noneStudyList = list.Where(item => item.NoneDicomStudyList.Count > 0) var noneStudyList = list.Where(item => item.NoneDicomStudyList.Count > 0)
.Select(item => new SubjectVisitMarkStudyDto .Select(item => new SubjectVisitMarkStudyDto
{ {
SourceSubjectVisitId = item.SourceSubjectVisitId,
VisitTaskId = item.VisitTaskId, VisitTaskId = item.VisitTaskId,
SubjectId = item.SubjectId, SubjectId = item.SubjectId,
SubjectCode = item.SubjectCode, SubjectCode = item.SubjectCode,
@ -1433,7 +1435,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
var dirInfolist = _subjectRepository.Where(t => t.Id == inQuery.SubjectId).SelectMany(t => t.SubjectVisitList.Where(t => subjectVisitIdList.Contains(t.Id))).SelectMany(t => t.StudyList) var dirInfolist = _subjectRepository.Where(t => t.Id == inQuery.SubjectId).SelectMany(t => t.SubjectVisitList.Where(t => subjectVisitIdList.Contains(t.Id))).SelectMany(t => t.StudyList)
.Where(t => isQueryDicom ? inQuery.DicomStudyIdList.Contains(t.Id) : false) .Where(t => isQueryDicom ? inQuery.DicomStudyIdList.Contains(t.Id) : false)
.Where(t => info.IsImageFilter ? ("|" + info.CriterionModalitys + "|").Contains("|" + t.ModalityForEdit + "|") : true) .Where(t => info.IsImageFilter ? ("|" + info.CriterionModalitys + "|").Contains("|" + t.ModalityForEdit + "|") : true)
.Where(t => inQuery.IsImageSegmentLabel == true ? t.ModalityForEdit == "XA" : true) .Where(t => inQuery.IsImageSegmentLabel == false ? t.ModalityForEdit == "XA" : true)
.SelectMany(t => t.InstanceList.Where(t => t.IsReading && t.DicomSerie.IsReading)) .SelectMany(t => t.InstanceList.Where(t => t.IsReading && t.DicomSerie.IsReading))
.Select(t => new StudyDIRInfo() .Select(t => new StudyDIRInfo()
{ {
@ -1540,6 +1542,11 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
from leftVisitTask in cc.DefaultIfEmpty() from leftVisitTask in cc.DefaultIfEmpty()
select new ImageDownloadDto() select new ImageDownloadDto()
{ {
TrialId=sv.TrialId,
SubjectId=sv.SubjectId,
TrialSiteCode=sv.TrialSite.TrialSiteCode,
VisitId=sv.Id,
SubjectCode = inQuery.SubjectCode, SubjectCode = inQuery.SubjectCode,
VisitName = sv.VisitName, VisitName = sv.VisitName,
TaskBlindName = leftVisitTask.TaskBlindName, TaskBlindName = leftVisitTask.TaskBlindName,
@ -1596,7 +1603,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
}).ToList() }).ToList()
, ,
NoneDicomStudyList = inQuery.IsImageSegmentLabel == null ? sv.NoneDicomStudyList.Where(t => isQueryNoneDicom ? inQuery.NoneDicomStudyIdList.Contains(t.Id) : false) NoneDicomStudyList = inQuery.IsImageSegmentLabel != false ? sv.NoneDicomStudyList.Where(t => isQueryNoneDicom ? inQuery.NoneDicomStudyIdList.Contains(t.Id) : false)
.Where(t => info.IsImageFilter ? ("|" + info.CriterionModalitys + "|").Contains("|" + t.Modality + "|") : true) .Where(t => info.IsImageFilter ? ("|" + info.CriterionModalitys + "|").Contains("|" + t.Modality + "|") : true)
.Where(t => t.IsReading) .Where(t => t.IsReading)
.Select(nd => new DownloadNoneDicomStudyDto() .Select(nd => new DownloadNoneDicomStudyDto()

1
IRaCIS.Core.Application/Service/ImageAndDoc/_MapConfig.cs
View File

@ -166,6 +166,7 @@ namespace IRaCIS.Core.Application.Service
CreateMap<SubjectVisit, SubjectVisitMarkStudyDto>() CreateMap<SubjectVisit, SubjectVisitMarkStudyDto>()
.ForMember(d => d.SourceSubjectVisitId, u => u.MapFrom(u => u.Id))
.ForMember(d => d.SubjectCode, u => u.MapFrom(u => u.Subject.Code)) .ForMember(d => d.SubjectCode, u => u.MapFrom(u => u.Subject.Code))
.ForMember(d => d.DicomStudyList, u => u.MapFrom(s => s.StudyList)) .ForMember(d => d.DicomStudyList, u => u.MapFrom(s => s.StudyList))
.ForMember(d => d.NoneDicomStudyList, u => u.MapFrom(s => s.NoneDicomStudyList.Where(t => t.IsReading))); .ForMember(d => d.NoneDicomStudyList, u => u.MapFrom(s => s.NoneDicomStudyList.Where(t => t.IsReading)));

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

@ -55,6 +55,8 @@ namespace IRaCIS.Core.Application.Contracts
public string Modality { get; set; } = string.Empty; public string Modality { get; set; } = string.Empty;
public DateTime ImageDate { get; set; } public DateTime ImageDate { get; set; }
public string ModifyReason { get; set; } public string ModifyReason { get; set; }
public string BodyPartForEditOther { get; set; }
} }
///<summary> NoneDicomStudyAddOrEdit 列表查询参数模型</summary> ///<summary> NoneDicomStudyAddOrEdit 列表查询参数模型</summary>

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

@ -21,6 +21,8 @@ namespace IRaCIS.Core.Application.Contracts.DTO
public string BodyPart { get; set; } = String.Empty; public string BodyPart { get; set; } = String.Empty;
public string ModifyReason { get; set; } public string ModifyReason { get; set; }
public string BodyPartForEditOther { get; set; }
} }

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

@ -224,7 +224,7 @@ namespace IRaCIS.Core.Application.Services
var isImageFilter = false; var isImageFilter = false;
var criterionModalitys = ""; var criterionModalitys = "";
if (visitTaskId != null) if (visitTaskId != null && visitTaskId != Guid.Empty)
{ {
var info = await _visitTaskRepository.Where(t => t.Id == visitTaskId) var info = await _visitTaskRepository.Where(t => t.Id == visitTaskId)
.Select(t => new { t.TrialReadingCriterion.IsImageFilter, t.TrialReadingCriterion.CriterionModalitys }).FirstNotNullAsync(); .Select(t => new { t.TrialReadingCriterion.IsImageFilter, t.TrialReadingCriterion.CriterionModalitys }).FirstNotNullAsync();