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

修改

Uat_Study
he 2023-06-26 17:55:43 +08:00
parent 8d9fbbf7e9
commit 1866257ff5
4 changed files with 144 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

123
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
View File

@ -2484,11 +2484,66 @@
<param name="command"></param>
<returns></returns>
</member>
<member name="T:IRaCIS.Core.Application.Service.ClinicalAnswerService">
<summary>
临床答案
</summary>
</member>
<member name="M:IRaCIS.Core.Application.Service.ClinicalAnswerService.GetCRCSubjectClinicalList(IRaCIS.Core.Application.Service.Reading.Dto.GetCRCSubjectClinicalInDto)">
<summary>
获取CRC受试者临床数据
</summary>
<param name="inDto"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Service.ClinicalAnswerService.GetClinicalQuestionFormList(IRaCIS.Core.Application.Service.Reading.Dto.GetClinicalQuestionAnswerListInDto)">
<summary>
获取表单列表
</summary>
<param name="inDto"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Service.ClinicalAnswerService.GetClinicalFormInfo(IRaCIS.Core.Application.Service.Reading.Dto.GetClinicalFormInfoInDto)">
<summary>
获取临床数据表单问题
</summary>
<param name="inDto"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Service.ClinicalAnswerService.SubmitClinicalForm(IRaCIS.Core.Application.Service.Reading.Dto.SubmitClinicalFormInDto)">
<summary>
提交临床数据表单
</summary>
<param name="inDto"></param>
<returns></returns>
</member>
<member name="T:IRaCIS.Core.Application.Service.ClinicalQuestionService">
<summary>
临床数据问题
</summary>
</member>
<member name="M:IRaCIS.Core.Application.Service.ClinicalQuestionService.GetSystemClinicalQuestionPreview(IRaCIS.Core.Application.Service.Reading.Dto.GetSystemClinicalQuestionPreviewDto)">
<summary>
获取系统临床数据预览
</summary>
<param name="inDto"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Service.ClinicalQuestionService.GetTrialClinicalQuestionPreview(IRaCIS.Core.Application.Service.Reading.Dto.GetTrialClinicalQuestionPreviewDto)">
<summary>
获取项目临床数据预览
</summary>
<param name="inDto"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Service.ClinicalQuestionService.FindChildQuestion(IRaCIS.Core.Application.Service.Reading.Dto.ClinicalQuestionPreviewDto,System.Collections.Generic.List{IRaCIS.Core.Application.Service.Reading.Dto.ClinicalQuestionPreviewDto},System.Collections.Generic.List{IRaCIS.Core.Application.Service.Reading.Dto.ClinicalTablePreviewDto},System.Collections.Generic.List{IRaCIS.Core.Application.Service.Reading.Dto.ClinicalFormQuestionAnswer},System.Collections.Generic.List{IRaCIS.Core.Application.Service.Reading.Dto.ClinicalFormTableQuestionAnswer})">
<summary>
获取子元素
</summary>
<param name="item"></param>
<param name="questions"></param>
<param name="tableQuestions"></param>
</member>
<member name="M:IRaCIS.Core.Application.Service.ClinicalQuestionService.GetTrialClinicalQuestionList(IRaCIS.Core.Application.Service.Reading.Dto.TrialClinicalQuestionQuery)">
<summary>
获取项目临床问题
@ -2828,6 +2883,46 @@
是否启用
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetSystemClinicalQuestionPreviewDto.SystemClinicalId">
<summary>
系统临床数据Id
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTrialClinicalQuestionPreviewDto.TrialClinicalId">
<summary>
项目临床数据Id
</summary>
</member>
<member name="T:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalQuestionPreviewDto">
<summary>
项目预览问题Dto
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalQuestionPreviewDto.SystemClinicalId">
<summary>
系统临床数据Id
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalQuestionPreviewDto.Childrens">
<summary>
子问题
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalQuestionPreviewDto.TableQuestions">
<summary>
表格问题
</summary>
</member>
<member name="T:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalTablePreviewDto">
<summary>
项目临床数据问题
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalTablePreviewDto.SystemClinicalId">
<summary>
系统临床数据Id
</summary>
</member>
<member name="T:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalQuestionBase">
<summary>
临床问题基本信息
@ -3113,6 +3208,16 @@
获取系统临床数据
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.TrialClinicalTableQuestionSynchronize.SystemClinicalId">
<summary>
系统临床数据Id
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.TrialClinicalQuestionSynchronize.SystemClinicalId">
<summary>
系统临床数据Id
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.SynchronizationQuestionDto.SystemClinicalId">
<summary>
系统临床数据Id
@ -10374,7 +10479,7 @@
</member>
<member name="M:IRaCIS.Core.Application.PersonalWorkstation.GetCheckToBeDoneList(IRaCIS.Core.Application.Contracts.CheckToBeDoneQuery,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectVisit},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial})">
<summary>
一致性核查待处理
一致性核查待处理 -- PM APM 待办
</summary>
<param name="inQuery"></param>
<param name="_subjectVisitRepository"></param>
@ -10383,7 +10488,7 @@
</member>
<member name="M:IRaCIS.Core.Application.PersonalWorkstation.GetReReadingApplyToBeDoneList(IRaCIS.Core.Application.Contracts.ReReadingApplyToBeDoneQuery,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.VisitTaskReReading},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial})">
<summary>
重阅申请待审核
重阅申请待审核 -- PM APM 待办
</summary>
<param name="inQuery"></param>
<param name="_visitTaskReReadingRepository"></param>
@ -10392,7 +10497,7 @@
</member>
<member name="M:IRaCIS.Core.Application.PersonalWorkstation.GetPM_ReviewerSelectToBeDoneList(IRaCIS.Core.Application.Contracts.ReviewerSelectToBeDoneQuery,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Enroll},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial})">
<summary>
PM 阅片人筛选
PM 阅片人筛选 -- PM APM 待办
</summary>
<param name="inQuery"></param>
<param name="_enrollRepository"></param>
@ -10419,7 +10524,7 @@
</member>
<member name="M:IRaCIS.Core.Application.PersonalWorkstation.GetImageClinicalDataToBeDoneList(IRaCIS.Core.Application.Contracts.ImageClinicalDataToBeDoneQuery,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectVisit},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial})">
<summary>
临床数据
临床数据 --CRC 待办
</summary>
<param name="inQuery"></param>
<param name="_subjectVisitRepository"></param>
@ -10427,7 +10532,7 @@
</member>
<member name="M:IRaCIS.Core.Application.PersonalWorkstation.GetCRCImageQuestionToBeDoneList(IRaCIS.Core.Application.Contracts.ImageQuestionToBeDoneQuery,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectVisit},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial})">
<summary>
CRC影像质疑待处理
CRC影像质疑待处理 --CRC 待办
</summary>
<param name="inQuery"></param>
<param name="_subjectVisitRepository"></param>
@ -10436,7 +10541,7 @@
</member>
<member name="M:IRaCIS.Core.Application.PersonalWorkstation.GetImageCheckQuestionToBeDoneList(IRaCIS.Core.Application.Contracts.ImageCheckQuestionToBeDoneQuery,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectVisit},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial})">
<summary>
核查质疑待处理
核查质疑待处理 --CRC 待办
</summary>
<param name="inQuery"></param>
<param name="_subjectVisitRepository"></param>
@ -10444,7 +10549,7 @@
</member>
<member name="M:IRaCIS.Core.Application.PersonalWorkstation.GetImageReUploadToBeDoneList(IRaCIS.Core.Application.Contracts.ImageReUploadToBeDoneQuery,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectVisit},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial})">
<summary>
影像重传
影像重传 --CRC 待办
</summary>
<param name="inQuery"></param>
<param name="_subjectVisitRepository"></param>
@ -10452,7 +10557,7 @@
</member>
<member name="M:IRaCIS.Core.Application.PersonalWorkstation.GetImageSubmittedToBeDoneList(IRaCIS.Core.Application.Contracts.ImageSubmittedToBeDoneQuery,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectVisit},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial})">
<summary>
加急影像提交
加急影像提交 --CRC 待办
</summary>
<param name="inQuery"></param>
<param name="_subjectVisitRepository"></param>
@ -10460,7 +10565,7 @@
</member>
<member name="M:IRaCIS.Core.Application.PersonalWorkstation.GetImageQualityToBeDoneList(IRaCIS.Core.Application.Contracts.ImageQualityToBeDoneQuery,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectVisit},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial})">
<summary>
影像质控 待领取 跟项目配置有关系 --未完成
影像质控 待领取 跟项目配置有关系 --IQC待办
</summary>
<param name="inQuery"></param>
<param name="_subjectVisitRepository"></param>

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

