修改一版
he
parent
b0f0925377
commit
45d5a64cdf
|
|
@ -2476,12 +2476,22 @@
|
|||
<member name="T:IRaCIS.Core.Application.Contracts.PreviousOtherQuery">
|
||||
<summary>PreviousOtherQuery 列表查询参数模型</summary>
|
||||
</member>
|
||||
<member name="P:IRaCIS.Core.Application.Contracts.PreviousOtherAddOrEdit.ClinicalDataTrialSetId">
|
||||
<summary>
|
||||
临床数据类型Id
|
||||
</summary>
|
||||
</member>
|
||||
<member name="T:IRaCIS.Core.Application.Contracts.PreviousSurgeryView">
|
||||
<summary> PreviousSurgeryView 列表视图模型 </summary>
|
||||
</member>
|
||||
<member name="T:IRaCIS.Core.Application.Contracts.PreviousSurgeryQuery">
|
||||
<summary>PreviousSurgeryQuery 列表查询参数模型</summary>
|
||||
</member>
|
||||
<member name="P:IRaCIS.Core.Application.Contracts.PreviousSurgeryAddOrEdit.ClinicalDataTrialSetId">
|
||||
<summary>
|
||||
临床数据类型Id
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:IRaCIS.Core.Application.Contracts.PreviousPDFView.IsVisist">
|
||||
<summary>
|
||||
是否是访视
|
||||
|
|
|
|||
|
|
@ -69,6 +69,8 @@ namespace IRaCIS.Core.Application.Contracts
|
|||
|
||||
public Guid CreateUserId { get; set; }
|
||||
|
||||
public Guid ClinicalDataTrialSetId { get; set; }
|
||||
|
||||
public string FullFilePath => Path;
|
||||
|
||||
|
||||
|
|
@ -97,6 +99,8 @@ namespace IRaCIS.Core.Application.Contracts
|
|||
public string Path { get; set; } = String.Empty;
|
||||
public string FileName { get; set; } = String.Empty;
|
||||
public string Position { get; set; } = String.Empty;
|
||||
|
||||
public Guid ClinicalDataTrialSetId { get; set; }
|
||||
//public Guid SubjectId { get; set; }
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -24,6 +24,8 @@ namespace IRaCIS.Core.Application.Contracts
|
|||
//public Guid SubjectId { get; set; }
|
||||
public Guid CreateUserId { get; set; }
|
||||
|
||||
public Guid ClinicalDataTrialSetId { get; set; }
|
||||
|
||||
public string FullFilePath => Path;
|
||||
}
|
||||
|
||||
|
|
@ -48,6 +50,12 @@ namespace IRaCIS.Core.Application.Contracts
|
|||
public string Path { get; set; }=String.Empty;
|
||||
public string FileName { get; set; } = String.Empty;
|
||||
public string TreatmentType { get; set; } = String.Empty;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 临床数据类型Id
|
||||
/// </summary>
|
||||
public Guid ClinicalDataTrialSetId { get; set; }
|
||||
//public Guid SubjectId { get; set; }
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -22,6 +22,8 @@ namespace IRaCIS.Core.Application.Contracts
|
|||
//public Guid SubjectId { get; set; }
|
||||
public Guid CreateUserId { get; set; }
|
||||
|
||||
public Guid ClinicalDataTrialSetId { get; set; }
|
||||
|
||||
public string FullFilePath => Path;
|
||||
}
|
||||
|
||||
|
|
@ -43,6 +45,12 @@ namespace IRaCIS.Core.Application.Contracts
|
|||
public string Path { get; set; } = String.Empty;
|
||||
public string FileName { get; set; } = String.Empty;
|
||||
public string OperationName { get; set; } = string.Empty;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 临床数据类型Id
|
||||
/// </summary>
|
||||
public Guid ClinicalDataTrialSetId { get; set; }
|
||||
//public Guid SubjectId { get; set; }
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
using IRaCIS.Core.Domain.Share;
|
||||
using IRaCIS.Core.Application.Contracts;
|
||||
using IRaCIS.Core.Domain.Share;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
|
|
@ -72,6 +73,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
|||
/// </summary>
|
||||
public string ClinicalDataSetName { get; set; }
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 上传方式
|
||||
/// </summary>
|
||||
public ClinicalUploadType ClinicalUploadType { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 模板文件名称
|
||||
/// </summary>
|
||||
|
|
@ -83,6 +90,20 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
|||
public string Path { get; set; }
|
||||
|
||||
public List<GetReadingClinicalDataListOutDto> ReadingClinicalDataList { get; set; }
|
||||
|
||||
public ClinicalDataTable ClinicalTableData { get; set; }
|
||||
}
|
||||
|
||||
|
||||
public class ClinicalDataTable
|
||||
{
|
||||
public List<PreviousHistoryView> PreviousHistoryList { get; set; }
|
||||
|
||||
public List<PreviousOtherView> PreviousOtherList { get; set; }
|
||||
|
||||
public List<PreviousSurgeryView> PreviousSurgeryList{ get; set; }
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -28,12 +28,18 @@ namespace IRaCIS.Application.Services
|
|||
|
||||
private readonly IRepository<PreviousPDF> _previousPDFRepository;
|
||||
private readonly IRepository<SubjectVisit> _subjectVisitRepository;
|
||||
private readonly IRepository<PreviousHistory> _previousHistoryRepository;
|
||||
private readonly IRepository<PreviousOther> _previousOtherRepository;
|
||||
private readonly IRepository<PreviousSurgery> _previousSurgeryRepository;
|
||||
private readonly IRepository<ReadingClinicalDataPDF> _readingClinicalDataPDFRepository;
|
||||
|
||||
public ReadingClinicalDataService(IRepository<ReadingClinicalData> readingClinicalDataRepository,
|
||||
IRepository<ClinicalDataTrialSet> clinicalDataTrialSetRepository,
|
||||
IRepository<PreviousPDF> previousPDFRepository,
|
||||
IRepository<SubjectVisit> subjectVisitRepository,
|
||||
IRepository<SubjectVisit> subjectVisitRepository,
|
||||
IRepository<PreviousHistory> previousHistoryRepository,
|
||||
IRepository<PreviousOther> previousOtherRepository,
|
||||
IRepository<PreviousSurgery> previousSurgeryRepository,
|
||||
IRepository<ReadingClinicalDataPDF> readingClinicalDataPDFRepository
|
||||
)
|
||||
{
|
||||
|
|
@ -41,6 +47,9 @@ namespace IRaCIS.Application.Services
|
|||
this._clinicalDataTrialSetRepository = clinicalDataTrialSetRepository;
|
||||
this._previousPDFRepository = previousPDFRepository;
|
||||
this._subjectVisitRepository = subjectVisitRepository;
|
||||
this._previousHistoryRepository = previousHistoryRepository;
|
||||
this._previousOtherRepository = previousOtherRepository;
|
||||
this._previousSurgeryRepository = previousSurgeryRepository;
|
||||
this._readingClinicalDataPDFRepository = readingClinicalDataPDFRepository;
|
||||
}
|
||||
|
||||
|
|
@ -124,6 +133,7 @@ namespace IRaCIS.Application.Services
|
|||
.Select(x => new GetCRCClinicalDataOutDto()
|
||||
{
|
||||
ClinicalDataSetName = x.ClinicalDataSetName,
|
||||
ClinicalUploadType=x.ClinicalUploadType,
|
||||
ClinicalDataTrialSetId = x.Id,
|
||||
FileName=x.FileName,
|
||||
Path=x.Path,
|
||||
|
|
@ -138,10 +148,23 @@ namespace IRaCIS.Application.Services
|
|||
|
||||
});
|
||||
|
||||
cRCClinicalDataList.ForEach(x =>
|
||||
var previousHistoryList = await _previousHistoryRepository.Where(x => x.SubjectVisitId == inDto.SubjectVisitId).ProjectTo<PreviousHistoryView>(_mapper.ConfigurationProvider).ToListAsync();
|
||||
var previousOtherList = await _previousOtherRepository.Where(x => x.SubjectVisitId == inDto.SubjectVisitId).ProjectTo<PreviousOtherView>(_mapper.ConfigurationProvider).ToListAsync();
|
||||
var previousSurgeryList = await _previousSurgeryRepository.Where(x => x.SubjectVisitId == inDto.SubjectVisitId).ProjectTo<PreviousSurgeryView>(_mapper.ConfigurationProvider).ToListAsync();
|
||||
|
||||
foreach (var item in cRCClinicalDataList)
|
||||
{
|
||||
x.ReadingClinicalDataList = clinicalData.CurrentPageData.Where(y => y.ClinicalDataTrialSetId == x.ClinicalDataTrialSetId).ToList();
|
||||
});
|
||||
item.ReadingClinicalDataList = clinicalData.CurrentPageData.Where(y => y.ClinicalDataTrialSetId == item.ClinicalDataTrialSetId).ToList();
|
||||
item.ClinicalTableData = new ClinicalDataTable()
|
||||
{
|
||||
PreviousHistoryList = previousHistoryList.Where(x => x.ClinicalDataTrialSetId == item.ClinicalDataTrialSetId).ToList(),
|
||||
PreviousOtherList = previousOtherList.Where(x => x.ClinicalDataTrialSetId == item.ClinicalDataTrialSetId).ToList(),
|
||||
PreviousSurgeryList = previousSurgeryList.Where(x => x.ClinicalDataTrialSetId == item.ClinicalDataTrialSetId).ToList(),
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
return cRCClinicalDataList;
|
||||
|
|
|
|||
|
|
@ -80,6 +80,13 @@ namespace IRaCIS.Core.Domain.Models
|
|||
public string Position { get; set; } = String.Empty;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 临床数据类型Id
|
||||
/// </summary>
|
||||
[Required]
|
||||
public Guid ClinicalDataTrialSetId { get; set; }
|
||||
|
||||
|
||||
//[Required]
|
||||
//public Guid SubjectId { get; set; }
|
||||
}
|
||||
|
|
|
|||
|
|
@ -81,6 +81,12 @@ namespace IRaCIS.Core.Domain.Models
|
|||
[Required]
|
||||
public string TreatmentType { get; set; } = String.Empty;
|
||||
|
||||
/// <summary>
|
||||
/// 临床数据类型Id
|
||||
/// </summary>
|
||||
[Required]
|
||||
public Guid ClinicalDataTrialSetId { get; set; }
|
||||
|
||||
|
||||
//public Guid SubjectId { get; set; }
|
||||
|
||||
|
|
|
|||
|
|
@ -71,6 +71,12 @@ namespace IRaCIS.Core.Domain.Models
|
|||
public string OperationName { get; set; } = String.Empty;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 临床数据类型Id
|
||||
/// </summary>
|
||||
[Required]
|
||||
public Guid ClinicalDataTrialSetId { get; set; }
|
||||
|
||||
|
||||
//[Required]
|
||||
//public Guid SubjectId { get; set; }
|
||||
|
|
|
|||
Loading…
Reference in New Issue