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

Merge branch 'master' of http://192.168.1.2:8033/IRaCIS_Core_Api

IRC_NewDev
hang 2023-07-04 09:23:37 +08:00
parent e7f281a03d 6813b42ae1
commit 5f158137dd
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalAnswerService.cs
View File

@ -460,7 +460,8 @@ namespace IRaCIS.Core.Application.Service
CheckDate = x.CheckDate, CheckDate = x.CheckDate,
ClinicalDataLevel = x.ClinicalDataTrialSet.ClinicalDataLevel, ClinicalDataLevel = x.ClinicalDataTrialSet.ClinicalDataLevel,
ClinicalFormId = x.Id, ClinicalFormId = x.Id,
ClinicalDataSetName=x.ClinicalDataTrialSet.ClinicalDataSetName, ClinicalDataTrialSetId= x.ClinicalDataTrialSet.Id,
ClinicalDataSetName =x.ClinicalDataTrialSet.ClinicalDataSetName,
ClinicalDataSetEnName=x.ClinicalDataTrialSet.ClinicalDataSetEnName, ClinicalDataSetEnName=x.ClinicalDataTrialSet.ClinicalDataSetEnName,
}).ToListAsync(); }).ToListAsync();
var confirmList = await _readModuleCriterionFromRepository.Where(x => x.TrialId == inDto.TrialId).Include(x=>x.ClinicalForm).Include(x=>x.ClinicalForm.ClinicalDataTrialSet).ToListAsync(); var confirmList = await _readModuleCriterionFromRepository.Where(x => x.TrialId == inDto.TrialId).Include(x=>x.ClinicalForm).Include(x=>x.ClinicalForm.ClinicalDataTrialSet).ToListAsync();
@ -473,6 +474,7 @@ namespace IRaCIS.Core.Application.Service
ClinicalDataSetName= y.ClinicalForm.ClinicalDataTrialSet.ClinicalDataSetName, ClinicalDataSetName= y.ClinicalForm.ClinicalDataTrialSet.ClinicalDataSetName,
ClinicalDataSetEnName= y.ClinicalForm.ClinicalDataTrialSet.ClinicalDataSetEnName, ClinicalDataSetEnName= y.ClinicalForm.ClinicalDataTrialSet.ClinicalDataSetEnName,
ClinicalFormId=y.ClinicalFormId, ClinicalFormId=y.ClinicalFormId,
ClinicalDataTrialSetId=y.ClinicalForm.ClinicalDataTrialSet.Id,
}).ToList(); }).ToList();
} }
else else
@ -486,6 +488,7 @@ namespace IRaCIS.Core.Application.Service
ClinicalDataSetName = y.ClinicalDataSetName, ClinicalDataSetName = y.ClinicalDataSetName,
ClinicalDataSetEnName = y.ClinicalDataSetEnName, ClinicalDataSetEnName = y.ClinicalDataSetEnName,
ClinicalFormId = y.ClinicalFormId, ClinicalFormId = y.ClinicalFormId,
ClinicalDataTrialSetId = y.ClinicalDataTrialSetId,
}).ToList(); }).ToList();
} }
else else
@ -497,6 +500,7 @@ namespace IRaCIS.Core.Application.Service
ClinicalDataSetName = y.ClinicalDataSetName, ClinicalDataSetName = y.ClinicalDataSetName,
ClinicalDataSetEnName = y.ClinicalDataSetEnName, ClinicalDataSetEnName = y.ClinicalDataSetEnName,
ClinicalFormId = y.ClinicalFormId, ClinicalFormId = y.ClinicalFormId,
ClinicalDataTrialSetId = y.ClinicalDataTrialSetId,
}).ToList(); }).ToList();
} }
} }
@ -515,7 +519,8 @@ namespace IRaCIS.Core.Application.Service
var result = (await this.GetCRCConfirmList(new GetCRCConfirmListInDto() var result = (await this.GetCRCConfirmList(new GetCRCConfirmListInDto()
{ {
ReadModuleId = inDto.ReadModuleId, ReadModuleId = inDto.ReadModuleId,
TrialId = inDto.TrialId TrialId = inDto.TrialId,
})).SelectMany(x => x.ClinicalFormIdList).ToList(); })).SelectMany(x => x.ClinicalFormIdList).ToList();
result.ForEach(x => { result.ForEach(x => {

7
IRaCIS.Core.Application/Service/Reading/Dto/ClinicalAnswerDto.cs
View File

@ -123,6 +123,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public class GetCRCBeConfirmListOutDto public class GetCRCBeConfirmListOutDto
{ {
public Guid ClinicalDataTrialSetId { get; set; }
public Guid ClinicalFormId { get; set; } public Guid ClinicalFormId { get; set; }
public string ClinicalDataSetName { get; set; } public string ClinicalDataSetName { get; set; }
@ -136,6 +138,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
{ {
public Guid TrialId { get; set; } public Guid TrialId { get; set; }
public Guid SubjectId { get; set; }
public Guid ReadModuleId { get; set; } public Guid ReadModuleId { get; set; }
} }
@ -151,6 +155,9 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary> /// </summary>
public ClinicalLevel ClinicalDataLevel { get; set; } public ClinicalLevel ClinicalDataLevel { get; set; }
public Guid ClinicalDataTrialSetId { get; set; }
public string ClinicalDataSetName { get; set; } public string ClinicalDataSetName { get; set; }
public string ClinicalDataSetEnName { get; set; } public string ClinicalDataSetEnName { get; set; }