增加清理跟踪的方法

IRaCIS.Core.API/Controllers/ExtraController.cs

@@ -218,7 +218,7 @@ namespace IRaCIS.Api.Controllers
                     {
                         //发版屏蔽
 
-                        returnModel.Data.JWTStr = _tokenService.GetToken(IRaCISClaims.Create(returnModel.Data.BasicInfo));
+                        //returnModel.Data.JWTStr = _tokenService.GetToken(IRaCISClaims.Create(returnModel.Data.BasicInfo));
 
                         //MFA 发送邮件
 

IRaCIS.Core.API/Controllers/UploadDownLoadController.cs

@@ -479,6 +479,8 @@ namespace IRaCIS.Core.API.Controllers
                 public string FilePath { get; set; }
                 public string FileName { get; set; }
                 public int FileFize { get; set; }
+
+                public string FileType { get; set; }
             }
         }
 
@@ -511,7 +513,7 @@ namespace IRaCIS.Core.API.Controllers
 
             foreach (var item in incommand.UploadedFileList)
             {
-                await _repository.AddAsync(new NoneDicomStudyFile() { FileName = item.FileName, Path = item.FilePath, NoneDicomStudyId = noneDicomStudyId });
+                await _repository.AddAsync(new NoneDicomStudyFile() { FileName = item.FileName, Path = item.FilePath, NoneDicomStudyId = noneDicomStudyId,FileType=item.FileType });
 
             }
             var uploadFinishedTime = DateTime.Now;

IRaCIS.Core.API/Properties/launchSettings.json

@@ -30,7 +30,7 @@
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Event_IRC"
       },
-      "applicationUrl": "http://localhost:6101"
+      "applicationUrl": "http://localhost:6100"
     },
     "Docker": {
       "commandName": "Docker",

IRaCIS.Core.API/appsettings.Event_IRC.json

@@ -43,7 +43,6 @@
 
     "LoginFailLockMinutes": 30,
     "AutoLoginOutMinutes": 60
-
   },
   "SystemEmailSendConfig": {
     "Port": 465,
@@ -51,7 +50,11 @@
     "FromEmail": "uat@extimaging.com",
     "FromName": "UAT_IRC",
     "AuthorizationCode": "SHzyyl2021",
-    "SiteUrl": "http://irc.event.extimaging.com/login"
+    "SiteUrl": "http://irc.event.extimaging.com/login",
+    "CompanyName": "Extensive Imaging",
+    "CompanyNameCN": "上海展影医疗科技有限公司",
+    "CompanyShortName": "Extensive Imaging",
+    "CompanyShortNameCN": "展影医疗"
   }
 
 

IRaCIS.Core.API/appsettings.Prod_IRC.json

@@ -7,8 +7,8 @@
     }
   },
   "ConnectionStrings": {
-   // "RemoteNew": "Server=47.117.165.18,1434;Database=Prod_IRC;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true",
+    //"RemoteNew": "Server=101.132.193.237,1434;Database=Prod_IRC;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true",
-   // "Hangfire": "Server=47.117.165.18,1434;Database=Prod_IRC_Hangfire;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true"
+    //"Hangfire": "Server=101.132.193.237,1434;Database=Prod_IRC_Hangfire;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true"
     "RemoteNew": "Server=prod_mssql_standard,1433;Database=Prod_IRC;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true",
     "Hangfire": "Server=prod_mssql_standard,1433;Database=Prod_IRC_Hangfire;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true"
   },
@@ -36,14 +36,16 @@
   "BasicSystemConfig": {
 
     "OpenUserComplexPassword": true,
-
     "OpenSignDocumentBeforeWork": true,
 
     "OpenLoginLimit": true,
     "LoginMaxFailCount": 5,
-
     "LoginFailLockMinutes": 30,
-    "AutoLoginOutMinutes": 60
+
+    "AutoLoginOutMinutes": 60,
+
+    "OpenLoginMFA": false
+
   },
 
   "SystemEmailSendConfig": {

IRaCIS.Core.API/appsettings.Test_IRC.json

@@ -26,15 +26,14 @@
       "viewEndpoint": "https://zy-irc-test-store.oss-cn-shanghai.aliyuncs.com",
       "region": "oss-cn-shanghai"
     },
-
     "MinIO": {
-      "endPoint": "192.168.3.68",
+      "endPoint": "hir-oss.test.extimaging.com",
-      "port": "8001",
+      "port": "443",
-      "useSSL": false,
+      "useSSL": true,
-      "accessKey": "IDFkwEpWej0b4DtiuThL",
+      "accessKey": "fbStsVYCIPKHQneeqMwD",
-      "secretKey": "Lhuu83yMhVwu7c1SnjvGY6lq74jzpYqifK6Qtj4h",
+      "secretKey": "TzgvyA3zGXMUnpilJNUlyMYHfosl1hBMl6lxPmjy",
-      "bucketName": "test",
+      "bucketName": "irc-test",
-      "viewEndpoint": "http://192.168.3.68:8001/test/"
+      "viewEndpoint": "https://hir-oss.test.extimaging.com/irc-test"
     },
 
     "AWS": {

IRaCIS.Core.API/appsettings.Uat_IRC.json

@@ -12,7 +12,7 @@
   },
   "ObjectStoreService": {
 
-    "ObjectStoreUse": "AliyunOSS",
+    "ObjectStoreUse": "MinIO",
 
     "AliyunOSS": {
       "regionId": "cn-shanghai",
@@ -26,12 +26,17 @@
     },
 
     "MinIO": {
-      "endpoint": "http://192.168.3.68",
+      "endPoint": "hir-oss.uat.extimaging.com",
-      "port": "8001",
+      "port": "80",
       "useSSL": false,
-      "accessKey": "IDFkwEpWej0b4DtiuThL",
+      "viewEndpoint": "http://hir-oss.uat.extimaging.com/irc-uat",
-      "secretKey": "Lhuu83yMhVwu7c1SnjvGY6lq74jzpYqifK6Qtj4h",
+      //"port": "443",
-      "bucketName": "test"
+      //"useSSL": true,
+      //"viewEndpoint": "https://hir-oss.uat.extimaging.com/irc-uat",
+      "accessKey": "b9Ul0e98xPzt6PwRXA1Q",
+      "secretKey": "DzMaU2L4OXl90uytwOmDXF2encN0Jf4Nxu2XkYqQ",
+      "bucketName": "irc-uat"
+
     }
   },
 
@@ -45,7 +50,8 @@
     "LoginMaxFailCount": 5,
 
     "LoginFailLockMinutes": 30,
-    "AutoLoginOutMinutes": 60
+    "AutoLoginOutMinutes": 60,
+    "OpenLoginMFA": false
 
   },
   "SystemEmailSendConfig": {

IRaCIS.Core.Application/Helper/SendEmailHelper.cs

@@ -40,11 +40,11 @@ public static class SendEmailHelper
 
             }
         }
-        catch (Exception )
+        catch (Exception ex)
         {
 
             //---邮件发送失败，您进行的操作未能成功，请检查邮箱或联系维护人员
-            throw new Exception(StaticData.International("SendEmail_SendFail"));
+            throw new Exception(StaticData.International("SendEmail_SendFail"),new Exception(ex.Message));
         }
 
 

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -424,11 +424,11 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.Application.Service.Allocation.VisitTaskService.GetOrderReadingIQueryable(IRaCIS.Core.Application.ViewModel.GetOrderReadingIQueryableInDto)">
+        <member name="M:IRaCIS.Core.Application.Service.Allocation.VisitTaskService.GetSubjectReadingIQueryable(IRaCIS.Core.Application.ViewModel.GetReadingIQueryableInDto)">
             <summary>
-            获取有序阅片IQuery对象
+            获取subject有序 或者无序阅片IQuery对象
             </summary>
-            <param name="inDto"></param>
+            <param name="inQuery"></param>
             <returns></returns>
         </member>
         <member name="M:IRaCIS.Core.Application.Service.Allocation.VisitTaskService.GetIRHaveReadTaskList(IRaCIS.Core.Application.ViewModel.VisitTaskQuery)">
@@ -13265,11 +13265,12 @@
             <param name="state"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Application.Services.UserService.SendMFAEmail(System.Guid)">
+        <member name="M:IRaCIS.Application.Services.UserService.SendMFAEmail(System.Guid,System.Int32)">
             <summary>
             发送MFA 验证邮件
             </summary>
             <param name="userId"></param>
+            <param name="mfaType"></param>
             <returns></returns>
         </member>
         <member name="M:IRaCIS.Application.Services.UserService.VerifyMFACodeAsync(System.Guid,System.String)">

IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs

@@ -370,16 +370,16 @@ namespace IRaCIS.Core.Application.ViewModel
     }
 
 
-    public class GetOrderReadingIQueryableInDto
+    public class GetReadingIQueryableInDto:PageInput
     {
        public Guid TrialId { get; set; }
 
+		public Guid? SubjectId { get; set; }
+
 		public Guid TrialReadingCriterionId { get; set; }
 
         public string? SubjectCode { get; set; } = null;
 
-        public PageInput? Page { get; set; } = null;
-
     }
 
     public class VisitTaskQuery : PageInput

IRaCIS.Core.Application/Service/Allocation/Interface/IVisitTaskService.cs

@@ -16,6 +16,6 @@ namespace IRaCIS.Core.Application.Service
 
         Task<IResponseOutput> ConfirmReReading(ConfirmReReadingCommand agreeReReadingCommand, [FromServices] IVisitTaskHelpeService _visitTaskCommonService);
 
-        Task<(int, List<IRUnReadSubjectView>)> GetOrderReadingIQueryable(GetOrderReadingIQueryableInDto inDto);
+        Task<PageOutput<IRUnReadSubjectView>> GetSubjectReadingIQueryable(GetReadingIQueryableInDto inDto);
     }
 }

IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs

@@ -117,7 +117,7 @@ namespace IRaCIS.Core.Application.Service
 
             var pageList = await visitTaskQueryable.ToPagedListAsync(queryVisitTask.PageIndex, queryVisitTask.PageSize, queryVisitTask.SortField, queryVisitTask.Asc, string.IsNullOrWhiteSpace(queryVisitTask.SortField), defalutSortArray);
 
-            var trialTaskConfig = _repository.Where<Trial>(t => t.Id == queryVisitTask.TrialId).Select(t => new { IsHaveDoubleReadCriterion=t.ReadingQuestionCriterionTrialList.Any(t=>t.IsSigned && t.IsConfirm && t.ReadingType==ReadingMethod.Double),  t.VitrualSiteCode }).FirstOrDefault();
+            var trialTaskConfig = _repository.Where<Trial>(t => t.Id == queryVisitTask.TrialId).Select(t => new { IsHaveDoubleReadCriterion=t.TrialReadingCriterionList.Any(t=>t.IsSigned && t.IsConfirm && t.ReadingType==ReadingMethod.Double),  t.VitrualSiteCode }).FirstOrDefault();
 
             return ResponseOutput.Ok(pageList, trialTaskConfig);
         }

IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs

@@ -22,6 +22,8 @@ using DocumentFormat.OpenXml.Bibliography;
 using Org.BouncyCastle.Crypto;
 using IRaCIS.Core.Domain.Share.Reading;
 using MassTransit;
