diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index c2ebcf57e..2da86bd79 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -2529,6 +2529,14 @@ + + + 删除表单数据 + + + + + 获取CRC确认列表 @@ -2536,6 +2544,13 @@ + + + 获取CRC待确认列表 + + + + CRC 确认临床数据 @@ -10745,7 +10760,7 @@ - + MIM医学反馈 diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalAnswerService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalAnswerService.cs index 472a28761..e421326c7 100644 --- a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalAnswerService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalAnswerService.cs @@ -460,7 +460,8 @@ namespace IRaCIS.Core.Application.Service CheckDate = x.CheckDate, ClinicalDataLevel = x.ClinicalDataTrialSet.ClinicalDataLevel, ClinicalFormId = x.Id, - ClinicalDataSetName=x.ClinicalDataTrialSet.ClinicalDataSetName, + ClinicalDataTrialSetId= x.ClinicalDataTrialSet.Id, + ClinicalDataSetName =x.ClinicalDataTrialSet.ClinicalDataSetName, ClinicalDataSetEnName=x.ClinicalDataTrialSet.ClinicalDataSetEnName, }).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, ClinicalDataSetEnName= y.ClinicalForm.ClinicalDataTrialSet.ClinicalDataSetEnName, ClinicalFormId=y.ClinicalFormId, + ClinicalDataTrialSetId=y.ClinicalForm.ClinicalDataTrialSet.Id, }).ToList(); } else @@ -486,6 +488,7 @@ namespace IRaCIS.Core.Application.Service ClinicalDataSetName = y.ClinicalDataSetName, ClinicalDataSetEnName = y.ClinicalDataSetEnName, ClinicalFormId = y.ClinicalFormId, + ClinicalDataTrialSetId = y.ClinicalDataTrialSetId, }).ToList(); } else @@ -497,6 +500,7 @@ namespace IRaCIS.Core.Application.Service ClinicalDataSetName = y.ClinicalDataSetName, ClinicalDataSetEnName = y.ClinicalDataSetEnName, ClinicalFormId = y.ClinicalFormId, + ClinicalDataTrialSetId = y.ClinicalDataTrialSetId, }).ToList(); } } @@ -515,7 +519,8 @@ namespace IRaCIS.Core.Application.Service var result = (await this.GetCRCConfirmList(new GetCRCConfirmListInDto() { ReadModuleId = inDto.ReadModuleId, - TrialId = inDto.TrialId + TrialId = inDto.TrialId, + })).SelectMany(x => x.ClinicalFormIdList).ToList(); result.ForEach(x => { diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalAnswerDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalAnswerDto.cs index c3f34df45..b22cacbfd 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalAnswerDto.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalAnswerDto.cs @@ -123,6 +123,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public class GetCRCBeConfirmListOutDto { + public Guid ClinicalDataTrialSetId { get; set; } + public Guid ClinicalFormId { 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 SubjectId { get; set; } + public Guid ReadModuleId { get; set; } } @@ -151,6 +155,9 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public ClinicalLevel ClinicalDataLevel { get; set; } + + public Guid ClinicalDataTrialSetId { get; set; } + public string ClinicalDataSetName { get; set; } public string ClinicalDataSetEnName { get; set; }