修改废除文档签署数字

IRaCIS.Core.Application/Service/Common/ExcelExportService.cs

@@ -1837,6 +1837,8 @@ namespace IRaCIS.Core.Application.Service.Common
 
             var export_Template = StaticData.Export.TrialSelfAnalysisList_Export;
 
+            #region 自身一致性分析和组间一致性分析
+
             if (inQuery.ReadingExportType == ExportResult.DetailedTableOfIntraReaderAnalysisResults)
             {
                 //找到非一致性分析的任务
@@ -1918,6 +1920,8 @@ namespace IRaCIS.Core.Application.Service.Common
 
             }
 
+            #endregion
+
             var columNameList = list.SelectMany(t => t.QuestionAnswerList).Where(t => t.QuestionName.IsNotNullOrEmpty()).Select(t => t.QuestionName).Distinct().ToList();
 
             exportInfo.List = ExportExcelConverterDate.ConvertToClientTimeInObject(list.Where(t => t.ReadingCategory != ReadingCategory.Global).ToList(), _userInfo.TimeZoneId);
@@ -2086,7 +2090,11 @@ namespace IRaCIS.Core.Application.Service.Common
                 inQuery.ReadingExportType == ExportResult.DetailedTableOfLesions ||
                inQuery.ReadingExportType == ExportResult.TableOfAssessmentResults)
             {
-                removeColumnIndexList = new List<int>() { 6, 7, 8 };
+                if (!criterion.IsArbitrationReading)
+                {
+                    //仲裁阅片 才有裁判阅片明细表  同时要把模板里面的三列给去掉
+                    removeColumnIndexList = new List<int>() { 6, 7, 8 };
+                }
             }
 
             var export_Template = StaticData.Export.CommonReading_Export;

IRaCIS.Core.Application/Service/Document/SystemDocumentService.cs

@@ -147,7 +147,8 @@ namespace IRaCIS.Core.Application.Services
 
             var isInternal = _userInfo.IsZhiZhun;
 
-            var query = from sysDoc in _systemDocumentRepository.Where(t => t.NeedConfirmedUserTypeList.Any(t => t.NeedConfirmUserTypeId == _userInfo.UserTypeId))
+            var query = from sysDoc in _systemDocumentRepository.AsQueryable(true)
+                        .Where(t => t.NeedConfirmedUserTypeList.Any(t => t.NeedConfirmUserTypeId == _userInfo.UserTypeId))
                     .WhereIf(!string.IsNullOrEmpty(inQuery.Name), t => t.Name.Contains(inQuery.Name))
                     //外部人员 只签署 文档类型枚举值有值的
                     .WhereIf(isInternal == false, t => t.DocUserSignType == DocUserSignType.InnerAndOuter)
@@ -181,7 +182,10 @@ namespace IRaCIS.Core.Application.Services
                             //UserTypeShortName = user.UserTypeRole.UserTypeShortName
                         };
 
-            var list = await query.WhereIf(inQuery.IsSigned == true, t => t.ConfirmTime != null)
+            var list = await query 
+                               //过滤掉删除的，并且没有签名的
+                              .Where(t => !(t.IsDeleted == true && t.ConfirmTime == null))
+                              .WhereIf(inQuery.IsSigned == true, t => t.ConfirmTime != null)
                               .WhereIf(inQuery.IsSigned == false, t => t.ConfirmTime == null)
                               .ToPagedListAsync(inQuery);
 

IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs

@@ -1121,7 +1121,7 @@ namespace IRaCIS.Core.Application
                .Where(c => c.TrialDocumentList.Where(t => t.IsDeleted == false && t.NeedConfirmedUserTypeList.Any(t => t.NeedConfirmUserTypeId == _userInfo.UserTypeId)
                && !t.TrialDocConfirmedUserList.Any(t => t.ConfirmUserId == _userInfo.IdentityUserId && t.ConfirmTime != null)).Count() > 0).CountAsync();
 
-            var needSignSysDocCont = await _systemDocumentRepository
+            var needSignSysDocCont = await _systemDocumentRepository.AsQueryable(true)
                         .Where(t => t.IsDeleted == false && !t.SystemDocConfirmedUserList.Any(t => t.ConfirmUserId == _userInfo.IdentityUserId && t.ConfirmTime != null))
                     //外部人员 只签署 文档类型枚举值有值的
                     .WhereIf(isInternal == false, t => t.DocUserSignType == DocUserSignType.InnerAndOuter)
@@ -1133,8 +1133,8 @@ namespace IRaCIS.Core.Application
             .Where(t => t.NeedConfirmedUserTypeList.Any(t => t.NeedConfirmUserTypeId == _userInfo.UserTypeId))
             .Where(t => t.TrialDocConfirmedUserList.Any(t => t.ConfirmUserId == _userInfo.IdentityUserId && t.ConfirmTime != null)).CountAsync();
 
-            var signedSysDocCont = await _systemDocumentRepository
+            var signedSysDocCont = await _systemDocumentRepository.AsQueryable(true)
-                       .Where(t => t.IsDeleted == false && t.SystemDocConfirmedUserList.Any(t => t.ConfirmUserId == _userInfo.IdentityUserId && t.ConfirmTime != null))
+                       .Where(t =>  t.SystemDocConfirmedUserList.Any(t => t.ConfirmUserId == _userInfo.IdentityUserId && t.ConfirmTime != null))
                        .SelectMany(t => t.NeedConfirmedUserTypeList)
                        .CountAsync(t => t.NeedConfirmUserTypeId == _userInfo.UserTypeId);