+using System.Reactive.Subjects;
+using Subject = IRaCIS.Core.Domain.Models.Subject;
 
 namespace IRaCIS.Core.Application.Service.Allocation
 {
@@ -957,132 +959,6 @@ namespace IRaCIS.Core.Application.Service.Allocation
             var readingTool = criterionConfig.ReadingTool;
             var isReadingTaskViewInOrder = criterionConfig.IsReadingTaskViewInOrder;
 
-            #region 按照Subject 维度
-            if (isReadingTaskViewInOrder == ReadingOrder.InOrder)
-            {
-
-
-                var visitTaskListInfo = await GetOrderReadingIQueryable(new GetOrderReadingIQueryableInDto()
-                {
-                    TrialId = trialId,
-                    TrialReadingCriterionId = trialReadingCriterionId,
-                    SubjectCode = inQuery.SubjectCode,
-                    Page = new PageInput()
-                    {
-                        PageIndex = inQuery.PageIndex,
-                        PageSize = inQuery.PageSize,
-                        Asc = inQuery.Asc,
-                        SortField = inQuery.SortField,
-
-                    }
-
-                });
-
-
-                var totalCount = visitTaskListInfo.Item1;
-                var currentPageData = visitTaskListInfo.Item2;
-
-
-
-                var result = new PageOutput<IRUnReadSubjectView>()
-                {
-                    PageSize = inQuery.PageSize,
-                    PageIndex = inQuery.PageIndex,
-                    TotalCount = totalCount,
-                    CurrentPageData = currentPageData,
-                };
-
-                // 封装的方法有问题
-                //var result = await visitQuery.ToPagedListAsync(iRUnReadSubjectQuery.PageIndex, iRUnReadSubjectQuery.PageSize, String.IsNullOrEmpty(iRUnReadSubjectQuery.SortField) ? nameof(IRUnReadSubjectView.SubjectId) : iRUnReadSubjectQuery.SortField, iRUnReadSubjectQuery.Asc);
-                return ResponseOutput.Ok(result, new
-                {
-                    RandomReadInfo = new IRUnReadOutDto(),
-                    IsReadingTaskViewInOrder = isReadingTaskViewInOrder,
-                    ReadingTool = readingTool,
-                    IseCRFShowInDicomReading = criterionConfig.IseCRFShowInDicomReading,
-                    IsReadingShowSubjectInfo = criterionConfig.IsReadingShowSubjectInfo,
-                    IsReadingShowPreviousResults = criterionConfig.IsReadingShowPreviousResults,
-                    DigitPlaces = criterionConfig.DigitPlaces,
-                    CriterionType = criterionConfig.CriterionType,
-                });
-            }
-            else if(isReadingTaskViewInOrder == ReadingOrder.SubjectRandom)
-            {
-                var critrion = await _trialReadingCriterionRepository.FindAsync(trialReadingCriterionId);
-
-                var visitQuery = _visitTaskRepository.Where(x => x.TrialId == trialId && x.DoctorUserId == _userInfo.Id && x.TaskState == TaskState.Effect)
-                  
-                    .WhereIf(!string.IsNullOrEmpty(subjectCode), t => (t.Subject.Code.Contains(subjectCode!) && t.IsAnalysisCreate == false) || (t.BlindSubjectCode.Contains(subjectCode!) && t.IsAnalysisCreate));
-
-                var visitGroupQuery = visitQuery.GroupBy(x => new { x.SubjectId, x.Subject.Code, x.BlindSubjectCode });
-
-                var visitTaskQuery = visitGroupQuery.Select(x => new IRUnReadSubjectView()
-                {
-                    SubjectId = x.Key.SubjectId,
-                    SubjectCode = x.Key.BlindSubjectCode == string.Empty ? x.Key.Code : x.Key.BlindSubjectCode,
-
-                    SuggesteFinishedTime = x.Where(y => y.TrialReadingCriterionId == trialReadingCriterionId && y.ReadingTaskState != ReadingTaskState.HaveSigned).Min(x => x.SuggesteFinishedTime),
-
-                    //未读任务量
-                    UnReadCanReadTaskCount = x.Where(y => y.TrialReadingCriterionId == trialReadingCriterionId && y.ReadingTaskState != ReadingTaskState.HaveSigned).Count(),
-
-                    UrgentCount = x.Where(y => y.TrialReadingCriterionId == trialReadingCriterionId && y.ReadingTaskState != ReadingTaskState.HaveSigned).Where(x => x.IsUrgent).Count(),
-
-                    //已读任务量
-                    HaveReadTaskCount = x.Where(y => y.TrialReadingCriterionId == trialReadingCriterionId && y.ReadingTaskState == ReadingTaskState.HaveSigned).Count(),
-
-                    ExistReadingApply = x.Any(y => (y.ReReadingApplyState == ReReadingApplyState.DocotorHaveApplyed && y.TrialReadingCriterionId == trialReadingCriterionId) || y.ReReadingApplyState == ReReadingApplyState.TrialGroupHaveApplyed),
-                   
-                    UnReadCanReadTaskList = x.Where(y => y.TrialReadingCriterionId == trialReadingCriterionId && y.ReadingTaskState != ReadingTaskState.HaveSigned)
-                    .OrderBy(x => x.VisitTaskNum)
-                    .Select(u => new IRUnreadTaskView()
-                    {
-                        Id = u.Id,
-                        IsUrgent = u.IsUrgent,
-                        VisitNum = u.VisitTaskNum,
-                        TaskBlindName = u.TaskBlindName,
-                        VisistId = u.SourceSubjectVisitId,
-                        SuggesteFinishedTime = u.SuggesteFinishedTime,
-                        ReadingCategory = u.ReadingCategory,
-                        IsAnalysisCreate = u.IsAnalysisCreate,
-                        ArmEnum = u.ArmEnum,
-                        TrialReadingCriterionId = u.TrialReadingCriterionId,
-                        IsNeedClinicalDataSign = u.IsNeedClinicalDataSign,
-                        IsClinicalDataSign = u.IsClinicalDataSign,
-                        IsFrontTaskNeedSignButNotSign = u.IsFrontTaskNeedSignButNotSign
-                    })
-                    .ToList()
-                }).Where(x => x.UnReadCanReadTaskCount > 0);
-
-                var pageList = await visitTaskQuery.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrWhiteSpace(inQuery.SortField)? nameof(IRUnReadSubjectView.UnReadCanReadTaskCount) : inQuery.SortField, inQuery.Asc );
-
-
-                return ResponseOutput.Ok(pageList, new
-                {
-                    RandomReadInfo = new IRUnReadOutDto(),
-                    IsReadingTaskViewInOrder = isReadingTaskViewInOrder,
-                    ReadingTool = readingTool,
-                    IseCRFShowInDicomReading = criterionConfig.IseCRFShowInDicomReading,
-                    IsReadingShowSubjectInfo = criterionConfig.IsReadingShowSubjectInfo,
-                    IsReadingShowPreviousResults = criterionConfig.IsReadingShowPreviousResults,
-                    DigitPlaces = criterionConfig.DigitPlaces,
-                    CriterionType = criterionConfig.CriterionType,
-                });
-            }
-            else
-            {
-                var taskQuery = _visitTaskRepository.Where(x => x.TrialId == inQuery.TrialId && x.DoctorUserId == _userInfo.Id && x.TaskState == TaskState.Effect && x.TrialReadingCriterionId == trialReadingCriterionId)
-                       // .Where(x=>x.Subject.ClinicalDataList.Any(c => c.IsSign && (c.ReadingId == x.SouceReadModuleId || c.ReadingId == x.SourceSubjectVisitId)))
-                       .Where(x => !x.Subject.IsDeleted).Where(x => (x.IsNeedClinicalDataSign && x.IsClinicalDataSign) || !x.IsNeedClinicalDataSign);
-
-                IRUnReadOutDto iRUnReadOut = new IRUnReadOutDto()
-                {
-                    FinishJudgeTaskCount = await taskQuery.Where(x => x.ReadingCategory == ReadingCategory.Judge && x.ReadingTaskState == ReadingTaskState.HaveSigned).CountAsync(),
-                    FinishTaskCount = await taskQuery.Where(x => x.ReadingCategory != ReadingCategory.Judge && x.ReadingTaskState == ReadingTaskState.HaveSigned).CountAsync(),
-                    SuggesteFinishedTime = await taskQuery.Where(x => x.ReadingTaskState != ReadingTaskState.HaveSigned).MaxAsync(x => x.SuggesteFinishedTime),
-                    UnReadJudgeTaskCount = await taskQuery.Where(x => x.ReadingCategory == ReadingCategory.Judge && x.ReadingTaskState != ReadingTaskState.HaveSigned).CountAsync(),
-                    UnReadTaskCount = await taskQuery.Where(x => x.ReadingCategory != ReadingCategory.Judge && x.ReadingTaskState != ReadingTaskState.HaveSigned).CountAsync(),
-                };
 
             var result = new PageOutput<IRUnReadSubjectView>()
             {
@@ -1092,6 +968,41 @@ namespace IRaCIS.Core.Application.Service.Allocation
                 CurrentPageData = null,
             };
 
+            IRUnReadOutDto iRUnReadOut = new IRUnReadOutDto();
+
+            //subject 级别  有序 无序查询
+            if (isReadingTaskViewInOrder == ReadingOrder.InOrder || isReadingTaskViewInOrder == ReadingOrder.SubjectRandom)
+            {
+                result = await GetSubjectReadingIQueryable(new GetReadingIQueryableInDto()
+                {
+                    TrialId = trialId,
+                    TrialReadingCriterionId = trialReadingCriterionId,
+                    SubjectCode = inQuery.SubjectCode,
+
+                    PageIndex = inQuery.PageIndex,
+                    PageSize = inQuery.PageSize,
+                    Asc = inQuery.Asc,
+                    SortField = inQuery.SortField,
+                });
+
+            }
+            //随机阅片
+            else
+            {
+                var taskQuery = _visitTaskRepository.Where(x => x.TrialId == inQuery.TrialId && x.DoctorUserId == _userInfo.Id && x.TaskState == TaskState.Effect && x.TrialReadingCriterionId == trialReadingCriterionId)
+                       // .Where(x=>x.Subject.ClinicalDataList.Any(c => c.IsSign && (c.ReadingId == x.SouceReadModuleId || c.ReadingId == x.SourceSubjectVisitId)))
+                       .Where(x => !x.Subject.IsDeleted).Where(x => (x.IsNeedClinicalDataSign && x.IsClinicalDataSign) || !x.IsNeedClinicalDataSign);
+
+                iRUnReadOut = new IRUnReadOutDto()
+                {
+                    FinishJudgeTaskCount = await taskQuery.Where(x => x.ReadingCategory == ReadingCategory.Judge && x.ReadingTaskState == ReadingTaskState.HaveSigned).CountAsync(),
+                    FinishTaskCount = await taskQuery.Where(x => x.ReadingCategory != ReadingCategory.Judge && x.ReadingTaskState == ReadingTaskState.HaveSigned).CountAsync(),
+                    SuggesteFinishedTime = await taskQuery.Where(x => x.ReadingTaskState != ReadingTaskState.HaveSigned).MaxAsync(x => x.SuggesteFinishedTime),
+                    UnReadJudgeTaskCount = await taskQuery.Where(x => x.ReadingCategory == ReadingCategory.Judge && x.ReadingTaskState != ReadingTaskState.HaveSigned).CountAsync(),
+                    UnReadTaskCount = await taskQuery.Where(x => x.ReadingCategory != ReadingCategory.Judge && x.ReadingTaskState != ReadingTaskState.HaveSigned).CountAsync(),
+                };
+            }
+
             return ResponseOutput.Ok(result, new
             {
                 IsReadingTaskViewInOrder = isReadingTaskViewInOrder,
@@ -1104,30 +1015,28 @@ namespace IRaCIS.Core.Application.Service.Allocation
                 CriterionType = criterionConfig.CriterionType,
             });
 
-            }
-
-
-
-            #endregion
-
 
         }
 
         /// <summary>
-        /// 获取有序阅片IQuery对象
+        /// 获取subject有序 或者无序阅片IQuery对象
         /// </summary>
-        /// <param name="inDto"></param>
+        /// <param name="inQuery"></param>
         /// <returns></returns>
