From a1c63ec8dbbb5ce27201f40f0ce298f49ea80b3b Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 14 Jul 2022 15:46:48 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=B8=80=E8=87=B4=E6=80=A7?= =?UTF-8?q?=E5=88=86=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IRaCIS.Core.Application.xml | 10 ++++++++++ .../Allocation/TaskConsistentRuleService.cs | 9 ++++++--- .../Service/Allocation/_MapConfig.cs | 16 ++++++++-------- .../Service/TrialSiteUser/DTO/TrialConfigDTO.cs | 11 +++++++++++ 4 files changed, 35 insertions(+), 11 deletions(-) diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 648b95e4..252ac7e1 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -3814,6 +3814,16 @@ 阅片是否显示既往结果 + + + QC流程 0 不审，1 单审，2双审 + + + + + 影像一致性核查 + + 阅片是否显示受试者信息 diff --git a/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs b/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs index 70bbe5c2..d7300f6b 100644 --- a/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs @@ -145,7 +145,9 @@ namespace IRaCIS.Core.Application.Service //最后一个访视添加全局 - var globalTask = (subject.VisitTaskList.Last()).Clone(); + var globalTask = (subject.VisitTaskList.Take(filterObj.PlanVisitCount).Last()).Clone(); + globalTask.TaskName =(int) globalTask.VisitTaskNum+"Global"; + globalTask.TaskBlindName = (int)globalTask.VisitTaskNum + "Global"; globalTask.ReadingCategory = ReadingCategory.Global; globalTask.VisitTaskNum += ReadingCommon.TaskNumDic[ReadingCategory.Global]; subject.VisitTaskList.Add(globalTask); @@ -341,10 +343,11 @@ namespace IRaCIS.Core.Application.Service } //最后一个访视添加全局 - var globalTask = (subject.TaskList.Last()).Clone(); + var globalTask = (subject.TaskList.Take(filterObj.PlanVisitCount).Last()).Clone(); + globalTask.TaskName = (int)globalTask.VisitTaskNum + "Global"; + globalTask.TaskBlindName = (int)globalTask.VisitTaskNum + "Global"; globalTask.ReadingCategory = ReadingCategory.Global; globalTask.VisitTaskNum += ReadingCommon.TaskNumDic[ReadingCategory.Global]; - subjectAddTaskList.Add(globalTask); } diff --git a/IRaCIS.Core.Application/Service/Allocation/_MapConfig.cs b/IRaCIS.Core.Application/Service/Allocation/_MapConfig.cs index 0dd71abd..fff0d3e6 100644 --- a/IRaCIS.Core.Application/Service/Allocation/_MapConfig.cs +++ b/IRaCIS.Core.Application/Service/Allocation/_MapConfig.cs @@ -73,8 +73,8 @@ namespace IRaCIS.Core.Application.Service CreateMap() .ForMember(o => o.SiteId, t => t.MapFrom(u => u.Subject.SiteId)) - .ForMember(o => o.TrialSiteCode, t => t.MapFrom(u => u.IsAnalysisCreate ? u.BlindTrialSiteCode : u.Subject.TrialSite.TrialSiteCode)) - .ForMember(o => o.SubjectCode, t => t.MapFrom(u => u.IsAnalysisCreate ? u.BlindSubjectCode : u.Subject.Code)) + .ForMember(o => o.TrialSiteCode, t => t.MapFrom(u => u.IsSelfAnalysis == true ? u.BlindTrialSiteCode : u.Subject.TrialSite.TrialSiteCode)) + .ForMember(o => o.SubjectCode, t => t.MapFrom(u => u.IsSelfAnalysis == true ? u.BlindSubjectCode : u.Subject.Code)) .ForMember(o => o.UserCode, t => t.MapFrom(u => u.DoctorUser.UserCode)) .ForMember(o => o.UserName, t => t.MapFrom(u => u.DoctorUser.UserName)) .ForMember(o => o.FullName, t => t.MapFrom(u => u.DoctorUser.FullName)) @@ -105,8 +105,8 @@ namespace IRaCIS.Core.Application.Service CreateMap() .ForMember(o => o.SiteId, t => t.MapFrom(u => u.Subject.SiteId)) - .ForMember(o => o.TrialSiteCode, t => t.MapFrom(u => u.IsAnalysisCreate ? u.BlindTrialSiteCode : u.Subject.TrialSite.TrialSiteCode)) - .ForMember(o => o.SubjectCode, t => t.MapFrom(u => u.IsAnalysisCreate ? u.BlindSubjectCode : u.Subject.Code)); + .ForMember(o => o.TrialSiteCode, t => t.MapFrom(u => u.IsSelfAnalysis == true ? u.BlindTrialSiteCode : u.Subject.TrialSite.TrialSiteCode)) + .ForMember(o => o.SubjectCode, t => t.MapFrom(u => u.IsSelfAnalysis == true ? u.BlindSubjectCode : u.Subject.Code)); @@ -150,12 +150,12 @@ namespace IRaCIS.Core.Application.Service .ForMember(o => o.DoctorUser, t => t.MapFrom(u => u.VisitTask.DoctorUser)) .ForMember(o => o.MedicalManagerUser, t => t.MapFrom(u => u.MedicalManagerUser)); CreateMap() - .ForMember(o => o.TrialSiteCode, t => t.MapFrom(u => u.IsAnalysisCreate ? u.BlindTrialSiteCode : u.Subject.TrialSite.TrialSiteCode)) - .ForMember(o => o.SubjectCode, t => t.MapFrom(u => u.IsAnalysisCreate ? u.BlindSubjectCode : u.Subject.Code)); + .ForMember(o => o.TrialSiteCode, t => t.MapFrom(u => u.IsSelfAnalysis == true ? u.BlindTrialSiteCode : u.Subject.TrialSite.TrialSiteCode)) + .ForMember(o => o.SubjectCode, t => t.MapFrom(u => u.IsSelfAnalysis == true ? u.BlindSubjectCode : u.Subject.Code)); CreateMap() - .ForMember(o => o.TrialSiteCode, t => t.MapFrom(u => u.IsAnalysisCreate ? u.BlindTrialSiteCode : u.Subject.TrialSite.TrialSiteCode)) - .ForMember(o => o.SubjectCode, t => t.MapFrom(u => u.IsAnalysisCreate ? u.BlindSubjectCode : u.Subject.Code)) + .ForMember(o => o.TrialSiteCode, t => t.MapFrom(u => u.IsSelfAnalysis==true ? u.BlindTrialSiteCode : u.Subject.TrialSite.TrialSiteCode)) + .ForMember(o => o.SubjectCode, t => t.MapFrom(u => u.IsSelfAnalysis == true ? u.BlindSubjectCode : u.Subject.Code)) .ForMember(o => o.GeneratedMedicalReviewCount, t => t.MapFrom(u => u.TaskMedicalReviewList.Count())) .ForMember(o => o.MedicalNo, t => t.MapFrom(u => u.Subject.MedicalNo )) .ForMember(o => o.IsGeneratedJudge, t => t.MapFrom(u => u.JudgeVisitTaskId !=null)) diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs index 60158157..491dcf9a 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs @@ -205,6 +205,17 @@ namespace IRaCIS.Core.Application.Contracts public bool IsReadingShowPreviousResults { get; set; } public TaskAllocateDefaultState FollowJudgeTaskAutoAssignDefaultState { get; set; } + + + /// + /// QC流程 0 不审，1 单审，2双审 + /// + public TrialQCProcess QCProcessEnum { get; set; } = TrialQCProcess.DoubleAudit; + + /// + /// 影像一致性核查 + /// + public bool IsImageConsistencyVerification { get; set; } = true; } public class TrialReadingTaskViewConfig