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

修改site关联

Browse Source
This commit is contained in:
hang
2024-06-03 14:37:38 +08:00
parent 4db3860ade
commit 0e23719c7b
101 changed files with 354 additions and 3290 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Application/Service/Third-partyProject/DTO/UltrasonicDicomViewModel.cs
+3 -2
View File
@@ -23,7 +23,7 @@ namespace IRaCIS.Core.Application.Service.Third_partyProject.DTO
[NotDefault]
public Guid TrialId { get; set; }
public Guid? SiteId { get; set; }
public Guid? TrialSiteId { get; set; }
public Guid? SubjectId { get; set; }
@@ -51,7 +51,8 @@ namespace IRaCIS.Core.Application.Service.Third_partyProject.DTO
public Guid Id { get;set; }
public Guid SubjectId { get; set; }
public Guid SiteId { get; set; }
public Guid TrialSiteId { get; set; }
public Guid? SubjectVisitId { get; set; }
public String TrialSiteCode { get; set; } = String.Empty;
IRaCIS.Core.Application/Service/Third-partyProject/UltrasonicDicomService.cs
+4 -9
View File
@@ -86,7 +86,7 @@ namespace IRaCIS.Core.Application.Service.Third_partyProject
{
var visitTaskQueryable = _visitTaskRepository.Where(t => t.TrialId == queryVisitTask.TrialId && t.IsAnalysisCreate == false && t.TaskState == TaskState.Effect &&t.TaskAllocationState==TaskAllocationState.Allocated && t.SourceSubjectVisitId != null)
.WhereIf(queryVisitTask.SiteId != null, t => t.Subject.SiteId == queryVisitTask.SiteId)
.WhereIf(queryVisitTask.TrialSiteId != null, t => t.Subject.TrialSiteId == queryVisitTask.TrialSiteId)
.WhereIf(queryVisitTask.SubjectId != null, t => t.SubjectId == queryVisitTask.SubjectId)
.WhereIf(queryVisitTask.IsUrgent != null, t => t.IsUrgent == queryVisitTask.IsUrgent)
.WhereIf(queryVisitTask.DoctorUserId != null, t => t.DoctorUserId == queryVisitTask.DoctorUserId)
@@ -116,7 +116,7 @@ namespace IRaCIS.Core.Application.Service.Third_partyProject
select new StudyDTO_UltrasonicDicom()
{
TrialId = dicomStudy.TrialId,
SiteId = dicomStudy.SiteId,
TrialSiteId = dicomStudy.Subject.TrialSiteId,
SubjectId = dicomStudy.SubjectId,
SubjectVisitId = dicomStudy.SubjectVisitId,
VisitName = dicomStudy.SubjectVisit.VisitName,
@@ -136,9 +136,9 @@ namespace IRaCIS.Core.Application.Service.Third_partyProject
StudyTime = dicomStudy.StudyTime,
TrialSiteAliasName = dicomStudy.TrialSite.TrialSiteAliasName,
TrialSiteAliasName = dicomStudy.Subject.TrialSite.TrialSiteAliasName,
TrialSiteCode = dicomStudy.TrialSite.TrialSiteCode,
TrialSiteCode = dicomStudy.Subject.TrialSite.TrialSiteCode,
Uploader = dicomStudy.Uploader.UserName,
@@ -255,7 +255,6 @@ namespace IRaCIS.Core.Application.Service.Third_partyProject
study.Id = IdentifierHelper.CreateGuid(incommand.Study.StudyInstanceUid, incommand.TrialId.ToString());
study.TrialId = incommand.TrialId;
study.SiteId = incommand.SiteId;
study.SubjectId = incommand.SubjectId;
study.SubjectVisitId = incommand.SubjectVisitId;
@@ -279,7 +278,6 @@ namespace IRaCIS.Core.Application.Service.Third_partyProject
series.StudyId = study.Id;
series.TrialId = incommand.TrialId;
series.SiteId = incommand.SiteId;
series.SubjectId = incommand.SubjectId;
series.SubjectVisitId = incommand.SubjectVisitId;
@@ -296,7 +294,6 @@ namespace IRaCIS.Core.Application.Service.Third_partyProject
isntance.SeriesId = series.Id;
isntance.TrialId = incommand.TrialId;
isntance.SiteId = incommand.SiteId;
isntance.SubjectId = incommand.SubjectId;
isntance.SubjectVisitId = incommand.SubjectVisitId;
@@ -340,7 +337,6 @@ namespace IRaCIS.Core.Application.Service.Third_partyProject
series.StudyId = study.Id;
series.TrialId = incommand.TrialId;
series.SiteId = incommand.SiteId;
series.SubjectId = incommand.SubjectId;
series.SubjectVisitId = incommand.SubjectVisitId;
@@ -364,7 +360,6 @@ namespace IRaCIS.Core.Application.Service.Third_partyProject
insntance.SeriesId = dicomSeries.Id;
insntance.TrialId = incommand.TrialId;
insntance.SiteId = incommand.SiteId;
insntance.SubjectId = incommand.SubjectId;
insntance.SubjectVisitId = incommand.SubjectVisitId;
IRaCIS.Core.Application/Service/Third-partyProject/_MapConfig.cs
+1 -1
View File
@@ -18,7 +18,7 @@ namespace IRaCIS.Core.Application.Service
CreateMap<VisitTask, VisitTaskDTO_UltrasonicDicom>()
.ForMember(o => o.SubjectVisitId, t => t.MapFrom(u => u.SourceSubjectVisitId))
.ForMember(o => o.SiteId, t => t.MapFrom(u => u.Subject.SiteId))
.ForMember(o => o.TrialSiteId, t => t.MapFrom(u => u.Subject.TrialSiteId))
.ForMember(o => o.TrialSiteCode, t => t.MapFrom(u => u.Subject.TrialSite.TrialSiteCode))
.ForMember(o => o.SubjectCode, t => t.MapFrom(u => u.Subject.Code))
.ForMember(o => o.UserName, t => t.MapFrom(u => u.DoctorUser.UserName))