-        public async Task<(int, List<IRUnReadSubjectView>)> GetOrderReadingIQueryable(GetOrderReadingIQueryableInDto inDto)
+        public async Task<PageOutput<IRUnReadSubjectView>> GetSubjectReadingIQueryable(GetReadingIQueryableInDto inQuery)
         {
-            var trialReadingCriterionId = inDto.TrialReadingCriterionId;
+            var trialReadingCriterionId = inQuery.TrialReadingCriterionId;
-
+            var subjectCode = inQuery.SubjectCode;
+            var trialId = inQuery.TrialId;
+            var subjectId = inQuery.SubjectId;
 
             var critrion = await _trialReadingCriterionRepository.FindAsync(trialReadingCriterionId);
 
+            if (critrion.IsReadingTaskViewInOrder == ReadingOrder.InOrder)
+            {
+                var visitQuery = _visitTaskRepository.Where(x => x.TrialId == inQuery.TrialId && x.DoctorUserId == _userInfo.Id && x.TaskState == TaskState.Effect)
 
-            var visitQuery = _visitTaskRepository.Where(x => x.TrialId == inDto.TrialId && x.DoctorUserId == _userInfo.Id && x.TaskState == TaskState.Effect)
+               .WhereIf(inQuery.SubjectId != null, x => x.SubjectId == inQuery.SubjectId)
-
                 //前序 不存在  未生成任务的访视
                 .WhereIf(critrion.IsAutoCreate == false, t => !t.Subject.SubjectCriteriaEvaluationVisitFilterList.Where(t => t.TrialReadingCriterionId == trialReadingCriterionId).Any(f => f.IsGeneratedTask == false && t.VisitTaskNum > f.SubjectVisit.VisitNum))
 
@@ -1139,7 +1048,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
                //满足前序访视不存在 需要签署但是未签署  sql  相当复杂    同时想查询所有未读的统计数字 就无法统计   byzhouhang  
                //但是加字段 IsFrontTaskNeedSignButNotSign   那么签名临床数据的时候，要对该subject 该标准的有效的任务  这个字段需要在签名的时候维护   采取这种方式   统计数字灵活
                //.Where(t => t.Subject.SubjectVisitTaskList.AsQueryable().Where(visitTaskLambda).Any(c => c.IsNeedClinicalDataSign == true && c.IsClinicalDataSign == false && c.VisitTaskNum < t.VisitTaskNum))
-                .WhereIf(!string.IsNullOrEmpty(inDto.SubjectCode), t => (t.Subject.Code.Contains(inDto.SubjectCode!) && t.IsAnalysisCreate == false) || (t.BlindSubjectCode.Contains(inDto.SubjectCode!) && t.IsAnalysisCreate));
+               .WhereIf(!string.IsNullOrEmpty(inQuery.SubjectCode), t => (t.Subject.Code.Contains(inQuery.SubjectCode!) && t.IsAnalysisCreate == false) || (t.BlindSubjectCode.Contains(inQuery.SubjectCode!) && t.IsAnalysisCreate));
 
 
                 var visitGroupQuery = visitQuery.GroupBy(x => new { x.SubjectId, x.Subject.Code, x.BlindSubjectCode });
@@ -1221,22 +1130,112 @@ namespace IRaCIS.Core.Application.Service.Allocation
 
                 var result = new List<IRUnReadSubjectView>();
 
-            var propName = string.IsNullOrWhiteSpace(inDto.Page!.SortField) ? nameof(IRUnReadSubjectView.UnReadCanReadTaskCount) : inDto.Page.SortField;
+                var propName = string.IsNullOrWhiteSpace(inQuery!.SortField) ? nameof(IRUnReadSubjectView.UnReadCanReadTaskCount) : inQuery.SortField;
+
+                var visitTaskOrderQuery = inQuery.Asc ? visitTaskQuery.OrderBy(propName) : visitTaskQuery.OrderBy(propName + " desc");
+
+
 
-            var visitTaskOrderQuery = inDto.Page.Asc ? visitTaskQuery.OrderBy(propName) : visitTaskQuery.OrderBy(propName + " desc");
-            if (inDto.Page != null)
-            {
                 result = await visitTaskOrderQuery
-                     .Skip((inDto.Page.PageIndex - 1) * inDto.Page.PageSize)
+                     .Skip((inQuery.PageIndex - 1) * inQuery.PageSize)
-                     .Take(inDto.Page.PageSize).ToListAsync();
+                     .Take(inQuery.PageSize).ToListAsync();
+
+
+                return new PageOutput<IRUnReadSubjectView>()
+                {
+                    PageSize = inQuery.PageSize,
+                    PageIndex = inQuery.PageIndex,
+                    TotalCount = count,
+                    CurrentPageData = result,
+                };
             }
             else
             {
-                result = await visitTaskOrderQuery.ToListAsync();
+
+                if (subjectId != null)
+                {
+                    //找到 非一致性分析，未签名，状态正常的 并且任务名称是TimePoint的 任务
+                    var needDealTaskList = await _visitTaskRepository.Where(t => t.SubjectId == subjectId && t.TrialReadingCriterionId == trialReadingCriterionId && t.IsAnalysisCreate == false && t.DoctorUserId == _userInfo.Id
+                       && t.ReadingTaskState != ReadingTaskState.HaveSigned && t.TaskBlindName == "Timepoint" && t.ReadingCategory == ReadingCategory.Visit
+                       && (t.TaskState == TaskState.Effect || t.TaskState == TaskState.Freeze), true).ToListAsync();
+
+                    if (needDealTaskList.Count > 0)
+                    {
+                        //已完成的访视任务数量（包含重阅的）
+                        var haveFinishedTaskCount = await _visitTaskRepository.CountAsync(t => t.SubjectId == subjectId && t.TrialReadingCriterionId == trialReadingCriterionId && t.IsAnalysisCreate == false && t.DoctorUserId == _userInfo.Id
+                        && t.ReadingTaskState == ReadingTaskState.HaveSigned && t.ReadingCategory == ReadingCategory.Visit);
+
+                        //已经处理过的任务名称的数量
+
+                        var haveDealedTaskCount = await _visitTaskRepository.CountAsync(t => t.SubjectId == subjectId && t.TrialReadingCriterionId == trialReadingCriterionId && t.IsAnalysisCreate == false && t.DoctorUserId == _userInfo.Id
+                        && t.ReadingTaskState != ReadingTaskState.HaveSigned && t.ReadingCategory == ReadingCategory.Visit && t.TaskBlindName != "Timepoint");
+
+
+
+                        //随机赋值编号  比如要处理5个任务，实例化一个包含1-5的数组，每次随机取出一个
+                        List<int> availableNumbers = Enumerable.Range(haveDealedTaskCount + haveFinishedTaskCount + 1, needDealTaskList.Count).ToList();
+                        Random rng = new Random();
+                        foreach (var visitTask in needDealTaskList)
+                        {
+                            int randomIndex = rng.Next(availableNumbers.Count);
+
+                            visitTask.TaskBlindName = $"Timepoint Ran {availableNumbers[randomIndex]}";
+
+                            availableNumbers.RemoveAt(randomIndex);
+                        }
+                        await _visitTaskRepository.SaveChangesAsync();
+                    }
                 }
 
+                var visitQuery = _visitTaskRepository.Where(x => x.TrialId == trialId && x.DoctorUserId == _userInfo.Id && x.TaskState == TaskState.Effect)
+                    .WhereIf(inQuery.SubjectId != null, x => x.SubjectId == inQuery.SubjectId)
+                    .WhereIf(!string.IsNullOrEmpty(subjectCode), t => (t.Subject.Code.Contains(subjectCode!) && t.IsAnalysisCreate == false) || (t.BlindSubjectCode.Contains(subjectCode!) && t.IsAnalysisCreate));
+
+                var visitGroupQuery = visitQuery.GroupBy(x => new { x.SubjectId, x.Subject.Code, x.BlindSubjectCode });
+
+                var visitTaskQuery = visitGroupQuery.Select(x => new IRUnReadSubjectView()
+                {
+                    SubjectId = x.Key.SubjectId,
+                    SubjectCode = x.Key.BlindSubjectCode == string.Empty ? x.Key.Code : x.Key.BlindSubjectCode,
+
+                    SuggesteFinishedTime = x.Where(y => y.TrialReadingCriterionId == trialReadingCriterionId && y.ReadingTaskState != ReadingTaskState.HaveSigned).Min(x => x.SuggesteFinishedTime),
+
+                    //未读任务量
+                    UnReadCanReadTaskCount = x.Where(y => y.TrialReadingCriterionId == trialReadingCriterionId && y.ReadingTaskState != ReadingTaskState.HaveSigned).Count(),
+
+                    UrgentCount = x.Where(y => y.TrialReadingCriterionId == trialReadingCriterionId && y.ReadingTaskState != ReadingTaskState.HaveSigned).Where(x => x.IsUrgent).Count(),
+
+                    //已读任务量
+                    HaveReadTaskCount = x.Where(y => y.TrialReadingCriterionId == trialReadingCriterionId && y.ReadingTaskState == ReadingTaskState.HaveSigned).Count(),
+
+                    ExistReadingApply = x.Any(y => (y.ReReadingApplyState == ReReadingApplyState.DocotorHaveApplyed && y.TrialReadingCriterionId == trialReadingCriterionId) || y.ReReadingApplyState == ReReadingApplyState.TrialGroupHaveApplyed),
+
+                    UnReadCanReadTaskList = x.Where(y => y.TrialReadingCriterionId == trialReadingCriterionId && y.ReadingTaskState != ReadingTaskState.HaveSigned)
+                    .OrderBy(x => x.VisitTaskNum)
+                    .Select(u => new IRUnreadTaskView()
+                    {
+                        Id = u.Id,
+                        IsUrgent = u.IsUrgent,
+                        VisitNum = u.VisitTaskNum,
+                        TaskBlindName = u.TaskBlindName,
+                        VisistId = u.SourceSubjectVisitId,
+                        SuggesteFinishedTime = u.SuggesteFinishedTime,
+                        ReadingCategory = u.ReadingCategory,
+                        IsAnalysisCreate = u.IsAnalysisCreate,
+                        ArmEnum = u.ArmEnum,
+                        TrialReadingCriterionId = u.TrialReadingCriterionId,
+                        IsNeedClinicalDataSign = u.IsNeedClinicalDataSign,
+                        IsClinicalDataSign = u.IsClinicalDataSign,
+                        IsFrontTaskNeedSignButNotSign = u.IsFrontTaskNeedSignButNotSign
+                    })
+                    .ToList()
+                }).Where(x => x.UnReadCanReadTaskCount > 0);
+
+                var pageList = await visitTaskQuery.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrWhiteSpace(inQuery.SortField) ? nameof(IRUnReadSubjectView.UnReadCanReadTaskCount) : inQuery.SortField, inQuery.Asc);
+
+                return pageList;
+            }
 
-            return (count, result);
         }
 
 

IRaCIS.Core.Application/Service/Allocation/_MapConfig.cs

@@ -74,7 +74,7 @@ namespace IRaCIS.Core.Application.Service
             CreateMap<TaskAllocationRule, TaskAllocationRuleDTO>()
             .ForMember(o => o.DoctorUser, t => t.MapFrom(u => u.Enroll.DoctorUser))
             .ForMember(o => o.CriterionReadingCategoryList, t => t.MapFrom(u => u.Enroll.EnrollReadingCategoryList.Select(t => new TrialCriterionReadingCategory() { EnrollId = t.EnrollId, ReadingCategory = t.ReadingCategory, TrialReadingCriterionId = t.TrialReadingCriterionId })))
-            .ForMember(o => o.TrialReadingCriterionList, t => t.MapFrom(u => u.Trial.ReadingQuestionCriterionTrialList.Where(t => t.IsConfirm)))
+            .ForMember(o => o.TrialReadingCriterionList, t => t.MapFrom(u => u.Trial.TrialReadingCriterionList.Where(t => t.IsConfirm)))
             .ForMember(o => o.ReadingCategoryList, t => t.MapFrom(u => u.Enroll.EnrollReadingCategoryList.Where(t=>t.TrialReadingCriterionId== trialReadingCriterionId).OrderBy(t => t.ReadingCategory).Select(t => t.ReadingCategory).ToList()))
             ;
 

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

@@ -21,7 +21,7 @@ namespace IRaCIS.Application.Services
 
         Task SiteSurveyRejectEmail(MimeMessage messageToSend);
 
-        Task SenMFAVerifyEmail(Guid userId, string userName, string emailAddress, int verificationCode);
+        Task SenMFAVerifyEmail(Guid userId, string userName, string emailAddress, int verificationCode, UserMFAType mfaType = UserMFAType.Login);
 
         Task SendMailEditEmail(Guid userId, string userName, string emailAddress, int verificationCode);
 
@@ -94,7 +94,7 @@ namespace IRaCIS.Application.Services
         }
 
         //MFA 
-        public async Task SenMFAVerifyEmail(Guid userId, string userName, string emailAddress, int verificationCode)
+        public async Task SenMFAVerifyEmail(Guid userId, string userName, string emailAddress, int verificationCode, UserMFAType mfaType = UserMFAType.Login)
         {
             var messageToSend = new MimeMessage();
             //发件地址
@@ -103,7 +103,7 @@ namespace IRaCIS.Application.Services
             messageToSend.To.Add(new MailboxAddress(userName, emailAddress));
             //主题
             //---[来自{0}] 关于MFA邮箱验证的提醒
-            messageToSend.Subject = _localizer["Mail_EmailMFATopic", _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN];
+            messageToSend.Subject = _localizer[mfaType == UserMFAType.Login? "Mail_EmailMFALoginTopic":"Mail_EmailMFAUnlockTopic", _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN];
 
             var builder = new BodyBuilder();
 
@@ -123,7 +123,7 @@ namespace IRaCIS.Application.Services
                 builder.HtmlBody = string.Format(ReplaceCompanyName(templateInfo),
 
                     userName,
-                    _localizer["Mail_MFAEmail"],
+                    _localizer[mfaType == UserMFAType.Login ? "Mail_EmailMFALoginEmail": "Mail_EmailMFAUnlockEmail"],
                     verificationCode
                     );
             }

IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DicomSeriesModel.cs

@@ -46,8 +46,8 @@ namespace IRaCIS.Core.Application.Contracts.Dicom.DTO
 
 
         //存放在instance 上面
-        public string WindowCenter { get; set; } = string.Empty;
+        public string? WindowCenter => InstanceInfoList.FirstOrDefault()?.WindowCenter;
-        public string WindowWidth { get; set; } = string.Empty;
+        public string? WindowWidth => InstanceInfoList.FirstOrDefault()?.WindowWidth;
 
         public string ImageResizePath { get; set; } 
     }
@@ -68,6 +68,10 @@ namespace IRaCIS.Core.Application.Contracts.Dicom.DTO
         public int ShowOrder { get; set; }
         [JsonIgnore]
         public decimal RowIndex { get; set; }
+        [JsonIgnore]
+        public string WindowCenter { get; set; }
+        [JsonIgnore] 
+        public string WindowWidth { get; set; }
     }
 
     public class DicomSeriesWithLabelDTO : DicomSeriesDTO

IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs

@@ -6,6 +6,7 @@ using IRaCIS.Core.Application.Helper;
 using IRaCIS.Core.Application.Service.ImageAndDoc.DTO;
 using IRaCIS.Core.Domain.Share;
 using IRaCIS.Core.Infrastructure;
+using IRaCIS.Core.Infrastructure.Extention;
 using MassTransit;
 using MathNet.Numerics;
 using Medallion.Threading;
