Merge branch 'Test_IRC_Net8' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test_IRC_Net8

IRC_NewDev
he 2024-03-04 16:01:17 +08:00
commit 398344854b
2 changed files with 9 additions and 3 deletions

View File

@ -391,7 +391,6 @@ namespace IRaCIS.Core.Application.Contracts
public int? PM_ClinicalDataCount { get; set; }
public int? ClinicalDataCount { get; set; }
#endregion
#region CRC
@ -441,6 +440,13 @@ namespace IRaCIS.Core.Application.Contracts
#endregion
public int? TotoalCount => TrialWaitSignDocCount + SysWaitSignDocCount
+ PM_SiteSurveryCount + PM_CheckCount + PM_ReviewerSelectCount + PM_ReReadingApprovalCount + PM_ClinicalDataCount
+ CRC_ImageSubmitCount + CRC_ImageQuestionCount + CRC_CheckQuestionCount + CRC_ImageReUploadCount + CRC_ClinicalDataTobeDoneCount + CRC_ClinialDataTobeConfirmCount
+ SPM_SiteSurveryCount + SPM_ReviewerApprovalCount + SPM_ReReadingApprovalCount
+ IQC_IamgeQCCount + IQC_QCQuestionCount
+ IR_IamgeWaitReadingCount + IR_MedicalReviewCount
+ MIM_MedicalReviewCount;
public bool IsHaveSysDocNeedNeedSign { get; set; }

View File

@ -1492,7 +1492,7 @@ namespace IRaCIS.Core.Application
//待审核 审核中 加急的数量
IQC_UrgentCount = isIQC ? t.SubjectVisitList.Where(u => u.CurrentActionUserId == _userInfo.Id && t.QCProcessEnum != TrialQCProcess.NotAudit && t.IsUrgent ).Count() : 0,
IQC_UrgentCount = isIQC ? t.SubjectVisitList.Where(u => u.CurrentActionUserId == _userInfo.Id && t.QCProcessEnum != TrialQCProcess.NotAudit && t.IsUrgent ).Count() : 0,
//审核未完成
IQC_AuditToBeDealedCount= isIQC ? t.SubjectVisitList.Where(u => u.CurrentActionUserId == _userInfo.Id && t.QCProcessEnum != TrialQCProcess.NotAudit).Count() : 0,
@ -1508,7 +1508,7 @@ namespace IRaCIS.Core.Application
IR_ReadingCriterionList =isIR ? t.ReadingQuestionCriterionTrialList.Where(t=>t.IsConfirm).Select(t=>t.CriterionName).ToList():null,
IR_PMEmailList= isIR ? t.TrialUserList.Select(t => t.User.EMail).ToList() : null,
IR_PMEmailList= isIR ? t.TrialUserList.Where(t=>t.User.UserTypeEnum==UserTypeEnum.ProjectManager || t.User.UserTypeEnum == UserTypeEnum.APM).Select(t => t.User.EMail).ToList() : null,
IR_TotalReadCount= isIR ? t.VisitTaskList.Where(t=>t.DoctorUserId==_userInfo.Id && t.TaskState==TaskState.Effect && t.ReadingTaskState==ReadingTaskState.HaveSigned).Count():0,