@ -428,10 +428,10 @@ namespace IRaCIS.Core.Application.Service
}).ToListAsync();
var newTrialQuestionAll = await _systemClinicalQuestionRepository.Where(x => systemClinicalId.Contains(x.SystemClinicalId))
.ProjectTo<TrialClinicalQuestion>(_mapper.ConfigurationProvider).ToListAsync();
.ProjectTo<TrialClinicalQuestionSynchronize>(_mapper.ConfigurationProvider).ToListAsync();
var newTrialTableQuestionAll = await _systemClinicalTableQuestionRepository.Where(x => systemClinicalId.Contains(x.SystemClinicalId))
.ProjectTo<TrialClinicalTableQuestion>(_mapper.ConfigurationProvider).ToListAsync();
.ProjectTo<TrialClinicalTableQuestionSynchronize>(_mapper.ConfigurationProvider).ToListAsync();
List<TrialClinicalQuestion> addTrialDataList = new List<TrialClinicalQuestion>();
@ -443,7 +443,7 @@ namespace IRaCIS.Core.Application.Service
x => x.TrialQuestionId
);
var newTrialQuestionList = newTrialQuestionAll.Where(x => x.SystemClinicalQuestionId == item.SystemClinicalId).ToList();
var newTrialQuestionList = newTrialQuestionAll.Where(x => x.SystemClinicalId == item.SystemClinicalId).ToList();
newTrialQuestionList.ForEach(x =>
{
if (questionRelation.ContainsKey(x.Id))
@ -482,7 +482,7 @@ namespace IRaCIS.Core.Application.Service
x => x.TrialQuestionId
);
var newTrialTableQuestionList = newTrialTableQuestionAll.Where(x => x.TrialClinicalId == item.TrialClinicalId)
var newTrialTableQuestionList = newTrialTableQuestionAll.Where(x => x.SystemClinicalId == item.SystemClinicalId)
.ToList();
@ -517,6 +517,7 @@ namespace IRaCIS.Core.Application.Service
await _trialClinicalQuestionRepository.AddRangeAsync(addTrialDataList);
await _trialClinicalTableQuestionRepository.BatchDeleteNoTrackingAsync(x => trialClinicalId.Contains(x.TrialClinicalId) );
await _trialClinicalTableQuestionRepository.AddRangeAsync(addTrialTableList);
await _trialClinicalQuestionRepository.SaveChangesAsync();
}