@@ -69,12 +70,18 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                 if (needDealTaskList.Count > 0)
                 {
                     //已完成的访视任务数量（包含重阅的）
-                    var haveFinishedTaskCount = await _visitTaskRepository.CountAsync(t => t.SubjectId == subjectId && t.TrialReadingCriterionId == trialReadingCriterionId && t.IsAnalysisCreate == false
+                    var haveFinishedTaskCount = await _visitTaskRepository.CountAsync(t => t.SubjectId == subjectId && t.TrialReadingCriterionId == trialReadingCriterionId && t.IsAnalysisCreate == false && t.DoctorUserId == _userInfo.Id
                     && t.ReadingTaskState == ReadingTaskState.HaveSigned && t.ReadingCategory == ReadingCategory.Visit);
 
-                    //随机赋值编号  比如要处理5个任务，实例化一个包含1-5的数组，每次随机取出一个
+                    //已经处理过的任务名称的数量
 
-                    List<int> availableNumbers = Enumerable.Range(haveFinishedTaskCount + 1, needDealTaskList.Count).ToList();
+                    var haveDealedTaskCount = await _visitTaskRepository.CountAsync(t => t.SubjectId == subjectId && t.TrialReadingCriterionId == trialReadingCriterionId && t.IsAnalysisCreate == false && t.DoctorUserId == _userInfo.Id
+                    && t.ReadingTaskState != ReadingTaskState.HaveSigned && t.ReadingCategory == ReadingCategory.Visit && t.TaskBlindName != "Timepoint");
+
+
+
+                    //随机赋值编号  比如要处理5个任务，实例化一个包含1-5的数组，每次随机取出一个
+                    List<int> availableNumbers = Enumerable.Range(haveDealedTaskCount + haveFinishedTaskCount + 1, needDealTaskList.Count).ToList();
                     Random rng = new Random();
                     foreach (var visitTask in needDealTaskList)
                     {
@@ -100,15 +107,14 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
         {
             await SubejctRandomReadingTaskNameDeal(subjectId, trialReadingCriterionId);
 
-            var query = _repository.Where<VisitTask>(t => t.SubjectId == subjectId &&t.TrialReadingCriterionId== trialReadingCriterionId && t.SourceSubjectVisitId != null && t.DoctorUserId == _userInfo.Id)
+            var query = _repository.Where<VisitTask>(t => t.SubjectId == subjectId && t.TrialReadingCriterionId == trialReadingCriterionId && t.SourceSubjectVisitId != null 
+            && t.DoctorUserId == _userInfo.Id && t.TaskState==TaskState.Effect)
                 .Select(u => new SubjectImageUploadDTO()
                 {
                     VisitTaskId = u.Id,
 
                     SubejctId = u.SubjectId,
 
-
-
                     TrialSiteId = u.Subject.TrialSiteId,
 
                     IsImageFilter = u.TrialReadingCriterion.IsImageFilter,
@@ -122,7 +128,9 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                     SourceSubjectVisitId = u.SourceSubjectVisitId,
                     PackState = u.SourceSubjectVisit.PackState,
 
-                    OrginalStudyList = u.SourceSubjectVisit.StudyList.Select(t => new StudyBasicInfo()
+                    OrginalStudyList = u.SourceSubjectVisit.StudyList
+                    .Where(t => u.TrialReadingCriterion.IsImageFilter ?("|"+u.TrialReadingCriterion.CriterionModalitys+"|").Contains("|"+t.ModalityForEdit+"|" ) : true)
+                    .Select(t => new StudyBasicInfo()
                     {
                         Id = t.Id,
                         StudyInstanceUid = t.StudyInstanceUid,

IRaCIS.Core.Application/Service/Management/Interface/IUserService.cs

@@ -12,7 +12,7 @@ namespace IRaCIS.Application.Services
         Task<IResponseOutput<LoginReturnDTO>> Login(string userName, string password);
         Task<IResponseOutput> VerifyMFACodeAsync(Guid userId, string Code);
 
-        Task<IResponseOutput> SendMFAEmail(Guid userId);
+        Task<IResponseOutput> SendMFAEmail(Guid userId, int mfaType=0);
         Task<UserBasicInfo> GetUserBasicInfo(Guid userId,string pwd);
         Task<IResponseOutput> ModifyPassword(EditPasswordCommand editPwModel);
         Task<IResponseOutput> ResetPassword(Guid userId);

IRaCIS.Core.Application/Service/Management/UserService.cs

@@ -653,15 +653,16 @@ namespace IRaCIS.Application.Services
         /// 发送MFA 验证邮件
         /// </summary>
         /// <param name="userId"></param>
+        /// <param name="mfaType"></param>
         /// <returns></returns>
         [AllowAnonymous]
-        public async Task<IResponseOutput> SendMFAEmail(Guid userId)
+        public async Task<IResponseOutput> SendMFAEmail(Guid userId, int mfaType )
         {
             var userInfo = await _userRepository.Where(u => u.Id == userId).Select(t => new { t.FullName, t.EMail }).FirstOrDefaultAsync();
 
             int verificationCode = new Random().Next(100000, 1000000);
 
-            await _mailVerificationService.SenMFAVerifyEmail(userId, userInfo.FullName, userInfo.EMail, verificationCode);
+            await _mailVerificationService.SenMFAVerifyEmail(userId, userInfo.FullName, userInfo.EMail, verificationCode, (UserMFAType)mfaType );
 
             return ResponseOutput.Ok();
         }
@@ -811,7 +812,8 @@ namespace IRaCIS.Application.Services
 
             await _userRepository.BatchUpdateNoTrackingAsync(x => x.Id == loginUser.Id, x => new User()
             {
-                LastLoginIP = _userInfo.IP
+                LastLoginIP = _userInfo.IP,
+                LastLoginTime= DateTime.Now
 
             });
 

IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyFileViewModel.cs

@@ -20,7 +20,9 @@ namespace IRaCIS.Core.Application.Contracts
 
         public string FullFilePath => Path;
 
-        public string PreviewPath => "/Common/LocalFilePreview?relativePath=" + Path;
+        public string FileType { get; set; }
+
+        //public string PreviewPath => "/Common/LocalFilePreview?relativePath=" + Path;
 
     }
 

IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyViewModel.cs

@@ -17,7 +17,7 @@ namespace IRaCIS.Core.Application.Contracts
 
         public List<NoneDicomStudyFileView> NoneDicomStudyFileList { get; set; } = new List<NoneDicomStudyFileView>();
 
-        public List<string> NoneDicomStudyFilePreviewList => NoneDicomStudyFileList.Select(t=>  t.PreviewPath).ToList();
+        //public List<string> NoneDicomStudyFilePreviewList => NoneDicomStudyFileList.Select(t=>  t.PreviewPath).ToList();
 
     }
 

IRaCIS.Core.Application/Service/QC/Interface/INoneDicomStudyService.cs

@@ -16,7 +16,7 @@ namespace IRaCIS.Core.Application.Contracts
         Task<IResponseOutput> DeleteNoneDicomStudy(Guid noneDicomStudyId, Guid subjectVisitId);
         Task<IResponseOutput> DeleteNoneDicomStudyFile(Guid noneDicomStudyFileId, Guid subjectVisitId);
         Task<List<NoneDicomStudyFileView>> GetNoneDicomStudyFileList(Guid noneDicomStudyId);
-        Task<List<NoneDicomStudyView>> GetNoneDicomStudyList(Guid subjectVisitId, Guid? sujectVisitId = null);
+        Task<List<NoneDicomStudyView>> GetNoneDicomStudyList(Guid subjectVisitId, Guid? sujectVisitId = null, bool isFilterZip=false);
         Task<List<NoneDicomStudyFileView>> GetVisitNoneDicomStudyFileList(Guid subjectVisitId);
         //Task<IResponseOutput> UploadNoneDicomFile(IFormCollection formCollection, Guid subjectVisitId, Guid noneDicomStudyId);
 

IRaCIS.Core.Application/Service/QC/NoneDicomStudyService.cs

@@ -37,12 +37,12 @@ namespace IRaCIS.Core.Application.Contracts
 
 
         [HttpGet]
-        public async Task<List<NoneDicomStudyView>> GetNoneDicomStudyList([FromQuery, NotDefault] Guid subjectVisitId, Guid? nonedicomStudyId)
+        public async Task<List<NoneDicomStudyView>> GetNoneDicomStudyList([FromQuery, NotDefault] Guid subjectVisitId, [FromQuery] Guid? nonedicomStudyId, [FromQuery] bool isFilterZip)
         {
 
             var noneDicomStudyQueryable = _noneDicomStudyRepository.Where(t => t.SubjectVisitId == subjectVisitId).WhereIf(nonedicomStudyId != null, t => t.Id == nonedicomStudyId)
 
-                .ProjectTo<NoneDicomStudyView>(_mapper.ConfigurationProvider, new { token = _userInfo.UserToken });
+                .ProjectTo<NoneDicomStudyView>(_mapper.ConfigurationProvider, new { isFilterZip = isFilterZip });
 
             return await noneDicomStudyQueryable.ToListAsync();
         }

IRaCIS.Core.Application/Service/QC/QCOperationService.cs

@@ -942,7 +942,8 @@ namespace IRaCIS.Core.Application.Image.QA
                        .OrderBy(x => x.VisitNum).FirstOrDefault();
                     if (subjectVisit != null)
                     {
-                        return new GetNextIQCQualityOutDto() { 
+                        return new GetNextIQCQualityOutDto()
+                        {
                             SubjectId = subjectVisit.SubjectId,
                             VisitId = subjectVisit.Id
                         };
@@ -1315,38 +1316,13 @@ namespace IRaCIS.Core.Application.Image.QA
                     return ResponseOutput.NotOk(_localizer["QCOperation_MissingBaselineDate"]);
                 }
 
-                //基线  且配置了临床数据  
+                if (_subjectVisitRepository.Where(t => t.Id == dbSubjectVisit.Id).Any(t => (t.StudyList.Count(t => t.ModalityForEdit == "") > 0 ||t.NoneDicomStudyList.Count(t => t.Modality == "")>0) && t.Trial.TrialReadingCriterionList.Count(t => t.IsImageFilter == true) > 0))
-                //if (trialConfig.ClinicalInformationTransmissionEnum != 0 /*&& dbSubjectVisit.IsBaseLine*//*&&dbSubjectVisit.ClinicalDataSignUserId==null*/)
+                {
-                //{
+                    //有标准配置了影像筛选，该受试者有检查未设置检查类型，不允许提交
+                    return ResponseOutput.NotOk(_localizer["QCOperation_MissingModality"]);
+                }
 
 
-                    ////找到需要确认的PDF 临床数据  如果没有CRC 没有上传  那么就添加一条没有文件的记录
-
-                    //var crcNeedConfirmClinicalDataSetList = clinicalDataConfirmList.Where(t => t.UploadRole == UploadRole.CRC && t.ClinicalUploadType == ClinicalUploadType.PDF).ToList();
-
-                    //// 找到CRC 已经自己添加的临床PDF数据文件
-
-                    //var crcAddClinicalDataIdList = _readingClinicalDataRepository.Where(t => t.ReadingId == dbSubjectVisit.Id && t.ClinicalDataTrialSet.UploadRole == UploadRole.CRC && t.ClinicalDataTrialSet.ClinicalUploadType == ClinicalUploadType.PDF)
-                    //    .Select(t => new { t.ClinicalDataTrialSetId }).ToList();
-
-                    //foreach (var crcNeedConfirmClinicalDataSet in crcNeedConfirmClinicalDataSetList)
-                    //{
-                    //    if (!crcAddClinicalDataIdList.Any(t => t.ClinicalDataTrialSetId == crcNeedConfirmClinicalDataSet.Id))
-                    //    {
-                    //        await _repository.AddAsync(new ReadingClinicalData()
-                    //        {
-                    //            TrialId = dbSubjectVisit.TrialId,
-                    //            SubjectId = dbSubjectVisit.SubjectId,
-                    //            ReadingId = dbSubjectVisit.Id,
-                    //            ClinicalDataTrialSetId = crcNeedConfirmClinicalDataSet.Id,
-                    //            IsVisit = true,
-                    //            IsSign = true,
-                    //            ReadingClinicalDataState = ReadingClinicalDataStatus.HaveSigned
-
-                    //        });
-                    //    }
-                    //}
-
                 //已确认临床数据完整性
                 dbSubjectVisit.IsConfirmedClinicalData = true;
 
@@ -1368,27 +1344,6 @@ namespace IRaCIS.Core.Application.Image.QA
                 });
 
 
-
-                    //var signSuccess = await _repository.UpdateFromQueryAsync<TrialSign>(t => t.Id == cRCRequestToQCCommand.SignId, u => new TrialSign() { IsCompleted = true });
-
-
-                    ////现在修改为  提交时 设置签名信息
-                    //dbSubjectVisit.ClinicalDataSignUserId = _userInfo.Id;
-                    //dbSubjectVisit.ClinicalDataSignTime = DateTime.Now;
-
-                    //那么没有录入 不允许提交
-                    //if (!await _repository.AnyAsync<SubjectVisit>(t => t.PreviousHistoryList.Any() || t.PreviousOtherList.Any() || t.PreviousSurgeryList.Any()))
-                    //{
-                    //    return ResponseOutput.NotOk("没有临床数据，不允许提交");
-                    //}
-
-                    //return ResponseOutput.NotOk("没有签名临床数据，不允许提交");
-                //}
-
-
-
-
-
                 var maxVisit = await _subjectVisitRepository.Where(t => t.SubjectId == dbSubjectVisit.SubjectId && t.SubmitState == SubmitStateEnum.Submitted)
                     .OrderByDescending(t => t.VisitNum).Select(t => new { t.Id, t.VisitNum }).FirstOrDefaultAsync();
 
@@ -1464,14 +1419,7 @@ namespace IRaCIS.Core.Application.Image.QA
                     dbSubjectVisit.IsUrgent = true;
 
 
-                    ////PD确认的紧急会把前面所有未QC完成的访视均标记为紧急
 
-                    //var previosSVlist = await _subjectVisitRepository.Where(t => t.SubjectId == dbSubjectVisit.SubjectId && t.VisitNum < dbSubjectVisit.VisitNum && t.IsUrgent == false && t.SubmitState == SubmitStateEnum.Submitted, true).ToListAsync();
-
-                    //previosSVlist.ForEach(t =>
-                    //{
-                    //    t.IsUrgent = true;
-                    //});
                 }
 
 

IRaCIS.Core.Application/Service/QC/_MapConfig.cs

@@ -254,6 +254,7 @@ namespace IRaCIS.Core.Application.Service
 
 
 
+            bool isFilterZip = false;
 
             string token = string.Empty;
             //一致性核查
@@ -560,7 +561,7 @@ namespace IRaCIS.Core.Application.Service
 
             CreateMap<NoneDicomStudy, NoneDicomStudyView>()
                 //.ForMember(d => d.FileCount, u => u.MapFrom(s => s.NoneDicomFileList.Count))
-                .ForMember(d => d.NoneDicomStudyFileList, u => u.MapFrom(s => s.NoneDicomFileList))
+                .ForMember(d => d.NoneDicomStudyFileList, u => u.MapFrom(s => isFilterZip? s.NoneDicomFileList.Where(t=>!t.FileType.Contains(StaticData.FileType.Zip)): s.NoneDicomFileList))
                 .ForMember(d => d.CodeView, u => u.MapFrom(s => s.StudyCode));
 
 

IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs

@@ -299,6 +299,13 @@ namespace IRaCIS.Application.Services
                 };
 
             }
+
+            if (inDto.FilterNoneForm)
+            {
+                cRCClinicalDataList = cRCClinicalDataList.Where(x => !(x.ClinicalFromList.Count() == 0 && x.ClinicalUploadType == ClinicalUploadType.Structuring)).ToList();
+
+			}
+
             return cRCClinicalDataList;
         }
 

IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs

@@ -158,6 +158,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
 		public Guid? StudyId { get; set; }
 
+		public bool FilterNoneForm { get; set; } = false;
+
 
 	}
 

IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs

@@ -7,6 +7,7 @@ using Panda.DynamicWebApi.Attributes;
 using IRaCIS.Core.Application.Contracts;
 using IRaCIS.Core.Infrastructure;
 using Newtonsoft.Json;
+using IRaCIS.Core.Domain.Models;
 
 namespace IRaCIS.Application.Services
 {
@@ -1093,7 +1094,7 @@ namespace IRaCIS.Application.Services
 
 
                     await _readingTableQuestionTrialRepository.BatchDeleteNoTrackingAsync(x => x.TrialCriterionId == trialCriterion.Id);
-                    await _readingTableQuestionTrialRepository.AddRangeAsync(needAddTableDatas);
+                    await _readingTableQuestionTrialRepository.AddRangeAsync(_mapper.Map<List<ReadingTableQuestionTrial>>(needAddTableDatas));
 					#endregion
 
 				}

IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs

@@ -990,7 +990,8 @@ namespace IRaCIS.Application.Services
             var questionMark = await _readingTaskQuestionMarkRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId).ProjectTo<GetTableAnswerRowInfoOutDto>(_mapper.ConfigurationProvider).ToListAsync();
 
 
