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

S-40

Uat_Study
he 2023-07-11 11:49:48 +08:00
parent 2fcb2493d1
commit a6fcf3421c
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
View File

@ -691,6 +691,7 @@ namespace IRaCIS.Application.Services
var setIds = moduleCriterionFromList.Select(x=>x.ClinicalDataTrialSetId).Distinct().ToList(); var setIds = moduleCriterionFromList.Select(x=>x.ClinicalDataTrialSetId).Distinct().ToList();
var clinicalresult = await _clinicalDataTrialSetRepository.Where(x => x.UploadRole == UploadRole.CRC && (x.ClinicalDataLevel == ClinicalLevel.OncologyRead || x.ClinicalDataLevel == ClinicalLevel.ImageRead)) var clinicalresult = await _clinicalDataTrialSetRepository.Where(x => x.UploadRole == UploadRole.CRC && (x.ClinicalDataLevel == ClinicalLevel.OncologyRead || x.ClinicalDataLevel == ClinicalLevel.ImageRead))
.Where(x => setIds.Contains(x.Id)) .Where(x => setIds.Contains(x.Id))
.Select(x => new GetReadingClinicalDataListOutDto() .Select(x => new GetReadingClinicalDataListOutDto()
{ {
@ -794,6 +795,7 @@ namespace IRaCIS.Application.Services
{ {
var resultQuery = _readingClinicalDataRepository.Where(x => x.SubjectId == inDto.SubjectId) var resultQuery = _readingClinicalDataRepository.Where(x => x.SubjectId == inDto.SubjectId)
.Where(x => x.ReadingId == inDto.ReadingId) .Where(x => x.ReadingId == inDto.ReadingId)
.WhereIf(inDto.ClinicalDataTrialSetId!=null, x=>x.ClinicalDataTrialSetId==inDto.TrialReadingCriterionId)
.Where(x => x.ClinicalDataTrialSet.TrialClinicalDataSetCriteriaList.Any(t=>t.TrialReadingCriterionId==inDto.TrialReadingCriterionId)) .Where(x => x.ClinicalDataTrialSet.TrialClinicalDataSetCriteriaList.Any(t=>t.TrialReadingCriterionId==inDto.TrialReadingCriterionId))
.Select(x => new GetReadingClinicalDataListOutDto() .Select(x => new GetReadingClinicalDataListOutDto()
{ {
@ -831,7 +833,10 @@ namespace IRaCIS.Application.Services
.FirstOrDefaultAsync(); .FirstOrDefaultAsync();
if (readModule != null) if (readModule != null)
{ {
var moduleCriterionFromList = await _readModuleCriterionFromRepository.Where(x => x.ReadModuleId == readModule.Id).Select(x => new { var moduleCriterionFromList = await _readModuleCriterionFromRepository.Where(x => x.ReadModuleId == readModule.Id)
.WhereIf(inDto.ClinicalDataTrialSetId != null, x => x.ClinicalForm.ClinicalDataTrialSetId == inDto.TrialReadingCriterionId)
.Select(x => new {
ClinicalFormId = x.ClinicalFormId, ClinicalFormId = x.ClinicalFormId,
CheckDate = x.ClinicalForm.CheckDate, CheckDate = x.ClinicalForm.CheckDate,
ClinicalDataTrialSetId = x.ClinicalForm.ClinicalDataTrialSetId ClinicalDataTrialSetId = x.ClinicalForm.ClinicalDataTrialSetId

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

@ -213,11 +213,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public Guid SubjectId { get; set; } public Guid SubjectId { get; set; }
[NotDefault] [NotDefault]
public Guid ReadingId { get; set; } public Guid ReadingId { get; set; }
/// <summary> /// <summary>
/// 1 PM上传的所有的 2CRC上传的所有已确认的 3 所有已经签名的 /// 临床数据类型Id
/// </summary> /// </summary>
public GetClinicalType? GetClinicalType { get; set; } public Guid? ClinicalDataTrialSetId { get; set; }
/// <summary>
/// 1 PM上传的所有的 2CRC上传的所有已确认的 3 所有已经签名的
/// </summary>
public GetClinicalType? GetClinicalType { get; set; }
[NotDefault] [NotDefault]
public Guid TrialReadingCriterionId { get; set; } public Guid TrialReadingCriterionId { get; set; }