18
IRaCIS.Core.Application/Service/Reading/Dto/ClinicalQuestionDto.cs
View File

@ -403,6 +403,24 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
#region 同步临床数据
public class TrialClinicalTableQuestionSynchronize : TrialClinicalTableQuestion
{
/// <summary>
/// 系统临床数据Id
/// </summary>
public Guid SystemClinicalId { get; set; }
}
public class TrialClinicalQuestionSynchronize : TrialClinicalQuestion
{
/// <summary>
/// 系统临床数据Id
/// </summary>
public Guid SystemClinicalId { get; set; }
}
public class SynchronizationQuestionDto
{
/// <summary>

8
IRaCIS.Core.Application/Service/Reading/_MapConfig.cs
View File

@ -31,10 +31,16 @@ namespace IRaCIS.Core.Application.Service
CreateMap<TrialClinicalTableQuestionDto, TrialClinicalTableQuestion>();
CreateMap<SystemClinicalQuestion, TrialClinicalQuestion>()
.ForMember(d => d.SystemClinicalQuestionId, u => u.MapFrom(s => s.Id));
.ForMember(d => d.SystemClinicalQuestionId, opt => opt.MapFrom(src => src.Id));
CreateMap<SystemClinicalQuestion, TrialClinicalQuestionSynchronize>()
.ForMember(d => d.SystemClinicalQuestionId, opt => opt.MapFrom(src => src.Id));
CreateMap<SystemClinicalTableQuestion, TrialClinicalTableQuestion>()
.ForMember(d => d.SystemTableQuestionId, u => u.MapFrom(s => s.Id));
CreateMap<SystemClinicalTableQuestion, TrialClinicalTableQuestionSynchronize>()
.ForMember(d => d.SystemTableQuestionId, opt => opt.MapFrom(src => src.Id));
// 预览