diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/PersonalWorkstationViewModel.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/PersonalWorkstationViewModel.cs index f8d22c930..b532ad300 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/PersonalWorkstationViewModel.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/PersonalWorkstationViewModel.cs @@ -288,7 +288,7 @@ namespace IRaCIS.Core.Application.Contracts public string TrialStatusStr { get; set; } - + #region PM public int? ExpetiedTaskCount { get; set; } @@ -299,6 +299,9 @@ namespace IRaCIS.Core.Application.Contracts public int? PendingResponseCount { get; set; } + #endregion + + public bool IsIQCHaveToBeDone { get; set; } public bool IsCRCHaveToBeDone { get; set; } diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs index ac8f54f33..11415ad04 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs @@ -1283,25 +1283,6 @@ namespace IRaCIS.Core.Application } - #region 废弃 - #region 上传影像 - - #endregion - - #region QC - - #endregion - - #region 一致性核查 - - #endregion - - #region 阅片 - - #endregion - - #endregion - #endregion diff --git a/IRaCIS.Core.Application/_MediatR/Handlers/ConsistencyVerificationHandler.cs b/IRaCIS.Core.Application/_MediatR/Handlers/ConsistencyVerificationHandler.cs index 46b8e1861..016c334b5 100644 --- a/IRaCIS.Core.Application/_MediatR/Handlers/ConsistencyVerificationHandler.cs +++ b/IRaCIS.Core.Application/_MediatR/Handlers/ConsistencyVerificationHandler.cs @@ -112,14 +112,14 @@ namespace IRaCIS.Core.Application.MediatR.Handlers StringBuilder dialogMsg = new StringBuilder(); - //---您好,根据本系统自动识别,该受试者当前访视在IRC系统中已提交的影像检查情况如下: + //---您好,根据本系统自动识别,该受试者当前访视在IRC系统中已提交的影像检查情况如下: dialogMsg.Append(StaticData.International("ConsistencyVerification_Img")); var num = 0; List paramInfoList = new List(); foreach (var item in dbVisitStudyList) { num++; - dialogMsg.AppendLine($"
{num}.{item.StudyDate}{StaticData.International("ConsistencyVerification_Of")}{item.Modality}{StaticData.International("ConsistencyVerification_ImgC")}"); + dialogMsg.AppendLine($"
{num}. {item.StudyDate} {(_userInfo.IsEn_Us ? string.Empty : StaticData.International("ConsistencyVerification_Of"))}{item.Modality}{StaticData.International("ConsistencyVerification_ImgC")}"); paramInfoList.Add(new ParamInfoDto() { Modality = item.Modality, @@ -176,7 +176,7 @@ namespace IRaCIS.Core.Application.MediatR.Handlers if (dbExceptExcel.Count() == 0 && excelExceptDB.Count() == 0) { dialogMsg.AppendLine($"
"); - //---核对EDC数据,完全一致, 审核通过 + //---核对EDC数据,完全一致, 审核通过 dialogMsg.AppendLine(StaticData.International("ConsistencyVerification_EDCA")); @@ -184,9 +184,9 @@ namespace IRaCIS.Core.Application.MediatR.Handlers dbSV.CheckState = CheckStateEnum.CVPassed; dbSV.CheckUserId = _userInfo.Id; dbSV.CheckPassedTime = DateTime.Now; - //---核对EDC数据,完全一致 + //---核对EDC数据,完全一致 dbSV.CheckResult = StaticData.International("ConsistencyVerification_EDCB"); - //---自动核查通过 + //---自动核查通过 dbSV.ManualPassReason = StaticData.International("ConsistencyVerification_Auto"); //维护状态 @@ -214,14 +214,19 @@ namespace IRaCIS.Core.Application.MediatR.Handlers { num++; //影像检查(EDC 缺少) ConsistencyVerification_EdcL - dialogMsg.AppendLine($"
{num}.{item.StudyDate}{StaticData.International("ConsistencyVerification_Of")}{item.Modality}{StaticData.International("ConsistencyVerification_EdcL")} "); + + + dialogMsg.AppendLine($"
{num}. {StaticData.International("ConsistencyVerification_EdcL")}{item.StudyDate}{(_userInfo.IsEn_Us ? string.Empty : StaticData.International("ConsistencyVerification_Of"))}{item.Modality}{StaticData.International("ConsistencyVerification_ImgC")}"); + } foreach (var item in excelExceptDB) { num++; + // 影像检查(IRC 缺少) - dialogMsg.AppendLine($"
{num}.{item.StudyDate}{StaticData.International("ConsistencyVerification_Of")}{item.Modality}{StaticData.International("ConsistencyVerification_IrcL")} "); + dialogMsg.AppendLine($"
{num}. {StaticData.International("ConsistencyVerification_IrcL")}{item.StudyDate}{(_userInfo.IsEn_Us ? string.Empty : StaticData.International("ConsistencyVerification_Of"))}{item.Modality}{StaticData.International("ConsistencyVerification_ImgC")}"); + } dialogMsg.AppendLine($"
");