-            questionMark.ForEach(x => {
+            questionMark.ForEach(x =>
+            {
 
                 x.IsFirstChangeTask = x.VisitTaskId == inDto.VisitTaskId;
             });
@@ -1824,7 +1825,8 @@ namespace IRaCIS.Application.Services
             if (tumorAnswer != null)
             {
                 var isConvertedTask = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).Select(x => x.IsConvertedTask).FirstOrDefaultAsync();
-                var reportVerify = await _readingCalculateService.GetReportVerify(new GetReportVerifyInDto() { 
+                var reportVerify = await _readingCalculateService.GetReportVerify(new GetReportVerifyInDto()
+                {
                     BeforeConvertedTaskId = taskInfo.BeforeConvertedTaskId,
                     IsConvertTask = isConvertedTask,
                     VisitTaskId = inDto.VisitTaskId
@@ -1899,7 +1901,8 @@ namespace IRaCIS.Application.Services
                 var datetime = DateTime.Now;
 
                 var markList = _mapper.Map<List<QuestionMarkInfo>, List<ReadingTaskQuestionMark>>(inDto.QuestionMarkInfoList);
-                markList.ForEach(x => {
+                markList.ForEach(x =>
+                {
                     x.Id = NewId.NextGuid();
                     x.VisitTaskId = inDto.VisitTaskId;
                     x.CreateTime = datetime;
@@ -2741,16 +2744,14 @@ namespace IRaCIS.Application.Services
             }
             else if (inDto.SubjectId != null && trialReadingCriterion.IsReadingTaskViewInOrder == ReadingOrder.InOrder)
             {
-                var subjectTaskList = (await _visitTaskService.GetOrderReadingIQueryable(new GetOrderReadingIQueryableInDto()
+                var subjectTaskList = (await _visitTaskService.GetSubjectReadingIQueryable(new GetReadingIQueryableInDto()
                 {
                     TrialId = inDto.TrialId,
                     TrialReadingCriterionId = trialReadingCriterionId!.Value,
-                    Page = new PageInput()
-                    {
                     PageIndex = 1,
                     PageSize = 99999,
-                    }
+
-                })).Item2;
+                })).CurrentPageData;
 
                 var index = 0;
                 subjectTaskList.ForEach(x =>
@@ -2783,6 +2784,46 @@ namespace IRaCIS.Application.Services
 
 
 
+            }
+            else if (inDto.SubjectId != null && trialReadingCriterion.IsReadingTaskViewInOrder == ReadingOrder.SubjectRandom)
+            {
+                var subjectTaskList = (await _visitTaskService.GetSubjectReadingIQueryable(new GetReadingIQueryableInDto()
+                {
+                    TrialId = inDto.TrialId,
+                    SubjectId = inDto.SubjectId,
+                    TrialReadingCriterionId = trialReadingCriterionId!.Value,
+
+                    PageIndex = 1,
+                    PageSize = 99999,
+
+                })).CurrentPageData;
+
+                if (subjectTaskList.Count() == 0)
+                {
+                    throw new BusinessValidationFailedException(_localizer["ReadingImage_TaskFinish"], ApiResponseCodeEnum.CloseCurrentWindows);
+                }
+
+                var taskList = subjectTaskList.FirstOrDefault()!.UnReadCanReadTaskList;
+
+                Random random = new Random();
+                //返回的范围是 0- taskList.Count-1
+                int randomIndex = random.Next(taskList.Count);
+             
+                var visitTaskId = taskList[randomIndex].Id;
+
+				task = await _visitTaskRepository.Where(x=>x.Id== visitTaskId).Select(x => new GetReadingTaskDto()
+				{
+					VisitTaskId = x.Id,
+					ArmEnum = x.ArmEnum,
+					TaskBlindName = x.TaskBlindName,
+					ReadingCategory = x.ReadingCategory,
+					VisistId = x.SourceSubjectVisitId != null ? x.SourceSubjectVisitId.Value : x.ReadModule == null ? default(Guid) : x.ReadModule.SubjectVisitId,
+					VisitNum = x.VisitTaskNum,
+					SubjectId = x.SubjectId,
+					SubjectCode = x.Subject.Code,
+					TrialReadingCriterionId = x.TrialReadingCriterionId,
+				}).FirstOrDefaultAsync();
+
 			}
             else
             {

IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingNoDicomTaskService.cs

@@ -66,7 +66,7 @@ namespace IRaCIS.Application.Services
         /// <param name="inDto"></param>
         /// <returns></returns>
         [HttpPost]
-        public async Task<(List<NoneDicomStudyView>, object)> GetReadingImageFile(GetReadingImgInDto inDto)
+        public async Task<IResponseOutput<List<NoneDicomStudyView>> > GetReadingImageFile(GetReadingImgInDto inDto)
         {
             var task = await GetNextTask(new GetNextTaskInDto()
             {
@@ -84,8 +84,8 @@ namespace IRaCIS.Application.Services
                 // 阅片期取前面所有的图像
                 visitIds.AddRange(await _subjectVisitRepository.Where(x => x.VisitNum <= task.VisitNum && x.SubjectId == task.SubjectId).Select(x => x.Id).ToListAsync());
             }
-            List<NoneDicomStudyView> result = await _noneDicomStudyRepository.Where(t => visitIds.Contains(t.SubjectVisitId))
+            List<NoneDicomStudyView> result = await _noneDicomStudyRepository.Where(t => visitIds.Contains(t.SubjectVisitId) && t.NoneDicomFileList.Any(t=>!t.FileType.Contains(StaticData.FileType.Zip)))
-                .ProjectTo<NoneDicomStudyView>(_mapper.ConfigurationProvider, new { token = _userInfo.UserToken }).ToListAsync();
+                .ProjectTo<NoneDicomStudyView>(_mapper.ConfigurationProvider, new { isFilterZip = true }).ToListAsync();
 
             var taskinfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisistTaskId).FirstNotNullAsync();
 
@@ -121,7 +121,7 @@ namespace IRaCIS.Application.Services
 
             var taskInfo = await _visitTaskRepository.Where(x => x.Id == task.VisitTaskId).FirstNotNullAsync();
 
-            return (result, new
+            return ResponseOutput.Ok (result, new
             {
                 VisitTaskId = task.VisitTaskId,
                 SubjectId = task.SubjectId,

IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadingPeriodSetService.cs

@@ -500,7 +500,7 @@ namespace IRaCIS.Application.Services
             var existsBubjectVisitsQuery = _readModuleRepository.Where(y => y.ReadingSetType == inDto.ReadingSetType && y.TrialId == inDto.TrialId && y.TrialReadingCriterionId == inDto.TrialReadingCriterionId).Select(x => x.SubjectVisitId);
 
             visitQuery = visitQuery.Where(x => !existsBubjectVisitsQuery.Contains(x.Id))
-                .WhereIf(inDto.ExpirationDate != null, x => x.LatestScanDate <= inDto.ExpirationDate.Value)
+                .WhereIf(inDto.ExpirationDate != null, x => x.LatestScanDate < inDto.ExpirationDate.Value.AddDays(1))
                 .WhereIf(inDto.ExpirationVisitNum != null, x => x.VisitNum == inDto.ExpirationVisitNum)
                 .WhereIf(inDto.ReadingSetType == ReadingSetType.TumorReading, x => readModulequery.Where(y => y.SubjectVisitId == x.Id && y.ReadingSetType == ReadingSetType.ImageReading).Count() > 0);
 

IRaCIS.Core.Application/Service/Reading/_MapConfig.cs

@@ -232,6 +232,9 @@ namespace IRaCIS.Core.Application.Service
             CreateMap<ReadingTableQuestionTrial, ReadingTrialTableQuestionData>()
                 .ForMember(d => d.OriginalId, u => u.MapFrom(s => s.Id));
 
+            CreateMap<ReadingTrialTableQuestionData, ReadingTableQuestionTrial>();
+
+
 			CreateMap<ReadingQuestionCriterionSystem, ReadingQuestionCriterionTrial>()
                  .ForMember(dest => dest.ReadingQuestionTrialList, opt => opt.Ignore())
                  .ForMember(d => d.ReadingQuestionCriterionSystemId, u => u.MapFrom(s => s.Id)); ;

IRaCIS.Core.Application/Service/SiteSurvey/DTO/TrialSiteSurveyViewModel.cs

@@ -5,6 +5,7 @@
 //--------------------------------------------------------------------
 
 using System.ComponentModel.DataAnnotations;
+using System.Text.Json.Serialization;
 using IRaCIS.Core.Domain.Share;
 namespace IRaCIS.Core.Application.Contracts
 {
@@ -30,6 +31,8 @@ namespace IRaCIS.Core.Application.Contracts
 
         public string TrialSiteSurveyEquipmentType { get; set; } = string.Empty;
 
+        public string Modalitys { get; set; }
+
         public List<TrialSiteForSelect> TrialSiteSelectList { get; set; } = new List<TrialSiteForSelect>();
 
     }
@@ -67,6 +70,9 @@ namespace IRaCIS.Core.Application.Contracts
         public List<TrialSiteEquipmentSurveyView> TrialSiteEquipmentSurveyList { get; set; } = new List<TrialSiteEquipmentSurveyView>();
 
         public List<TrialSiteUserSurveyView> TrialSiteUserSurveyList { get; set; } = new List<TrialSiteUserSurveyView>();
+
+
+        public SiteSurveyFiledConfig SiteSurveyFiledConfig { get; set; }
     }
 
     public class TrialSiteUserSurveyAllDTO : TrialSiteUserSurveyView

IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs

@@ -22,6 +22,8 @@ using IRaCIS.Core.Domain.Models;
 using IRaCIS.Core.Application.ViewModel;
 using Medallion.Threading;
 using Microsoft.Extensions.Options;
+using NPOI.SS.Formula.Functions;
+using Newtonsoft.Json;
 
 namespace IRaCIS.Core.Application.Contracts
 {
@@ -386,10 +388,12 @@ namespace IRaCIS.Core.Application.Contracts
             }
 
 
-
-
             var result = await _trialSiteSurveyRepository.Where(t => t.Id == trialSiteSurveyId && t.TrialId == trialId).IgnoreQueryFilters()
-                .ProjectTo<LoginReturnDTO>(_mapper.ConfigurationProvider).FirstOrDefaultAsync().IfNullThrowException();
+                .ProjectTo<LoginReturnDTO>(_mapper.ConfigurationProvider, new {  isEn_Us = _userInfo.IsEn_Us }).FirstOrDefaultAsync().IfNullThrowException();
+
+            var siteSurveryConfig = _trialSiteSurveyRepository.Where(t => t.Id == trialSiteSurveyId).Select(t => t.Trial.SiteSurveyConfigJsonStr).FirstOrDefault()??string.Empty;
+
+            result.SiteSurveyFiledConfig = JsonConvert.DeserializeObject<SiteSurveyFiledConfig>(siteSurveryConfig) ?? new SiteSurveyFiledConfig();
             return result;
         }
 

IRaCIS.Core.Application/Service/SiteSurvey/_MapConfig.cs

@@ -39,10 +39,9 @@ namespace IRaCIS.Core.Application.AutoMapper
                  .ForMember(d => d.IsJoin, u => u.MapFrom(c => !c.IsDeleted));
 
 
-
             //列表
             CreateMap<TrialSiteEquipmentSurvey, TrialSiteEquipmentSurveyView>()
-                .ForMember(t => t.EquipmentType, u => u.MapFrom(d => d.EquipmentType.Value));
+                .ForMember(t => t.EquipmentType, u => u.MapFrom(d => isEn_Us? d.EquipmentType.Value: d.EquipmentType.ValueCN));
 
 
 

IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs

@@ -504,7 +504,7 @@ namespace IRaCIS.Core.Application.Contracts
 
         public string CriterionModalitys { get; set; }
 
-        public ReadingImageDownload? ImageDownloadEnum { get; set; }
+        public ReadingImageDownload ImageDownloadEnum { get; set; }
 
         public ReadingImageUpload? ImageUploadEnum { get; set; }
 
@@ -870,9 +870,9 @@ namespace IRaCIS.Core.Application.Contracts
         public bool IsImageFilter { get; set; }
         public string CriterionModalitys { get; set; }
 
-        public ReadingImageDownload? ImageDownloadEnum { get; set; }
+        public ReadingImageDownload ImageDownloadEnum { get; set; }
 
-        public ReadingImageUpload? ImageUploadEnum { get; set; }
+        public ReadingImageUpload ImageUploadEnum { get; set; }
 
 
         //是否附加评估

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

@@ -1465,7 +1465,7 @@ namespace IRaCIS.Core.Application
              .WhereIf(!string.IsNullOrEmpty(inQuery.ResearchProgramNo), o => o.ResearchProgramNo.Contains(inQuery.ResearchProgramNo))
              .WhereIf(!string.IsNullOrWhiteSpace(inQuery.ExperimentName), o => o.ExperimentName.Contains(inQuery.ExperimentName))
              .WhereIf(_userInfo.UserTypeEnumInt != (int)UserTypeEnum.SuperAdmin && _userInfo.UserTypeEnumInt != (int)UserTypeEnum.Admin && _userInfo.UserTypeEnumInt != (int)UserTypeEnum.OP, t => t.TrialUserList.Any(t => t.UserId == _userInfo.Id && t.IsDeleted == false) && t.IsDeleted == false)
-             .WhereIf(inQuery.CriterionType != null, o => o.ReadingQuestionCriterionTrialList.Any(t=>t.CriterionType==inQuery.CriterionType && t.IsSigned && t.IsConfirm))
+             .WhereIf(inQuery.CriterionType != null, o => o.TrialReadingCriterionList.Any(t=>t.CriterionType==inQuery.CriterionType && t.IsSigned && t.IsConfirm))
              .WhereIf(!string.IsNullOrEmpty(inQuery.PM_EMail), o => o.TrialUserList.Any(t => t.User.EMail.Contains(inQuery.PM_EMail) && (t.User.UserTypeEnum == UserTypeEnum.ProjectManager || t.User.UserTypeEnum == UserTypeEnum.APM)))
              .Select(t => new TrialToBeDoneDto()
              {
@@ -1525,7 +1525,7 @@ namespace IRaCIS.Core.Application
                     .Where(u => u.CurrentActionUserId == null && (u.PreliminaryAuditUserId == null || (u.PreliminaryAuditUserId != _userInfo.Id && u.ReviewAuditUserId == null))).Count() : 0,
 
 
-                 IR_ReadingCriterionList =isIR ? t.ReadingQuestionCriterionTrialList.Where(t=>t.IsConfirm && t.IsSigned).OrderBy(t => t.CriterionName).Select(t=>t.CriterionName).ToList():null,
+                 IR_ReadingCriterionList =isIR ? t.TrialReadingCriterionList.Where(t=>t.IsConfirm && t.IsSigned).OrderBy(t => t.CriterionName).Select(t=>t.CriterionName).ToList():null,
 
                  IR_PMEmailList= isIR ? t.TrialUserList.Where(t=>t.User.UserTypeEnum==UserTypeEnum.ProjectManager || t.User.UserTypeEnum == UserTypeEnum.APM).OrderBy(t => t.User.EMail).Select(t => t.User.EMail).ToList() : null,
 

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

@@ -115,7 +115,7 @@ namespace IRaCIS.Core.Application.Services
         {
            var list= _siteRepository
                 .WhereIf(!string.IsNullOrWhiteSpace(siteName), t => t.SiteName.Contains(siteName) || t.SiteNameCN.Contains(siteName) || t.AliasName.Contains(siteName))
-                .Select(t => new TrialSiteSelect() { SiteId = t.Id, SiteName = t.SiteName, AliasName = t.AliasName }).ToList();
+                .Select(t => new TrialSiteSelect() { SiteId = t.Id, SiteName = _userInfo.IsEn_Us? t.SiteName:t.SiteNameCN, AliasName = t.AliasName }).ToList();
 
             return list;
         }
@@ -131,6 +131,14 @@ namespace IRaCIS.Core.Application.Services
         {
             var addArray = _mapper.Map<List<TrialSite>>(trialSites);
 
+            foreach (var item in addArray)
+            {
+                if (item.IsDeleted==false)
+                {
+                    item.EnabledTime = DateTime.Now;
+                }
+            }
+
             await _repository.AddRangeAsync(addArray);
 
 
@@ -197,7 +205,7 @@ namespace IRaCIS.Core.Application.Services
                 dbEntity.EnabledTime = null;
                
             }
-            else
+            else if (editTrialSiteCommand.IsDeleted==false && dbEntity.EnabledTime==null)
             {
                 dbEntity.EnabledTime = DateTime.Now;
             }

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

@@ -66,7 +66,7 @@ namespace IRaCIS.Core.Application.Service
             var userTypeEnumInt = 0;
             var isEn_Us = false;
             CreateMap<Trial, TrialDetailDTO>()
-                .ForMember(x=>x.CriterionList,y=>y.MapFrom(z=>z.ReadingQuestionCriterionTrialList.Where(n=>n.IsConfirm).Select(m=>m.CriterionName)))
+                .ForMember(x => x.CriterionList, y => y.MapFrom(z => z.TrialReadingCriterionList.Where(n => n.IsConfirm).Select(m => m.CriterionName)))
                 .ForMember(d => d.DictionaryList, u => u.MapFrom(s => s.TrialDicList.Select(t => t.Dictionary).OrderBy(t => t.ShowOrder)))
                 //.ForMember(d => d.Code, u => u.MapFrom(s => s.TrialCode))
                 .ForMember(d => d.Sponsor, u => u.MapFrom(s => s.Sponsor.SponsorName))
@@ -120,20 +120,8 @@ namespace IRaCIS.Core.Application.Service
 
             #region  site 也有country  hospital 也有  注意区分
             CreateMap<TrialSite, SiteStatDTO>()
-           //.ForMember(d => d.SiteCode, u => u.MapFrom(s => s.Site.SiteCode))
-           //.ForMember(d => d.City, u => u.MapFrom(s => s.Site.City))
-           //.ForMember(d => d.Country, u => u.MapFrom(s => s.Site.Country))
-           //.ForMember(d => d.Hospital, u => u.MapFrom(s => s.Site.Hospital.HospitalName))
-
-
-           //.ForMember(d => d.DirectorName, u => u.MapFrom(s => s.Site.DirectorName))
-           //.ForMember(d => d.DirectorPhone, u => u.MapFrom(s => s.Site.DirectorPhone))
-           //.ForMember(d => d.ContactPhone, u => u.MapFrom(s => s.Site.ContactPhone))
-           //.ForMember(d => d.Address, u => u.MapFrom(s => s.Site.Address))
-           //.ForMember(d => d.Site, u => u.MapFrom(s => s.Site.SiteName))
-
-
 
+            .ForMember(d => d.TrialSiteId, u => u.MapFrom(s => s.Id))
             .ForMember(d => d.VisitCount, u => u.MapFrom(s => s.SubjectVisitList.Count()))
              .ForMember(d => d.SubjectCount, u => u.MapFrom(s => s.SubjectList.Count()))
            .ForMember(d => d.UserCount, u => u.MapFrom(s => s.CRCUserList.Count()))
@@ -170,8 +158,8 @@ namespace IRaCIS.Core.Application.Service
 
 
             CreateMap<Domain.Models.Trial, TrialConfigDTO>().ForMember(t => t.TrialId, u => u.MapFrom(c => c.Id))
-                    .ForMember(t => t.TrialCriterionIds, u => u.MapFrom(c => c.ReadingQuestionCriterionTrialList.Where(v =>v.IsConfirm).OrderBy(x=>x.ShowOrder).Select(r => r.Id)))
+                    .ForMember(t => t.TrialCriterionIds, u => u.MapFrom(c => c.TrialReadingCriterionList.Where(v => v.IsConfirm).OrderBy(x => x.ShowOrder).Select(r => r.Id)))
-                    .ForMember(t => t.TrialCriterionNames, u => u.MapFrom(c => c.ReadingQuestionCriterionTrialList.Where(v => v.IsConfirm).OrderBy(x => x.ShowOrder).Select(r => r.CriterionName)))
+                    .ForMember(t => t.TrialCriterionNames, u => u.MapFrom(c => c.TrialReadingCriterionList.Where(v => v.IsConfirm).OrderBy(x => x.ShowOrder).Select(r => r.CriterionName)))
                     .ForMember(t => t.ClinicalDataTrialSetIds, u => u.MapFrom(c => c.clinicalDataTrialSets.Where(v => v.IsConfirm).Select(r => r.Id)))
                     .ForMember(t => t.ClinicalDataSetNames, u => u.MapFrom(c => c.clinicalDataTrialSets.Where(v => v.IsConfirm).Select(r => isEn_Us ? r.ClinicalDataSetEnName : r.ClinicalDataSetName)))
                     //.ForMember(t => t.CriterionIds, u => u.MapFrom(c => c.TrialDicList.Where(v => v.KeyName == StaticData.Criterion).Select(r => r.DictionaryId)))

IRaCIS.Core.Application/Service/Visit/DTO/VisitPointViewModel.cs

@@ -188,7 +188,7 @@ namespace IRaCIS.Core.Application.Contracts
     {
         public Guid TrialId { get; set; }
         public Guid SujectVisitId { get; set; }
-        public Guid? VisitTaskId { get; set; }
+        public Guid VisitTaskId { get; set; }
     }
 
 
@@ -264,7 +264,7 @@ namespace IRaCIS.Core.Application.Contracts
 
         public bool IsCriticalSequence { get; set; } = false;
 
-        public int SeriesCount { get; set; }
+        public int SeriesCount =>SeriesList.Count;
         public int InstanceCount { get; set; }
 
         public bool IsDicom { get; set; } = true;

IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs

@@ -15,6 +15,7 @@ using IRaCIS.Application.Services;
 using Microsoft.Extensions.DependencyInjection;
 using DocumentFormat.OpenXml.Drawing.Charts;
 using IRaCIS.Core.Domain.Models;
+using NPOI.SS.Formula.Functions;
 
 namespace IRaCIS.Core.Application.Services
 {
@@ -263,7 +264,7 @@ namespace IRaCIS.Core.Application.Services
             {
                 InstanceCount = k.InstanceCount,
                 Modalities = k.Modalities,
-                SeriesCount = k.SeriesCount,
+                //SeriesCount = k.SeriesCount,
                 StudyCode = k.StudyCode,
                 StudyId = k.Id
             }).ToListAsync();
@@ -297,7 +298,7 @@ namespace IRaCIS.Core.Application.Services
                 );
 
                 //设置为阅片与否 不更改数据库检查  的instance数量 和 SeriesCount  所以这里要实时统计
-                t.SeriesCount = t.SeriesList.Count;
+                //t.SeriesCount = t.SeriesList.Count;
                 t.InstanceCount = t.SeriesList.SelectMany(t => t.InstanceInfoList).Count();
             }
 
@@ -338,8 +339,8 @@ namespace IRaCIS.Core.Application.Services
 
 
 
-            series.WindowWidth = instanceList.FirstOrDefault()!.WindowWidth;
+            //series.WindowWidth = instanceList.FirstOrDefault()!.WindowWidth;
-            series.WindowCenter = instanceList.FirstOrDefault()!.WindowCenter;
+            //series.WindowCenter = instanceList.FirstOrDefault()!.WindowCenter;
 
             return series;
         }
@@ -445,8 +446,8 @@ namespace IRaCIS.Core.Application.Services
 
 
 
-                    series.WindowWidth = instanceList.FirstOrDefault()!.WindowWidth;
+                    //series.WindowWidth = instanceList.FirstOrDefault()!.WindowWidth;
-                    series.WindowCenter = instanceList.FirstOrDefault()!.WindowCenter;
+                    //series.WindowCenter = instanceList.FirstOrDefault()!.WindowCenter;
                 });
             }
 
@@ -480,8 +481,99 @@ namespace IRaCIS.Core.Application.Services
         [HttpPost]
         public async Task<List<VisitStudyDTO>> GetReadingVisitStudyList(GetReadingVisitStudyListIndto indto)
         {
-            var result = new List<VisitStudyDTO>();
 
+            var studyList = new List<VisitStudyDTO>();
+
+            var taskInfo = await _visitTaskRepository.Where(x => x.Id == indto.VisitTaskId).Select(t => new { t.TrialReadingCriterionId, t.TrialReadingCriterion.IsImageFilter, t.TrialReadingCriterion.CriterionModalitys, t.ReadingTaskState, TaskStudyCount = t.TaskStudyList.Count }).FirstNotNullAsync();
+
+            //影像后处理  上传了新的影像
+            if (taskInfo.TaskStudyCount > 0)
+            {
+
+                var taskStudyList = await _repository.Where<TaskStudy>(t => t.TrialId == indto.TrialId && t.VisitTaskId == indto.VisitTaskId).ProjectTo<VisitStudyDTO>(_mapper.ConfigurationProvider).ToListAsync();
+
+                foreach (var study in taskStudyList)
+                {
+                    study.SeriesList = study.SeriesList.OrderBy(s => s.SeriesNumber).ThenBy(s => s.SeriesTime).ToList();
+
+                    //foreach (var series in study.SeriesList)
+                    //{
+                    //    series.WindowCenter = series.InstanceInfoList.FirstOrDefault()!.WindowCenter;
+                    //    series.WindowWidth = series.InstanceInfoList.FirstOrDefault()!.WindowWidth;
+                    //}
+                    //study.SeriesCount = study.SeriesList.Count;
+
+                    study.InstanceCount = study.SeriesList.SelectMany(t => t.InstanceInfoList).Count();
+                }
+
+                studyList.AddRange(taskStudyList);
+
+            }
+            else
+            {
+                #region dicom 检查查询
+
+                //如果是手动生成的标准，需要过滤检查和序列数据
+
+                var isManualGenerate = await _trialReadingCriterionRepository.AnyAsync(t => t.Id == taskInfo.TrialReadingCriterionId && t.IsAutoCreate == false);
+
+                var dicomStudyList = await _repository.Where<DicomStudy>(t => t.TrialId == indto.TrialId && t.SubjectVisitId == indto.SujectVisitId)
+                    .WhereIf(taskInfo.IsImageFilter == true, t => taskInfo.CriterionModalitys.Contains(t.ModalityForEdit))
+                    .WhereIf(isManualGenerate, t => t.SubjectCriteriaEvaluationVisitStudyFilterList.Any(t => t.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId && t.IsConfirmed && t.IsReading))
+                    .Select(k => new VisitStudyDTO()
+                    {
+                        InstanceCount = k.InstanceCount,
+                        Modalities = k.Modalities,
+                        //SeriesCount = k.SeriesCount,
+                        StudyCode = k.StudyCode,
+                        StudyId = k.Id,
+
+                    }).ToListAsync();
+                var studyIds = dicomStudyList.Select(t => t.StudyId).ToList();
+
+                var instanceList = await _repository.Where<DicomInstance>(t => studyIds.Contains(t.StudyId))
+                       .Select(t => new { t.SeriesId, t.Id, t.InstanceNumber, t.Path, t.NumberOfFrames, t.WindowCenter, t.WindowWidth, t.HtmlPath }).ToListAsync();
+
+                List<DicomSeriesDTO> seriesLists = await _repository.Where<DicomSeries>(s => studyIds.Contains(s.StudyId))
+                     .WhereIf(isManualGenerate == false, t => t.IsReading)
+                     .WhereIf(isManualGenerate, t => t.SubjectCriteriaEvaluationVisitStudyFilterList.Any(t => t.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId && t.IsConfirmed && t.IsReading))
+                    .OrderBy(s => s.SeriesNumber).ThenBy(s => s.SeriesTime).ProjectTo<DicomSeriesDTO>(_mapper.ConfigurationProvider).ToListAsync();
+
+                foreach (var t in dicomStudyList)
+                {
+                    t.SeriesList = seriesLists.Where(s => s.StudyId == t.StudyId).OrderBy(s => s.SeriesNumber).ThenBy(s => s.SeriesTime).ToList();
+
+                    t.SeriesList.ForEach(series =>
+                    {
+                        series.InstanceInfoList = instanceList.Where(t => t.SeriesId == series.Id).OrderBy(t => t.InstanceNumber).Select(k =>
+                       new InstanceBasicInfo()
+                       {
+                           Id = k.Id,
+                           NumberOfFrames = k.NumberOfFrames,
+                           HtmlPath = k.HtmlPath,
+                           Path = k.Path,
+                           InstanceNumber = k.InstanceNumber,
+
+                       }).ToList();
+
+                        //series.WindowWidth = instanceList.FirstOrDefault()!.WindowWidth;
+                        //series.WindowCenter = instanceList.FirstOrDefault()!.WindowCenter;
+                    });
+
+                    //设置为阅片与否 不更改数据库检查  的instance数量 和 SeriesCount  所以这里要实时统计
+                    //t.SeriesCount = t.SeriesList.Count;
+                    t.InstanceCount = t.SeriesList.SelectMany(t => t.InstanceInfoList).Count();
+                }
+
+                studyList.AddRange(dicomStudyList);
+
+                #endregion
+
+                #region dicom 关键序列处理       
+
+                //已经签名的任务，加关键序列
+                if (taskInfo.ReadingTaskState == ReadingTaskState.HaveSigned)
+                {
                     var rowInfoList = await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == indto.VisitTaskId && x.StudyId != null).OrderBy(x => x.ReadingQuestionTrial.ShowOrder).ThenBy(x => x.RowIndex).Select(x => new
                     {
                         x.ReadingQuestionTrial.ShowOrder,
@@ -491,12 +583,6 @@ namespace IRaCIS.Core.Application.Services
                         x.InstanceId,
                     }).ToListAsync();
 
-
-            var taskInfo = await _visitTaskRepository.Where(x => x.Id == indto.VisitTaskId).FirstNotNullAsync();
-
-            if (taskInfo.ReadingTaskState == ReadingTaskState.HaveSigned)
-            {
-
                     var thisStudyIds = rowInfoList.OrderBy(x => x.ShowOrder).ThenBy(x => x.RowIndex).Select(x => x.StudyId).Distinct().ToList();
                     var thisSeriesIdIds = rowInfoList.Where(x => x.SeriesId != null).OrderBy(x => x.ShowOrder).ThenBy(x => x.RowIndex).Select(x => x.SeriesId).Distinct().ToList();
                     if (rowInfoList.Count > 0)
@@ -505,7 +591,7 @@ namespace IRaCIS.Core.Application.Services
                         {
                             InstanceCount = k.InstanceCount,
 
-                        SeriesCount = k.SeriesCount,
+                            //SeriesCount = k.SeriesCount,
 
                             StudyId = k.Id,
                             IsCriticalSequence = true,
@@ -558,79 +644,38 @@ namespace IRaCIS.Core.Application.Services
                                 var modalityList = await _repository.Where<DicomSeries>(s => thisSeriesIdIds.Contains(s.Id)).OrderBy(s => s.SeriesNumber).ThenBy(s => s.SeriesTime).Select(x => x.Modality).Distinct().ToListAsync(); ;
                                 item.Modality = string.Join(",", modalityList);
                                 thisVisitTaskStudy.SeriesList.Add(item);
-                            thisVisitTaskStudy.SeriesCount = thisVisitTaskStudy.SeriesList.Count;
+                                //thisVisitTaskStudy.SeriesCount = thisVisitTaskStudy.SeriesList.Count;
+                            }
 
 
 
+                            studyList.Add(thisVisitTaskStudy);
+
                         }
 
 
 
-                        result.Add(thisVisitTaskStudy);
-
                     }
 
-                }
+                    studyList.ForEach(x =>
-            }
-
-
-            //如果是手动生成的标准，需要过滤检查和序列数据
-
-            var isManualGenerate = await _trialReadingCriterionRepository.AnyAsync(t => t.Id == taskInfo.TrialReadingCriterionId && t.IsAutoCreate == false);
-
-            var studyList = await _repository.Where<DicomStudy>(t => t.TrialId == indto.TrialId && t.SubjectVisitId == indto.SujectVisitId)
-                .WhereIf(isManualGenerate, t => t.SubjectCriteriaEvaluationVisitStudyFilterList.Any(t => t.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId && t.IsConfirmed && t.IsReading))
-                .Select(k => new VisitStudyDTO()
                     {
-                    InstanceCount = k.InstanceCount,
+                        x.SeriesList.ForEach(y =>
-                    Modalities = k.Modalities,
-                    SeriesCount = k.SeriesCount,
-                    StudyCode = k.StudyCode,
-                    StudyId = k.Id,
-
-                }).ToListAsync();
-            var studyIds = studyList.Select(t => t.StudyId).ToList();
-
-            var instanceList = await _repository.Where<DicomInstance>(t => studyIds.Contains(t.StudyId))
-                   .Select(t => new { t.SeriesId, t.Id, t.InstanceNumber, t.Path, t.NumberOfFrames, t.WindowCenter, t.WindowWidth, t.HtmlPath }).ToListAsync();
-
-
-
-            List<DicomSeriesDTO> seriesLists = await _repository.Where<DicomSeries>(s => studyIds.Contains(s.StudyId)  /*&& s.IsReading*/)
-                 .WhereIf(isManualGenerate == false, t => t.IsReading)
-                 .WhereIf(isManualGenerate, t => t.SubjectCriteriaEvaluationVisitStudyFilterList.Any(t => t.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId && t.IsConfirmed && t.IsReading))
-                .OrderBy(s => s.SeriesNumber). ThenBy(s => s.SeriesTime).ProjectTo<DicomSeriesDTO>(_mapper.ConfigurationProvider).ToListAsync();
-
-            foreach (var t in studyList)
                         {
-                t.SeriesList = seriesLists.Where(s => s.StudyId == t.StudyId).OrderBy(s => s.SeriesNumber).ThenBy(s => s.SeriesTime).ToList();
+                            y.IsBeMark = rowInfoList.Any(z => z.SeriesId == y.Id);
-
-                t.SeriesList.ForEach(series =>
-                {
-                    series.InstanceInfoList = instanceList.Where(t => t.SeriesId == series.Id).OrderBy(t => t.InstanceNumber).Select(k =>
-                   new InstanceBasicInfo()
-                   {
-                       Id = k.Id,
-                       NumberOfFrames = k.NumberOfFrames,
-                       HtmlPath = k.HtmlPath,
-                       Path = k.Path,
-                       InstanceNumber = k.InstanceNumber,
-
-                   }).ToList();
-
-                    series.WindowWidth = instanceList.FirstOrDefault()!.WindowWidth;
-                    series.WindowCenter = instanceList.FirstOrDefault()!.WindowCenter;
                         });
 
-                //设置为阅片与否 不更改数据库检查  的instance数量 和 SeriesCount  所以这里要实时统计
+                    });
-                t.SeriesCount = t.SeriesList.Count;
-                t.InstanceCount = t.SeriesList.SelectMany(t => t.InstanceInfoList).Count();
                 }
 
 
-            // 非Dicom
+                #endregion
+            }
 
-            var noDicomList = await _noneDicomStudyRepository.Where(x => x.TrialId == indto.TrialId && x.SubjectVisitId == indto.SujectVisitId).ToListAsync();
+
+            #region 非Dicom 检查查询
+
+            var noDicomList = await _noneDicomStudyRepository.Where(x => x.TrialId == indto.TrialId && x.SubjectVisitId == indto.SujectVisitId && x.NoneDicomFileList.Any(t => !t.FileType.Contains(StaticData.FileType.Zip)))
+                  .WhereIf(taskInfo.IsImageFilter == true, t => taskInfo.CriterionModalitys.Contains(t.Modality) ).ToListAsync();
 
 
             List<VisitStudyDTO> noDicomStudyList = noDicomList.Select(x => new VisitStudyDTO()
@@ -638,7 +683,7 @@ namespace IRaCIS.Core.Application.Services
                 InstanceCount = x.FileCount,
                 StudyId = x.Id,
                 Modalities = x.Modality,
-                SeriesCount = 1,
+                //SeriesCount = 1,
                 StudyCode = x.StudyCode,
                 IsDicom = false,
 
@@ -653,7 +698,7 @@ namespace IRaCIS.Core.Application.Services
                 if (instanceCount == 0)
                 {
                     item.SeriesList = new List<DicomSeriesDTO>();
-                    item.SeriesCount = 0;
+                    //item.SeriesCount = 0;
                 }
                 else
                 {
@@ -669,7 +714,7 @@ namespace IRaCIS.Core.Application.Services
                     SubjectVisitId=nodicom.SubjectVisitId,
                     SubjectId=nodicom.SubjectId,
                     SeriesNumber=1,
-                    NoneDicomFileFirstFile=await _noneDicomStudyFileRepository.Where(x=>x.NoneDicomStudyId==item.StudyId).Select(x=>x.Path).FirstOrDefaultAsync(),
+                    NoneDicomFileFirstFile=await _noneDicomStudyFileRepository.Where(x=>x.NoneDicomStudyId==item.StudyId && !x.FileType.Contains(StaticData.FileType.Zip)).Select(x=>x.Path).FirstOrDefaultAsync(),
                     }
 
                 };
@@ -677,24 +722,14 @@ namespace IRaCIS.Core.Application.Services
 
             }
 
-
-            if (studyList == null || studyList.Count == 0)
-            {
-                studyList = new List<VisitStudyDTO>();
-            }
-
             studyList.AddRange(noDicomStudyList);
 
-            studyList.ForEach(x =>
+            #endregion
-            {
+
-                x.SeriesList.ForEach(y =>
+
-                {
+
-                    y.IsBeMark = rowInfoList.Any(z => z.SeriesId == y.Id);
+            var result = studyList.Where(x => x.SeriesCount > 0).ToList();
-                });
 
-            });
-            result.AddRange(studyList);
-            result = result.Where(x => x.SeriesCount > 0).ToList();
             return result;
 
 

IRaCIS.Core.Application/Service/Visit/_MapConfig.cs

@@ -1,6 +1,7 @@
 using AutoMapper;
 using IRaCIS.Application.Contracts;
 using IRaCIS.Core.Application.Contracts;
+using IRaCIS.Core.Application.Contracts.Dicom.DTO;
 using IRaCIS.Core.Application.MediatR.CommandAndQueries;
 using IRaCIS.Core.Domain.Share;
 
@@ -101,6 +102,16 @@ namespace IRaCIS.Core.Application.Service
                   .ForMember(d => d.SubjectCode, u => u.MapFrom(s => s.SubjectVisit.Subject.Code))
                   .ForMember(d => d.VisitName, u => u.MapFrom(s => s.SubjectVisit.VisitName))
                   .ForMember(d => d.TrialSiteCode, u => u.MapFrom(s => s.SubjectVisit.TrialSite.TrialSiteCode));
+
+
+            CreateMap<TaskStudy, VisitStudyDTO>()
+                 .ForMember(d => d.StudyId, u => u.MapFrom(s => s.Id))
+                  .ForMember(d => d.SeriesList, u => u.MapFrom(s => s.SeriesList));
+
+            CreateMap<TaskSeries, DicomSeriesDTO>()
+                 .ForMember(d => d.InstanceInfoList, u => u.MapFrom(s => s.InstanceList));
+
+            CreateMap<TaskInstance, InstanceBasicInfo>();
         }
     }
    

IRaCIS.Core.Application/Service/WorkLoad/DTO/DoctorWorkLoadViewModel.cs

@@ -377,9 +377,9 @@ namespace IRaCIS.Application.Contracts
 
         public bool IsReadingPeriod { get; set; }
 
-        public ReadingImageDownload? ImageDownloadEnum { get; set; }
+        public ReadingImageDownload ImageDownloadEnum { get; set; }
 
-        public ReadingImageUpload? ImageUploadEnum { get; set; }
+        public ReadingImageUpload ImageUploadEnum { get; set; }
     }
 
     public class TrialCriterionReadingCategory

IRaCIS.Core.Application/Service/WorkLoad/DoctorWorkloadService.cs

@@ -252,7 +252,7 @@ namespace IRaCIS.Application.Services
                     EnrollId = intoGroup.Id,
                     IsEnable = allocateRule.IsEnable,
 
-                    TrialReadingCriterionList = intoGroup.Trial.ReadingQuestionCriterionTrialList.Where(t => t.IsConfirm).Select(t => new TrialReadingCriterionDto() { TrialReadingCriterionId = t.Id, TrialReadingCriterionName = t.CriterionName, CriterionType = t.CriterionType, IsOncologyReading = t.IsOncologyReading, IsArbitrationReading = t.IsArbitrationReading, IsGlobalReading = t.IsGlobalReading, ReadingInfoSignTime = t.ReadingInfoSignTime, ReadingType = t.ReadingType }).ToList(),
+                    TrialReadingCriterionList = intoGroup.Trial.TrialReadingCriterionList.Where(t => t.IsConfirm).Select(t => new TrialReadingCriterionDto() { TrialReadingCriterionId = t.Id, TrialReadingCriterionName = t.CriterionName, CriterionType = t.CriterionType, IsOncologyReading = t.IsOncologyReading, IsArbitrationReading = t.IsArbitrationReading, IsGlobalReading = t.IsGlobalReading, ReadingInfoSignTime = t.ReadingInfoSignTime, ReadingType = t.ReadingType }).ToList(),
 
                     DoctorCriterionStatusList= intoGroup.EnrollReadingCriteriaList.Select(t=>new DoctorCriterionStatus()
                     {

IRaCIS.Core.Domain.Share/Trial/TrialExpedited.cs

@@ -1,4 +1,6 @@
-namespace IRaCIS.Core.Domain.Share
+using System.Collections.Generic;
+
+namespace IRaCIS.Core.Domain.Share
 {
     public enum TrialExpedited
     {
@@ -39,6 +41,23 @@
 
     }
 
+    public class SiteSurveyFiledConfig
+    {
+        public List<string> NotShowFieldList { get; set; }=new List<string>();
+
+        public List<SiteSurveyModifyFiled> ModifyFiledList { get; set; }=new List<SiteSurveyModifyFiled>();
+
+    }
+
+    public class SiteSurveyModifyFiled
+    {
+        public string NeedModifyFiled { get; set; }
+
+        public string ReplaceContent { get; set; }
+
+        public string ReplaceContentCN { get; set; }
+    }
+
     public enum DeclarationType
     {
         Other = 3,

IRaCIS.Core.Domain.Share/User/UserType.cs

@@ -90,6 +90,13 @@
         EnrollOrPD_EMailCopy=5,
     }
 
+    public enum UserMFAType
+    {
+        Login=0,
+
+        Unlock=1,
+    }
+
 
 
 }

IRaCIS.Core.Domain/QC/NoneDicom/NoneDicomStudyFile.cs

@@ -36,7 +36,7 @@ namespace IRaCIS.Core.Domain.Models
         [Required]
         public Guid CreateUserId { get; set; }
 
-	
+        public string FileType { get; set; }
 
     }
 

IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs

@@ -276,9 +276,9 @@ namespace IRaCIS.Core.Domain.Models
         public List<VisitTask> VisitTaskList { get; set; }
 
 
-        public ReadingImageDownload? ImageDownloadEnum { get; set; }
+        public ReadingImageDownload ImageDownloadEnum { get; set; }
 
-        public ReadingImageUpload? ImageUploadEnum { get; set; }
+        public ReadingImageUpload ImageUploadEnum { get; set; }
 
         public bool IsImageFilter { get; set; }
     }
@@ -294,7 +294,9 @@ namespace IRaCIS.Core.Domain.Models
     {
         None = 0,
 
-        IRReadingEnable = 1
+        IRReadingSubejctEnable = 1,
+
+        IRReadingVisitEnable = 2,
     }
 
 

IRaCIS.Core.Domain/Trial/Trial.cs

@@ -46,7 +46,7 @@ namespace IRaCIS.Core.Domain.Models
         [JsonIgnore]
         public List<TrialUser> TrialUserList { get; set; } = new List<TrialUser>();
         [JsonIgnore]
-        public List<ReadingQuestionCriterionTrial> ReadingQuestionCriterionTrialList { get; set; } = new List<ReadingQuestionCriterionTrial>();
+        public List<ReadingQuestionCriterionTrial> TrialReadingCriterionList { get; set; } = new List<ReadingQuestionCriterionTrial>();
         [JsonIgnore]
         public List<Subject> SubjectList { get; set; } = new List<Subject>();
         [JsonIgnore]
@@ -182,6 +182,9 @@ namespace IRaCIS.Core.Domain.Models
 
 
 
+        //public List<SiteSurveyFiledConfig>
+
+        public string SiteSurveyConfigJsonStr { get; set; } = string.Empty;
 
         public bool VisitPlanConfirmed { get; set; }
 
@@ -271,7 +274,7 @@ namespace IRaCIS.Core.Domain.Models
 
 
 
-        public string Modalitys { get; set; } = "CT|MRI|Bone Scan|Photograph|PET|X-ray|US";
+        public string Modalitys { get; set; } = string.Empty;
 
         [NotMapped]
         public List<string> ModalityList => Modalitys.Split('|', StringSplitOptions.RemoveEmptyEntries).Where(t => !string.IsNullOrEmpty(t)).ToList();

IRaCIS.Core.Domain/_Config/_StaticData.cs

@@ -112,7 +112,10 @@ public static class StaticData
         public static readonly string UploadFileFolder = "UploadFile";
     }
 
-
+    public static class FileType
+    {
+        public static readonly string Zip = "zip";
+    }
 
     public static class TrialOpt
     {

IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs

@@ -284,6 +284,31 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                     .Select(t => new { t.AdditionalAssessmentType, t.IsSelected }).ToListAsync();
 
 
+                var oncologyAssessIdsStr = string.Empty;
+                var allList = new List<ReadingTrialCriterionDictionary>();
+
+				if (entitys.Any(x => x.Entity.GetType() == typeof(ReadingTrialCriterionDictionary)))
+                {
+					 allList = entitys.Where(x => x.Entity.GetType() == typeof(ReadingTrialCriterionDictionary))
+                        .Select(t => t.Entity as ReadingTrialCriterionDictionary).ToList().Where(x=>
+                        x.CriterionId== entity.Id &&
+                        x.ParentCode == ReadingCommon.CriterionDictionary.OncologyAssess).ToList();
+                }
+                else
+                {
+					allList=await _dbContext.ReadingTrialCriterionDictionary.Where(x =>
+						x.CriterionId == entity.Id &&
+						x.ParentCode == ReadingCommon.CriterionDictionary.OncologyAssess).ToListAsync();
+				}
+
+
+				//查询出字典的Value  ValueCN  Des 保存
+				var diclistOncologyAssess = allList.Select(t => t.DictionaryId).ToList();
+
+				var selectList = await _dbContext.Dictionary.Where(x => diclistOncologyAssess.Contains(x.Id)).Select(t => t.ValueCN).ToListAsync();
+
+				oncologyAssessIdsStr = string.Join(",", selectList);
+
 				await InsertInspection<ReadingQuestionCriterionTrial>(entity, type, x => new InspectionConvertDTO()
                 {
                     IsDistinctionInterface = isDistinctionInterface,
@@ -296,6 +321,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common
 
                 }, new
                 {
+					OncologyAssessIdsStr= oncologyAssessIdsStr,
+
 					EvaluationResultTypes = dicValueList.Count > 0 ? string.Join(",", dicValueList) : string.Empty,
                     AdditionalAssessmentTypeList = addtionalAssesementList
                 });

IRaCIS.Core.Infra.EFCore/Repository/ICommandRepository.cs

@@ -133,6 +133,8 @@ namespace IRaCIS.Core.Infra.EFCore
         Task<IEnumerable<TEntity>> AddRangeAsync(IEnumerable<TEntity> entities, bool autoSave = false);
 
         Task<bool> SaveChangesAsync(CancellationToken cancellationToken = default);
+
+        Task<bool> SaveChangesAndClearAllTrackingAsync(CancellationToken cancellationToken = default);
         Task<bool> DeleteAsync(TEntity entity, bool autoSave = false, CancellationToken cancellationToken = default);
 
 

IRaCIS.Core.Infra.EFCore/Repository/Repository.cs

@@ -449,7 +449,12 @@ namespace IRaCIS.Core.Infra.EFCore
             return await _dbContext.SaveChangesAsync(cancellationToken) > 0;
         }
 
-
+        public async Task<bool> SaveChangesAndClearAllTrackingAsync(CancellationToken cancellationToken = default)
+        {
+            var count = await _dbContext.SaveChangesAsync(cancellationToken);
+            _dbContext.ChangeTracker.Clear();
+            return count > 0;
+        }
         #endregion
 
         #region 不常用

irc_api.drone.yml

@@ -99,7 +99,7 @@ steps:
 - name: publish-test-irc
   commands:
   - echo start publish test-irc-api
-  - cd /opt/1panel/hang/devops/test-irc-net8
+  - cd /opt/1panel/hang/devops/test-irc
   - sh test-irc.sh v${DRONE_BUILD_NUMBER}
   
 trigger: