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

修改一版

Uat_Study
he 2022-06-27 18:05:33 +08:00
parent aa8bdf7865
commit 822a609682
5 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
IRaCIS.Core.Application/Service/QC/QCListService.cs
View File

@ -10,14 +10,17 @@ namespace IRaCIS.Core.Application.Image.QA
public class QCListService : BaseService, IQCListService
{
private readonly IRepository<SubjectVisit> _subjectVisitRepository;
private readonly IRepository<ConsistencyCheckFile> _consistencyCheckFileRepository;
public QCListService(
IRepository<SubjectVisit> subjectVisitRepository,
IRepository<ConsistencyCheckFile> consistencyCheckFileRepository
)
{
_subjectVisitRepository = subjectVisitRepository;
this._consistencyCheckFileRepository = consistencyCheckFileRepository;
}
@ -407,6 +410,10 @@ namespace IRaCIS.Core.Application.Image.QA
var defalutSortArray = new string[] { nameof(SubjectVisit.IsUrgent) + " desc", nameof(SubjectVisit.SubjectId), nameof(SubjectVisit.VisitNum) };
var pageList = await query.ToPagedListAsync(visitSearchDTO.PageIndex, visitSearchDTO.PageSize, visitSearchDTO.SortField, visitSearchDTO.Asc, string.IsNullOrWhiteSpace(visitSearchDTO.SortField), defalutSortArray);
var config = await _repository.Where<Trial>(t => t.Id == visitSearchDTO.TrialId).ProjectTo<TrialSubjectAndSVConfig>(_mapper.ConfigurationProvider).FirstOrDefaultAsync().IfNullThrowException();
return (pageList, config);

4
IRaCIS.Core.Application/Service/QC/_MapConfig.cs
View File

@ -117,7 +117,7 @@ namespace IRaCIS.Core.Application.Service
.ForMember(d => d.CurrentActionUserName, u => u.MapFrom(s => s.CurrentActionUser.UserName))
.ForMember(d => d.PreliminaryAuditUserName, u => u.MapFrom(s => s.PreliminaryAuditUser.UserName))
.ForMember(d => d.ReviewAuditUserName, u => u.MapFrom(s => s.ReviewAuditUser.UserName))
.ForMember(d => d.IsHaveClinicalData, u => u.MapFrom(t => t.IsBaseLine ? t.PreviousHistoryList.Any() || t.PreviousOtherList.Any() || t.PreviousPDFList.Any() || t.PreviousSurgeryList.Any() : false))
.ForMember(d => d.IsHaveClinicalData, u => u.MapFrom(t => t.IsBaseLine ? t.PreviousHistoryList.Any() || t.PreviousOtherList.Any() || t.ReadingClinicalDataList.Any(x=>x.ClinicalDataTrialSet.UploadRole==Domain.Share.UploadRole.CRC&&x.ReadingClinicalDataPDFList.Count()>0) || t.PreviousSurgeryList.Any() : false))
.ForMember(d => d.DicomStudyCount, u => u.MapFrom(t => t.StudyList.Count()))
.ForMember(d => d.NoneDicomStudyCount, u => u.MapFrom(t => t.NoneDicomStudyList.Count(t => t.NoneDicomFileList.Any())));
@ -133,7 +133,7 @@ namespace IRaCIS.Core.Application.Service
.ForMember(d => d.MedicalNo, u => u.MapFrom(s => s.Subject.MedicalNo))
.ForMember(d => d.Sex, u => u.MapFrom(s => s.Subject.Sex))
.ForMember(d => d.Age, u => u.MapFrom(t => t.Subject.Age))
.ForMember(d => d.IsHaveClinicalData, u => u.MapFrom(t => t.IsBaseLine ? t.PreviousHistoryList.Any() || t.PreviousOtherList.Any() || t.PreviousPDFList.Any() || t.PreviousSurgeryList.Any() : false))
.ForMember(d => d.IsHaveClinicalData, u => u.MapFrom(t => t.IsBaseLine ? t.PreviousHistoryList.Any() || t.PreviousOtherList.Any() || t.ReadingClinicalDataList.Any(x => x.ClinicalDataTrialSet.UploadRole == Domain.Share.UploadRole.CRC && x.ReadingClinicalDataPDFList.Count() > 0) || t.PreviousSurgeryList.Any() : false))
//.ForMember(d => d.VisitName, u => u.MapFrom(t =>t.InPlan? t.VisitStage.VisitName : t.VisitName))
//.ForMember(d => d.VisitNum, u => u.MapFrom(t => t.InPlan ? t.VisitStage.VisitNum : t.VisitNum))

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

@ -165,7 +165,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
[Required(ErrorMessage = "ReadingId为null")]
public Guid ReadingId { get; set; }
public UploadRole UploadRole { get; set; }
public UploadRole? UploadRole { get; set; }
}
public class GetReadingClinicalDataPDFListIndto:PageInput

11
IRaCIS.Core.Domain/Reading/ReadingClinicalData.cs
View File

@ -20,7 +20,7 @@ namespace IRaCIS.Core.Domain.Models
public Guid TrialId { get; set; }
/// <summary>
/// 阅片ID
/// 阅片或者受试者ID
/// </summary>
public Guid ReadingId { get; set; }
@ -69,6 +69,15 @@ namespace IRaCIS.Core.Domain.Models
public ClinicalDataTrialSet ClinicalDataTrialSet { get; set; }
[ForeignKey("ReadingId")]
public SubjectVisit SubjectVisit { get; set; }
[ForeignKey("ReadingId")]
public ReadModule ReadModule { get; set; }
/// <summary>
/// PDF文件
/// </summary>

2
IRaCIS.Core.Domain/Visit/SubjectVisit.cs
View File

@ -195,6 +195,8 @@ namespace IRaCIS.Core.Domain.Models
public List<PreviousPDF> PreviousPDFList { get; set; }
public List<ReadingClinicalData> ReadingClinicalDataList { get; set; }
public List<CheckChallengeDialog> CheckChallengeDialogList { get; set; } = new List<CheckChallengeDialog>();
public List<DicomStudy> StudyList { get; set; } = new List<DicomStudy>();