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

修改一致性分析 下载影像bug
continuous-integration/drone/push Build is passing Details

IRC_NewDev
hang 2024-09-10 18:46:00 +08:00
parent f7dd5117a0
commit 405454f71f
4 changed files with 9 additions and 36 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

@ -556,6 +556,6 @@ namespace IRaCIS.Core.Application.Contracts
{ {
public Guid SubjectVisitId { get; set; } public Guid SubjectVisitId { get; set; }
public Guid VisitTaskId { get; set; } public Guid TaskId { get; set; }
} }
} }

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

@ -823,10 +823,16 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
var isQueryDicom = inQuery.DicomStudyIdList.Count > 0; var isQueryDicom = inQuery.DicomStudyIdList.Count > 0;
var isQueryNoneDicom = inQuery.NoneDicomStudyIdList.Count > 0; var isQueryNoneDicom = inQuery.NoneDicomStudyIdList.Count > 0;
var taskIdList = inQuery.SubjectVisitTaskList.Select(t => t.TaskId).ToList();
var subjectVisitIdList = inQuery.SubjectVisitTaskList.Select(t => t.SubjectVisitId).ToList(); var subjectVisitIdList = inQuery.SubjectVisitTaskList.Select(t => t.SubjectVisitId).ToList();
//var a = _visitTaskRepository.Where(t => t.TrialReadingCriterionId == inQuery.TrialReadingCriterionId && t.DoctorUserId == _userInfo.Id);
var query = from sv in _subjectRepository.Where(t => t.Id == inQuery.SubjectId).SelectMany(t => t.SubjectVisitList.Where(t => subjectVisitIdList.Contains(t.Id))) var query = from sv in _subjectRepository.Where(t => t.Id == inQuery.SubjectId).SelectMany(t => t.SubjectVisitList.Where(t => subjectVisitIdList.Contains(t.Id)))
join visitTask in _visitTaskRepository.Where(t => t.TaskState == TaskState.Effect && t.DoctorUserId == _userInfo.Id && t.TrialReadingCriterionId == inQuery.TrialReadingCriterionId) //一致性分析，导致查询出来两条数据
join visitTask in _visitTaskRepository.Where(t=> taskIdList.Contains(t.Id)) /*.Where(t => t.TaskState == TaskState.Effect && t.DoctorUserId == _userInfo.Id && t.TrialReadingCriterionId == inQuery.TrialReadingCriterionId)*/
on sv.Id equals visitTask.SourceSubjectVisitId on sv.Id equals visitTask.SourceSubjectVisitId
select new select new
{ {

33
IRaCIS.Core.Infra.EFCore/EntityConfigration/DoctorConfigration.cs
View File

@ -1,33 +0,0 @@
using IRaCIS.Core.Domain.Models;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata;
using Microsoft.EntityFrameworkCore.Metadata.Builders;
using System.Reflection.Emit;
namespace IRaCIS.Core.Infra.EFCore.EntityConfigration
{
public class DoctorConfigration : IEntityTypeConfiguration<DoctorDictionary>
{
public void Configure(EntityTypeBuilder<DoctorDictionary> builder)
{
builder
.HasOne(dd => dd.Doctor)
.WithMany(p => p.DoctorDicRelationList)
.HasForeignKey(dd => dd.DoctorId);
builder
.HasOne(dd => dd.Dictionary)
.WithMany(d => d.DoctorDicRelationList)
.HasForeignKey(dd => dd.DictionaryId);
}
}
}

2
IRaCIS.Core.Infra.EFCore/EntityConfigration/ReadModuleConfigration.cs
View File

@ -12,7 +12,7 @@ namespace IRaCIS.Core.Infra.EFCore.EntityConfigration
public void Configure(EntityTypeBuilder<ReadModule> builder) public void Configure(EntityTypeBuilder<ReadModule> builder)
{ {
builder.HasOne(t => t.SubjectVisit).WithMany(t => t.ReadModuleList); builder.HasOne(t => t.SubjectVisit).WithMany(t => t.ReadModuleList).HasForeignKey(t=>t.SubjectVisitId);
} }
} }
} }