修改

IRaCIS.Core.API/appsettings.Event_IRC.json

@@ -41,7 +41,8 @@
     "OpenLoginLimit": true,
     "LoginMaxFailCount": 5,
 
-    "LoginFailLockMinutes": 30
+    "LoginFailLockMinutes": 30,
+    "AutoLoginOutMinutes": 60
 
   },
   "SystemEmailSendConfig": {

IRaCIS.Core.API/appsettings.Prod_IRC.json

@@ -42,7 +42,8 @@
     "OpenLoginLimit": true,
     "LoginMaxFailCount": 5,
 
-    "LoginFailLockMinutes": 30
+    "LoginFailLockMinutes": 30,
+    "AutoLoginOutMinutes": 60
   },
 
   "SystemEmailSendConfig": {

IRaCIS.Core.API/appsettings.Test_IRC.json

@@ -59,7 +59,8 @@
 
     "LoginMaxFailCount": 5,
 
-    "LoginFailLockMinutes": 1
+    "LoginFailLockMinutes": 1,
+    "AutoLoginOutMinutes": 10
   },
 
   "SystemEmailSendConfig": {

IRaCIS.Core.API/appsettings.US_IRC.json

@@ -60,7 +60,8 @@
 
     "LoginMaxFailCount": 5,
 
-    "LoginFailLockMinutes": 30
+    "LoginFailLockMinutes": 30,
+    "AutoLoginOutMinutes": 60
   },
 
   "SystemEmailSendConfig": {

IRaCIS.Core.API/appsettings.Uat_IRC.json

@@ -44,7 +44,8 @@
     "OpenLoginLimit": true,
     "LoginMaxFailCount": 5,
 
-    "LoginFailLockMinutes": 30
+    "LoginFailLockMinutes": 30,
+    "AutoLoginOutMinutes": 60
 
   },
   "SystemEmailSendConfig": {

IRaCIS.Core.Application/BusinessFilter/LimitUserRequestAuthorization.cs

@@ -35,6 +35,8 @@ public class LimitUserRequestAuthorization : IAsyncAuthorizationFilter
 
     public async Task OnAuthorizationAsync(AuthorizationFilterContext context)
     {
+        var minutes = _verifyConfig.CurrentValue.AutoLoginOutMinutes;
+
         if (_verifyConfig.CurrentValue.OpenLoginLimit)
         {
             if (context.ActionDescriptor.EndpointMetadata.Any(item => item is IAllowAnonymous))
@@ -58,22 +60,44 @@ public class LimitUserRequestAuthorization : IAsyncAuthorizationFilter
                     context.Result = new JsonResult(ResponseOutput.NotOk(_localizer["LimitUser_AuthTokenMissing"]));
                 }
 
+
+
                 //2、在这里取缓存  进行比较  看是否有其他人进行了登陆，如果其他人登陆了，就把之前用户挤掉
                 var cacheUserToken = (await _provider.GetAsync<string>(_userInfo.Id.ToString())).Value;
 
+
+
                 //缓存中没有取到Token
                 if (string.IsNullOrWhiteSpace(cacheUserToken))
                 {
+                    cacheUserToken = _userInfo.UserToken;
+
                     //设置当前用户最新Token
                     await _provider.SetAsync(_userInfo.Id.ToString(), _userInfo.UserToken, TimeSpan.FromDays(7));
 
-                    cacheUserToken = _userInfo.UserToken;
+                    //重启应用程序，所有人续期，不一下子踢出所有人
+                    await _provider.SetAsync($"{_userInfo.Id.ToString()}_Online", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), TimeSpan.FromMinutes(minutes));
 
                 }
                 //是同一个人  
                 else if (cacheUserToken == _userInfo.UserToken)
                 {
 
+                    var cacheTime = (await _provider.GetAsync<string>($"{_userInfo.Id.ToString()}_Online")).Value;
+
+                    //过期了 需要自动退出
+                    if (string.IsNullOrEmpty(cacheTime))
+                    {
+                        context.HttpContext.Response.ContentType = "application/json";
+                        context.HttpContext.Response.StatusCode = StatusCodes.Status403Forbidden;
+                        context.Result = new JsonResult(ResponseOutput.NotOk("登录无操作超时自动退出", ApiResponseCodeEnum.AutoLoginOut));
+
+                    }
+                    else
+                    {
+                        await _provider.SetAsync($"{_userInfo.Id.ToString()}_Online", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), TimeSpan.FromMinutes(minutes));
+                    }
+
                 }
 
                 else

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

@@ -852,6 +852,13 @@
             后台托管服务的方式运行
             </summary>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.ImageAndDoc.StudyService.AddOrUpdateArchiveStudy(IRaCIS.Core.Application.Contracts.NewArchiveStudyCommand)">
+            <summary>
+            上传临床数据
+            </summary>
+            <param name="incommand"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.Service.ImageAndDoc.StudyService.Preview(System.Guid)">
             <summary> 指定资源Id，渲染Dicom检查的Jpeg预览图像  </summary>
             <param name="studyId"> Dicom检查的Id </param>
@@ -3200,6 +3207,20 @@
             <param name="inDto"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.ClinicalAnswerService.DeleteStudyClinical(IRaCIS.Core.Application.Service.Reading.Dto.DeleteStudyClinicalInDto)">
+            <summary>
+            删除检查级别临床数据
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.ClinicalAnswerService.AddStudyClinical(IRaCIS.Core.Application.Service.Reading.Dto.AddStudyClinicalInDto)">
+            <summary>
+             添加检查级别临床数据
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.Service.ClinicalAnswerService.AutoAddCRCClinical(IRaCIS.Core.Application.Service.Reading.Dto.AutoAddClinicalInDto)">
             <summary>
             自动添加CRC临床数据 (不包括检查级别)
@@ -13260,6 +13281,13 @@
             <param name="id"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Application.Services.ReadingClinicalDataService.GetStudyClinicalData(IRaCIS.Core.Application.Service.Reading.Dto.GetStudyClinicalDataInDto)">
+            <summary>
+            获取检查类型临床数据
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Application.Services.ReadingClinicalDataService.GetCRCClinicalData(IRaCIS.Core.Application.Service.Reading.Dto.GetCRCClinicalDataInDto)">
             <summary>
             获取CRC上传的文件

IRaCIS.Core.Application/Service/Document/DTO/TrialEmailNoticeConfigViewModel.cs

@@ -108,6 +108,9 @@ namespace IRaCIS.Core.Application.ViewModel
 
         public bool IsDistinguishCriteria { get; set; }
 
+        public string SortField { get; set; } = string.Empty;
+
+        public bool Asc { get; set; }
     }
 
 

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

@@ -26,6 +26,8 @@ using System;
 using System.Runtime.InteropServices;
 using SharpCompress.Common;
 using SkiaSharp;
+using DocumentFormat.OpenXml.Bibliography;
+using System.Linq.Dynamic.Core;
 
 namespace IRaCIS.Core.Application.Service
 {
@@ -316,13 +318,13 @@ namespace IRaCIS.Core.Application.Service
             };
 
 
-            var (trialEmailConfig, sendEmailConfig) = await _emailSendService.BuildEmailConfig(taskInfo.TrialId, businessScenarioEnum, topicAndHtmlFunc, taskInfo.SiteId,taskInfo.TrialReadingCriterionId);
+            var (trialEmailConfig, sendEmailConfig) = await _emailSendService.BuildEmailConfig(taskInfo.TrialId, businessScenarioEnum, topicAndHtmlFunc, taskInfo.SiteId, taskInfo.TrialReadingCriterionId);
 
             #endregion
 
 
             //自动发送
-            if (sendEmailConfig != null && trialEmailConfig !=null)
+            if (sendEmailConfig != null && trialEmailConfig != null)
             {
                 #region 不同标准 不同项目配置 发送邮件的时机 处理具体逻辑
 
@@ -679,8 +681,8 @@ namespace IRaCIS.Core.Application.Service
                     }
                     else
                     {
-                        var wordStoreServerPath = Path.Combine(Path.GetDirectoryName(serverFilePath), Path.GetFileNameWithoutExtension(serverFilePath)+".docx"); 
-                         
+                        var wordStoreServerPath = Path.Combine(Path.GetDirectoryName(serverFilePath), Path.GetFileNameWithoutExtension(serverFilePath) + ".docx");
+
                         using (FileStream fileStream = new FileStream(wordStoreServerPath, FileMode.Create, FileAccess.Write))
                         {
                             wordMemoryStream.WriteTo(fileStream);
@@ -718,7 +720,7 @@ namespace IRaCIS.Core.Application.Service
                         Document document = new Document();
                         document.LoadFromStream(wordMemoryStream, FileFormat.Docx);
                         document.SaveToStream(pdfMemoryStream, FileFormat.PDF);
-                       
+
                     }
                     else
                     {
@@ -1355,7 +1357,9 @@ namespace IRaCIS.Core.Application.Service
               .WhereIf(inQuery.BusinessScenarioEnum != null, t => t.BusinessScenarioEnum == inQuery.BusinessScenarioEnum)
               .ProjectTo<TrialEmailNoticeConfigView>(_mapper.ConfigurationProvider);
 
-            return await trialEmailNoticeConfigQueryable.ToListAsync();
+            var sortField = string.IsNullOrWhiteSpace(inQuery.SortField) ? nameof(TrialEmailNoticeConfigView.Code) : inQuery.SortField;
+            var orderQuery = inQuery.Asc ? trialEmailNoticeConfigQueryable.OrderBy(sortField) : trialEmailNoticeConfigQueryable.OrderBy(sortField + " desc");
+            return await orderQuery.ToListAsync();
         }
 
 

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

@@ -91,25 +91,6 @@ namespace IRaCIS.Core.Application.Contracts
 
                 return $" {uploadTimeSpan?.Hours}:{uploadTimeSpan?.Minutes}:{uploadTimeSpan?.Seconds}.{uploadTimeSpan?.Milliseconds}";
 
-                #region 废弃
-                //if (uploadTimeSpan.Seconds == 0 && uploadTimeSpan.Minutes==0 && uploadTimeSpan.Hours == 0)
-                //{
-                //    return $"{uploadTimeSpan.Milliseconds}毫秒";
-                //}
-                //else if (uploadTimeSpan.Minutes == 0 && uploadTimeSpan.Hours == 0)
-                //{
-                //    return $"{uploadTimeSpan.Seconds}秒";
-                //}
-                //else if (uploadTimeSpan.Hours == 0)
-                //{
-                //    return $"{uploadTimeSpan.Minutes} 分钟 {uploadTimeSpan.Seconds} 秒";
-                //}
-                //else
-                //{
-                //    return $" {uploadTimeSpan.Hours} 小时 {uploadTimeSpan.Minutes} 分钟 {uploadTimeSpan.Seconds} 秒 {uploadTimeSpan.Milliseconds}毫秒";
-                //}
-                #endregion
-
             }
         }
 

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

@@ -2,6 +2,7 @@
 using Microsoft.AspNetCore.Authorization;
 using IRaCIS.Core.Application.Contracts;
 using IRaCIS.Core.Application.Helper;
+using System.Linq.Dynamic.Core;
 
 namespace IRaCIS.Core.Application.Services
 {
@@ -26,7 +27,7 @@ namespace IRaCIS.Core.Application.Services
         [HttpGet("{seriesId:guid}")]
         public async Task<IResponseOutput<List<DicomInstanceDTO>>> List(Guid seriesId)
         {
-            var list = await _instanceRepository.Where(s => s.SeriesId == seriesId).OrderBy(s => s.InstanceNumber).
+            var list = await _instanceRepository.Where(s => s.SeriesId == seriesId)/*.OrderBy(s => s.SliceLocation)*/.OrderBy(s => s.InstanceNumber).
                 ThenBy(s => s.InstanceTime).ThenBy(s => s.CreateTime)
                 .ProjectTo<DicomInstanceDTO>(_mapper.ConfigurationProvider).ToListAsync();
 

IRaCIS.Core.Application/Service/Management/DTO/UserLogViewModel.cs

@@ -51,6 +51,10 @@ namespace IRaCIS.Core.Application.ViewModel
 
         public DateTime? EndDate { get; set; }
 
+        public string? LoginUserName { get; set; }
+
+        public UserTypeEnum? LoginUserTypeEnum { get; set; }
+
 
     }
 

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

@@ -15,6 +15,7 @@ using Medallion.Threading;
 using EasyCaching.Core;
 using IRaCIS.Core.Application.Contracts;
 using LoginReturnDTO = IRaCIS.Application.Contracts.LoginReturnDTO;
+using OfficeOpenXml.FormulaParsing.Utilities;
 
 namespace IRaCIS.Application.Services
 {
@@ -411,7 +412,7 @@ namespace IRaCIS.Application.Services
                 IsFirstAdd = false
             });
 
-            await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, LoginUserId = Guid.Empty, OptUserId = userId,LoginPassword=newPwd,  OptType = UserOptType.UnloginModifyPasswoed }, true);
+            await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, LoginUserId = userId, OptUserId = userId,LoginPassword=newPwd,  OptType = UserOptType.UnloginModifyPasswoed }, true);
 
             return ResponseOutput.Result(success);
 
@@ -691,10 +692,14 @@ namespace IRaCIS.Application.Services
 
             userLoginReturnModel.BasicInfo = loginUser;
 
-            // 登录 清除缓存
-            _cache.Remove(userLoginReturnModel.BasicInfo.Id.ToString());
 
-         
+            // 登录 清除缓存
+            //_cache.Remove(userLoginReturnModel.BasicInfo.Id.ToString());
+
+            var userId = loginUser.Id;
+            await _cache.SetAsync($"{userId.ToString()}_Online", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), TimeSpan.FromMinutes(_verifyConfig.CurrentValue.AutoLoginOutMinutes));
+
+
             return ResponseOutput.Ok(userLoginReturnModel);
 
         }
@@ -709,6 +714,8 @@ namespace IRaCIS.Application.Services
                .WhereIf(inQuery.OptType != null, t => t.OptType == inQuery.OptType)
                .WhereIf(inQuery.BeginDate != null, t => t.CreateTime >= inQuery.BeginDate)
                .WhereIf(inQuery.EndDate != null, t => t.CreateTime <= inQuery.EndDate)
+                .WhereIf(inQuery.LoginUserTypeEnum != null, t => t.LoginUser.UserTypeEnum== inQuery.LoginUserTypeEnum)
+               .WhereIf(!string.IsNullOrEmpty(inQuery.LoginUserName), t => t.LoginUser.UserName.Contains(inQuery.LoginUserName!))
                .WhereIf(!string.IsNullOrEmpty(inQuery.LoginFaildName), t => t.LoginFaildName.Contains(inQuery.LoginFaildName!))
                .WhereIf(!string.IsNullOrEmpty(inQuery.IP), t => t.IP.Contains(inQuery.IP!))
              .ProjectTo<UserLogView>(_mapper.ConfigurationProvider);

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

@@ -498,6 +498,7 @@ namespace IRaCIS.Core.Application.Contracts
 
         public string ArchiveFinishedTimeStr => ArchiveFinishedTime?.ToString("yyyy-MM-dd HH:mm:ss.fff");
 
+
         public string UploadIntervalStr
         {
             get
@@ -519,6 +520,7 @@ namespace IRaCIS.Core.Application.Contracts
         }
 
 
+
         public string TimeInterval
         {
             get
@@ -527,6 +529,7 @@ namespace IRaCIS.Core.Application.Contracts
                 var uploadTimeSpan = ArchiveFinishedTime - UploadStartTime;
 
                 return $" {uploadTimeSpan?.Hours}:{uploadTimeSpan?.Minutes}:{uploadTimeSpan?.Seconds}.{uploadTimeSpan?.Milliseconds}";
+
             }
         }
 

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

@@ -31,7 +31,8 @@ namespace IRaCIS.Core.Application.Image.QA
 		private readonly IReadingClinicalDataService _readingClinicalDataService;
 		private readonly IRepository<Subject> _subjectRepository;
         private readonly IRepository<ReadingClinicalData> _readingClinicalDataRepository;
-        private readonly IRepository<QCChallengeDialog> _qCChallengeDialogrepository;
+		private readonly IRepository<ClinicalDataTrialSet> _clinicalDataTrialSetRepository;
+		private readonly IRepository<QCChallengeDialog> _qCChallengeDialogrepository;
         private readonly IRepository<CheckChallengeDialog> _checkChallengeDialogrepository;
         private readonly IRepository<Trial> _trialRepository;
         private readonly IRepository<VisitTask> _visitTaskRepository;
@@ -47,7 +48,8 @@ namespace IRaCIS.Core.Application.Image.QA
 			IReadingClinicalDataService readingClinicalDataService,
 			IRepository<Subject> subjectRepository,
             IRepository<ReadingClinicalData> readingClinicalDataRepository,
-             IRepository<QCChallengeDialog> qCChallengeDialogrepository,
+				IRepository<ClinicalDataTrialSet> clinicalDataTrialSetRepository,
+			 IRepository<QCChallengeDialog> qCChallengeDialogrepository,
               IRepository<CheckChallengeDialog> checkChallengeDialogrepository,
             IVisitTaskHelpeService visitTaskHelpeService,
             IDistributedLockProvider distributedLockProvider
@@ -60,7 +62,8 @@ namespace IRaCIS.Core.Application.Image.QA
 			this._readingClinicalDataService = readingClinicalDataService;
 			this._subjectRepository = subjectRepository;
             this._readingClinicalDataRepository = readingClinicalDataRepository;
-            this._qCChallengeDialogrepository = qCChallengeDialogrepository;
+			this._clinicalDataTrialSetRepository = clinicalDataTrialSetRepository;
+			this._qCChallengeDialogrepository = qCChallengeDialogrepository;
             this._checkChallengeDialogrepository = checkChallengeDialogrepository;
             _trialRepository = trialRepository;
             this._visitTaskRepository = visitTaskRepository;
@@ -1183,6 +1186,7 @@ namespace IRaCIS.Core.Application.Image.QA
         {
             var dbSubjectVisitList = await _subjectVisitRepository.Where(t => cRCRequestToQCCommand.SubjectVisitIds.Contains(t.Id), true).ProjectTo<QCCRCVisitViewModel>(_mapper.ConfigurationProvider).ToListAsync();
 
+            var trialinfo = await _trialRepository.Where(x => x.Id == dbSubjectVisitList[0].TrialId).FirstNotNullAsync();
             //普通提交
             if (dbSubjectVisitList.Count == 1)
             {
@@ -1210,8 +1214,9 @@ namespace IRaCIS.Core.Application.Image.QA
             }
 
             //同时要根据项目有没有配置Subject 级别临床数据
-            if (dbSubjectVisitList.Any(t => t.IsBaseLine && !t.IsHaveClinicalData))
+            if (dbSubjectVisitList.Any(t => t.IsBaseLine && !t.IsHaveClinicalData)&&trialinfo.ClinicalInformationTransmissionEnum!=0)
             {
+
                 //---基线没有临床数据，确认提交？
                 return ResponseOutput.NotOk(_localizer["QCOperation_NoBaselineData"], 0, ApiResponseCodeEnum.NeedTips);
             }
@@ -1230,30 +1235,32 @@ namespace IRaCIS.Core.Application.Image.QA
         //[Authorize(Policy = IRaCISPolicy.CRC)]
         public async Task<IResponseOutput> CRCRequestToQC(CRCRequestToQCCommand cRCRequestToQCCommand)
         {
-
-			// 验证临床数据 是否有Pet类型
-			#region 验证临床数据 是否有Pet类型
-			foreach (var item in cRCRequestToQCCommand.SubjectVisitIds)
-			{
-				if (await _dicomStudyRepository.AnyAsync(x => x.SubjectVisitId == item && x.Modalities.Contains("PT")))
+			List<string> modalitieTypess = new List<string>() { "PT、CT", "CT、PT", "PET-CT" };
+            // 验证临床数据 是否有Pet类型
+            #region 验证临床数据 是否有Pet类型
+            if (await _clinicalDataTrialSetRepository.AnyAsync(x => x.TrialId == cRCRequestToQCCommand.TrialId && x.IsConfirm && x.ClinicalDataLevel == ClinicalLevel.Study))
+            {
+				foreach (var item in cRCRequestToQCCommand.SubjectVisitIds)
 				{
-					var visit = await _subjectVisitRepository.Where(x => x.Id == item).FirstNotNullAsync();
-					var clinicalData = await this._readingClinicalDataService.GetCRCClinicalData(new Service.Reading.Dto.GetCRCClinicalDataInDto()
-					{
-						IsBaseline = visit.IsBaseLine,
-						SubjectId = visit.SubjectId,
-						SubjectVisitId = item,
-						TrialId = cRCRequestToQCCommand.TrialId,
-					});
 
-					if (clinicalData.Any(x => x.ClinicalDataLevel == ClinicalLevel.Study && x.ClinicalUploadType == ClinicalUploadType.PDF && x.PDFFileList.Count() == 0))
+					if (await _dicomStudyRepository.AnyAsync(x => x.SubjectVisitId == item && modalitieTypess.Contains(x.Modalities)))
 					{
-						throw new BusinessValidationFailedException(_localizer["QCOperation_NeedStudyClinical"]);
+						var visit = await _subjectVisitRepository.Where(x => x.Id == item).FirstNotNullAsync();
+						var clinicalData = await this._readingClinicalDataService.GetStudyClinicalData(new Service.Reading.Dto.GetStudyClinicalDataInDto()
+						{
+							SubjectVisitId = item,
+						});
+
+						if (!clinicalData.Any(x => x.ClinicalDataLevel == ClinicalLevel.Study && x.ClinicalUploadType == ClinicalUploadType.PDF && x.PDFFileList.Count() > 0))
+						{
+							throw new BusinessValidationFailedException(_localizer["QCOperation_NeedStudyClinical"]);
+						}
 					}
+
+
 				}
-
-
 			}
+		
 			#endregion
 
 
@@ -1958,8 +1965,31 @@ namespace IRaCIS.Core.Application.Image.QA
                 throw new BusinessValidationFailedException(_localizer["QCOperation_InvalidCompleteResend"]);
             }
 
+			List<string> modalitieTypess = new List<string>() { "PT、CT", "CT、PT", "PET-CT" };
+			// 验证临床数据 是否有Pet类型
+			#region 验证临床数据 是否有Pet类型
+			if (await _clinicalDataTrialSetRepository.AnyAsync(x => x.TrialId == cRCReuploadFinishedCommand.TrialId && x.IsConfirm && x.ClinicalDataLevel == ClinicalLevel.Study))
+			{
+                var item = qcChallenge.SubjectVisitId;
+				if (await _dicomStudyRepository.AnyAsync(x => x.SubjectVisitId == item && modalitieTypess.Contains(x.Modalities)))
+				{
+					var visit = await _subjectVisitRepository.Where(x => x.Id == item).FirstNotNullAsync();
+					var clinicalData = await this._readingClinicalDataService.GetStudyClinicalData(new Service.Reading.Dto.GetStudyClinicalDataInDto()
+					{
+						SubjectVisitId = item,
+					});
 
-            var subjectVisitId = qcChallenge.SubjectVisitId;
+					if (!clinicalData.Any(x => x.ClinicalDataLevel == ClinicalLevel.Study && x.ClinicalUploadType == ClinicalUploadType.PDF && x.PDFFileList.Count() > 0))
+					{
+						throw new BusinessValidationFailedException(_localizer["QCOperation_NeedStudyClinical"]);
+					}
+				}
+			}
+
+			#endregion
+
+
+			var subjectVisitId = qcChallenge.SubjectVisitId;
 
             if (await _subjectVisitRepository.Where(t => t.Id == subjectVisitId).SelectMany(t => t.StudyList).CountAsync() == 0 &&
                 await _subjectVisitRepository.Where(t => t.Id == subjectVisitId).SelectMany(t => t.NoneDicomStudyList).SelectMany(u => u.NoneDicomFileList).CountAsync() == 0)

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

@@ -104,7 +104,7 @@ namespace IRaCIS.Core.Application.Service
              .ForMember(d => d.SubjectCode, u => u.MapFrom(s => s.Subject.Code))
              .ForMember(d => d.TrialSiteCode, u => u.MapFrom(s => s.TrialSite.TrialSiteCode))
 
-             .ForMember(d => d.CheckDialogStr, u => u.MapFrom(t => string.Join(" | ", t.CheckChallengeDialogList.OrderBy(t => t.CreateTime).Select(c => c.CreateUser.UserName + " " + c.CreateTime.ToString("yyyy-mm-dd hh:mm:ss") + " :" + c.TalkContent))))
+             .ForMember(d => d.CheckDialogStr, u => u.MapFrom(t => string.Join(" | ", t.CheckChallengeDialogList.OrderBy(t => t.CreateTime).Select(c => c.CreateUser.UserName + " " + c.CreateTime.ToString("yyyy-MM-dd hh:mm:ss") + " :" + c.TalkContent))))
                .ForMember(d => d.ModalityList, c => c.MapFrom(s =>
                 (s.NoneDicomStudyList.Select(t => t.Modality)
                 .Union(s.StudyList.Select(k => k.ModalityForEdit))).Distinct()))

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

@@ -179,6 +179,59 @@ namespace IRaCIS.Application.Services
 
         #region 临床数据CRC  相关
 
+        /// <summary>
+        /// 获取检查类型临床数据
+        /// </summary>
+        /// <param name="inDto"></param>
+        /// <returns></returns>
+        public async Task<List<GetCRCClinicalDataOutDto>> GetStudyClinicalData(GetStudyClinicalDataInDto inDto)
+        {
+
+			var cRCClinicalDataList = await _readingClinicalDataRepository.Where(x => x.ReadingId == inDto.SubjectVisitId)
+				.Where(x => x.ClinicalDataTrialSet.ClinicalDataLevel == ClinicalLevel.Study).Select(x => new GetCRCClinicalDataOutDto()
+				{
+					Id = x.Id,
+					ClinicalDataSetName = x.ClinicalDataTrialSet.ClinicalDataSetName.LanguageName(x.ClinicalDataTrialSet.ClinicalDataSetEnName, _userInfo.IsEn_Us),
+					ClinicalUploadType = x.ClinicalDataTrialSet.ClinicalUploadType,
+					ClinicalDataLevel = x.ClinicalDataTrialSet.ClinicalDataLevel,
+					ClinicalDataSetEnName = x.ClinicalDataTrialSet.ClinicalDataSetEnName,
+					ClinicalDataTrialSetId = x.ClinicalDataTrialSet.Id,
+					FileName = x.ClinicalDataTrialSet.FileName,
+					UploadRole = x.ClinicalDataTrialSet.UploadRole,
+					Path = x.ClinicalDataTrialSet.Path,
+					IsBlind = x.IsBlind,
+					IsComplete = x.IsComplete,
+					ClinicalFromList = x.Subject.ClinicalFormList.Where(y => y.ReadingId == x.ReadingId && y.ClinicalDataTrialSetId == x.ClinicalDataTrialSetId).Select(y => new ClinicalFromData()
+					{
+						CheckDate = y.CheckDate,
+						ClinicalFormId = y.Id
+					}).ToList(),
+					PDFFileList = x.ReadingClinicalDataPDFList.Select(y => new GetFileDto()
+					{
+						Id = y.Id,
+						FileName = y.FileName,
+						Path = y.Path,
+						CreateTime = y.CreateTime,
+					}).ToList(),
+
+				}).ToListAsync();
+
+			var previousHistoryList = await _previousHistoryRepository.Where(x => x.SubjectVisitId == inDto.SubjectVisitId).ProjectTo<PreviousHistoryView>(_mapper.ConfigurationProvider).ToListAsync();
+			var previousOtherList = await _previousOtherRepository.Where(x => x.SubjectVisitId == inDto.SubjectVisitId).ProjectTo<PreviousOtherView>(_mapper.ConfigurationProvider).ToListAsync();
+			var previousSurgeryList = await _previousSurgeryRepository.Where(x => x.SubjectVisitId == inDto.SubjectVisitId).ProjectTo<PreviousSurgeryView>(_mapper.ConfigurationProvider).ToListAsync();
+
+			foreach (var item in cRCClinicalDataList)
+			{
+				item.ClinicalTableData = new ClinicalDataTable()
+				{
+					PreviousHistoryList = previousHistoryList.Where(x => x.ClinicalDataTrialSetId == item.ClinicalDataTrialSetId).ToList(),
+					PreviousOtherList = previousOtherList.Where(x => x.ClinicalDataTrialSetId == item.ClinicalDataTrialSetId).ToList(),
+					PreviousSurgeryList = previousSurgeryList.Where(x => x.ClinicalDataTrialSetId == item.ClinicalDataTrialSetId).ToList(),
+				};
+
+			}
+			return cRCClinicalDataList;
+		}
 
 		/// <summary>
 		/// 获取CRC上传的文件

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

@@ -141,7 +141,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
 	}
 
-
+	public class GetStudyClinicalDataInDto
+	{
+		public Guid SubjectVisitId { get; set; }
+	}
 
 	public class GetCRCClinicalDataInDto
 	{

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

@@ -1899,9 +1899,13 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
     public class GetReadingPastResultListOutDto
     {
         public Guid VisitTaskId { get; set; }
-        public string TaskName { get; set; }
 
-        public string TaskBlindName { get; set; }
+		public Guid? ReadModuleVisitId { get; set; }
+		public string TaskName { get; set; }
+
+		public string VisitBlindName { get; set; }
+
+		public string TaskBlindName { get; set; }
 
 		public string VisitName { get; set; }
 

IRaCIS.Core.Application/Service/Reading/Interface/IReadingClinicalDataService.cs

@@ -24,7 +24,9 @@ namespace IRaCIS.Core.Application.Contracts
 
         Task<List<GetReadingClinicalDataListOutDto>> GetReadingClinicalList(GetReadingClinicalDataListIndto inDto);
 
-        Task<List<GetCRCClinicalDataOutDto>> GetCRCClinicalData(GetCRCClinicalDataInDto inDto);
+        Task<List<GetCRCClinicalDataOutDto>> GetStudyClinicalData(GetStudyClinicalDataInDto inDto);
+
+		Task<List<GetCRCClinicalDataOutDto>> GetCRCClinicalData(GetCRCClinicalDataInDto inDto);
 
 
 		Task DealVisiTaskClinicalDataSignedAsync(Guid trialId, Guid subjectId, Guid readingId, bool isVisit, Guid trialReadingCritrialId);

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

@@ -689,15 +689,30 @@ namespace IRaCIS.Application.Services
 
             var readingPastResultList = await taskQuery.OrderBy(x => x.VisitTaskNum).ThenBy(x => x.TaskState).Select(x => new GetReadingPastResultListOutDto()
             {
+
                 VisitTaskId = x.Id,
                 TaskBlindName = x.TaskBlindName,
                 TaskName = x.TaskName,
+                ReadModuleVisitId=  x.ReadModule!=null?x.ReadModule.SubjectVisitId:null,
 				VisitName = x.SourceSubjectVisit!=null? x.SourceSubjectVisit.VisitName: x.ReadModule==null?string.Empty: x.ReadModule.SubjectVisit.VisitName,
-
+				VisitBlindName = x.TaskBlindName,
 				VisitTaskNum = x.VisitTaskNum,
                 JudgeResultArm = x.JudgeResultTask == null ? null : x.JudgeResultTask.ArmEnum,
 
             }).ToListAsync();
+
+
+            foreach (var item in readingPastResultList)
+            {
+                if (item.ReadModuleVisitId != null)
+                {
+                    item.VisitBlindName = (await _visitTaskRepository.Where(x => x.SourceSubjectVisitId == item.ReadModuleVisitId && x.IsSelfAnalysis == taskInfo.IsSelfAnalysis &&
+              x.IsAnalysisCreate == taskInfo.IsAnalysisCreate ).Select(x => x.TaskBlindName).FirstOrDefaultAsync())??string.Empty;
+
+				}
+            }
+
+
             return readingPastResultList;
         }
 
@@ -1947,7 +1962,7 @@ namespace IRaCIS.Application.Services
 			}
             
 
-           await _readingTableAnswerRowInfoRepository.BatchUpdateNoTrackingAsync(x => x.Id == inDto.RowId, x => new ReadingTableAnswerRowInfo()
+           await _readingTableAnswerRowInfoRepository.UpdatePartialFromQueryAsync(x => x.Id == inDto.RowId, x => new ReadingTableAnswerRowInfo()
 		   {
 
 			   IsDeleted = true

IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs

@@ -206,15 +206,6 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
             {
 
                 var taskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync();
-                if (taskInfo.ReadingTaskState != ReadingTaskState.HaveSigned && inDto.IsCalculate)
-                {
-                    await service.CalculateTask(new CalculateTaskInDto()
-                    {
-                        ComputationTrigger= ComputationTrigger.InitialCalculation,
-                        VisitTaskId = inDto.VisitTaskId
-                    });
-                }
-
                 var result = await service.GetReadingReportEvaluation(inDto);
 
 

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

@@ -622,7 +622,8 @@ namespace IRaCIS.Core.Application.Contracts
                              + Path.DirectorySeparatorChar.ToString()
                              + "EmailTemplate"
                              + Path.DirectorySeparatorChar.ToString()
-                             + "TrialSiteSurveyReject.html";
+                             + (_userInfo.IsEn_Us ? "TrialSiteSurveyReject_US.html" : "TrialSiteSurveyReject.html") ;
+
 
             using (StreamReader SourceReader = System.IO.File.OpenText(pathToFile))
             {

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

@@ -1101,7 +1101,7 @@ namespace IRaCIS.Core.Application
                        CriterionName = g.Key.CriterionName,
                        TrialReadingCriterionId = g.Key.TrialReadingCriterionId,
 
-                       UrgentCount = g.Where(u => u.VisitTask.IsUrgent).Select(u => u.LatestReplyUser.UserTypeEnum == UserTypeEnum.IndependentReviewer).Count(),
+                       UrgentCount = g.Where(u => u.VisitTask.IsUrgent ).Where(u => u.AuditState != MedicalReviewAuditState.HaveSigned ).Count(),
 
                        ToBeReplyedCount = g.Where(u => u.LatestReplyUser.UserTypeEnum == UserTypeEnum.IndependentReviewer && u.AuditState == MedicalReviewAuditState.Auditing).Count(),
 
@@ -1492,17 +1492,15 @@ namespace IRaCIS.Core.Application
                  SPM_ReviewerSelectApprovalCount = isSPMOrCPM ? t.EnrollList.Where(u => u.EnrollStatus == EnrollStatus.HasCommittedToCRO).Count() : 0,
 
                  MIM_UrgentCount = isMIM ? t.TaskMedicalReviewList.Where(t => t.IsClosedDialog == false && t.VisitTask.TaskState == TaskState.Effect && t.IsInvalid == false && t.MedicalManagerUserId == _userInfo.Id)
-                 .Where(u=>u.VisitTask.IsUrgent &&(
-                    u.LatestReplyUser.UserTypeEnum == UserTypeEnum.IndependentReviewer && u.AuditState == MedicalReviewAuditState.Auditing 
-                 || u.AuditState != MedicalReviewAuditState.HaveSigned && u.LatestReplyUser.UserTypeEnum != UserTypeEnum.IndependentReviewer)).Count() : 0,
+                 .Where(u=>u.VisitTask.IsUrgent &&
+                    u.AuditState != MedicalReviewAuditState.HaveSigned).Count() : 0,
 
                  MIM_PendingResponseCount = isMIM ? t.TaskMedicalReviewList.Where(t => t.IsClosedDialog == false && t.VisitTask.TaskState == TaskState.Effect && t.IsInvalid == false && t.MedicalManagerUserId == _userInfo.Id)
-                 .Where(u => u.AuditState != MedicalReviewAuditState.HaveSigned && u.LatestReplyUser.UserTypeEnum != UserTypeEnum.IndependentReviewer).Count() : 0,
+                 .Where(u => u.LatestReplyUser.UserTypeEnum == UserTypeEnum.IndependentReviewer && u.AuditState == MedicalReviewAuditState.Auditing).Count() : 0,
 
                  MIM_PendingReviewCount = isMIM ? t.TaskMedicalReviewList.Where(t => t.IsClosedDialog == false && t.VisitTask.TaskState == TaskState.Effect && t.IsInvalid == false && t.MedicalManagerUserId == _userInfo.Id)
-                 .Where(u=>u.LatestReplyUser.UserTypeEnum == UserTypeEnum.IndependentReviewer && u.AuditState == MedicalReviewAuditState.Auditing).Count() : 0,
-
-
+                 .Where(u => u.AuditState != MedicalReviewAuditState.HaveSigned && u.LatestReplyUser.UserTypeEnum != UserTypeEnum.IndependentReviewer  ).Count() : 0,
+             
                  CRC_UrgentCount = isCRC? t.SubjectVisitList.Where(c => c.TrialSite.CRCUserList.Any(u => u.UserId == _userInfo.Id) &&t.IsUrgent).Count() : 0,
 
                  CRC_CheckQuestionCount=isCRC? t.SubjectVisitList.Where(c => c.TrialSite.CRCUserList.Any(u => u.UserId == _userInfo.Id))

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

@@ -244,6 +244,7 @@ namespace IRaCIS.Core.Application.Contracts
 
     public class GetDicomSeriesInfoInDto
     {
+
 		public Guid SeriesId { get; set; }
 	}
 

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

@@ -14,6 +14,7 @@ using IRaCIS.Core.Application.Service.Reading.Dto;
 using IRaCIS.Application.Services;
 using Microsoft.Extensions.DependencyInjection;
 using DocumentFormat.OpenXml.Drawing.Charts;
+using IRaCIS.Core.Domain.Models;
 
 namespace IRaCIS.Core.Application.Services
 {
@@ -268,7 +269,7 @@ namespace IRaCIS.Core.Application.Services
             }).ToListAsync();
             var studyIds = studyList.Select(t => t.StudyId).ToList();
 
-            var instanceList = await _repository.Where<DicomInstance>(t => studyIds.Contains(t.StudyId))
+            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.HtmlPath }).ToListAsync();
 
             foreach (var t in studyList)
@@ -335,11 +336,11 @@ namespace IRaCIS.Core.Application.Services
         [HttpPost]
 		public async Task<DicomSeriesDTO> GetDicomSeriesInfo(GetDicomSeriesInfoInDto inDto)
         {
-			DicomSeriesDTO series = await _repository.Where<DicomSeries>(s =>s.Id==inDto.SeriesId).ProjectTo<DicomSeriesDTO>(_mapper.ConfigurationProvider).FirstNotNullAsync();
+			DicomSeriesDTO series = await _repository.Where<DicomSeries>(s =>s.Id==inDto.SeriesId  ).ProjectTo<DicomSeriesDTO>(_mapper.ConfigurationProvider).FirstNotNullAsync();
 
-			var instanceList = await _repository.Where<DicomInstance>(t => t.SeriesId==inDto.SeriesId)
-		  .Select(t => new { t.SeriesId, t.StudyId, t.Id, t.InstanceNumber, t.Path, t.NumberOfFrames, t.WindowCenter, t.WindowWidth, t.HtmlPath }).ToListAsync();
-			series.InstanceList = instanceList.Where(t => t.SeriesId == series.Id).OrderBy(t => t.InstanceNumber).Select(k => k.Id).ToList();
+			var instanceList = await _repository.Where<DicomInstance>(t => t.SeriesId==inDto.SeriesId )
+		  .Select(t => new { t.SeriesId, t.StudyId, t.Id, t.InstanceNumber, t.Path, t.NumberOfFrames, t.WindowCenter, t.WindowWidth, t.HtmlPath ,t.SliceLocation}).ToListAsync();
+			series.InstanceList = instanceList.Where(t => t.SeriesId == series.Id).OrderByDescending(t => t.SliceLocation).ThenBy(t=>t.InstanceNumber).Select(k => k.Id).ToList();
 
 
 			series.InstanceHtmlPathList = instanceList.Where(t => t.SeriesId == series.Id && t.HtmlPath != string.Empty).OrderBy(t => t.InstanceNumber).Select(k => k.HtmlPath).ToList();
@@ -543,7 +544,7 @@ namespace IRaCIS.Core.Application.Services
                 var thisSeriesIdIds = thisRowinfo.Where(x => x.SeriesId != null).OrderBy(x => x.ShowOrder).ThenBy(x => x.RowIndex).Select(x => x.SeriesId).Distinct().ToList();
                 if (thisRowinfo.Count > 0)
                 {
-                    var thisVisitTaskStudy = await _repository.Where<DicomStudy>(t => thisStudyIds.Contains(t.Id)).Select(k => new VisitStudyDTO()
+                    var thisVisitTaskStudy = await _repository.Where<DicomStudy>(t => thisStudyIds.Contains(t.Id) ).Select(k => new VisitStudyDTO()
                     {
                         InstanceCount = k.InstanceCount,
 
@@ -557,7 +558,7 @@ namespace IRaCIS.Core.Application.Services
                     if (thisVisitTaskStudy != null)
                     {
                         thisVisitTaskStudy.StudyId = default(Guid);
-                        var item = await _repository.Where<DicomSeries>(s => thisSeriesIdIds.Contains(s.Id)).OrderBy(s => s.SeriesNumber).
+                        var item = await _repository.Where<DicomSeries>(s => thisSeriesIdIds.Contains(s.Id) ).OrderBy(s => s.SeriesNumber).
                             ThenBy(s => s.SeriesTime)
                             .ProjectTo<DicomSeriesDTO>(_mapper.ConfigurationProvider).FirstOrDefaultAsync();
 
@@ -567,7 +568,7 @@ namespace IRaCIS.Core.Application.Services
 
                             item.InstanceList = thisRowinfo.Where(y => y.InstanceId != null).OrderBy(x => x.ShowOrder).ThenBy(x => x.RowIndex).Select(y => y.InstanceId!.Value).Distinct().ToList();
 
-                            var tempInstanceList = await _repository.Where<DicomInstance>(t => item.InstanceList.Contains(t.Id)).OrderBy(t => t.InstanceNumber)
+                            var tempInstanceList = await _repository.Where<DicomInstance>(t => item.InstanceList.Contains(t.Id) ).OrderBy(t => t.InstanceNumber)
                                 .Select(t => new TempInstance
                                 {
 
@@ -616,7 +617,7 @@ namespace IRaCIS.Core.Application.Services
 
                             item.Description = "Key Series";
 
-                            var modalityList = await _repository.Where<DicomSeries>(s => thisSeriesIdIds.Contains(s.Id)).OrderBy(s => s.SeriesNumber).
+                            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);
@@ -653,12 +654,12 @@ namespace IRaCIS.Core.Application.Services
                 }).ToListAsync();
             var studyIds = studyList.Select(t => t.StudyId).ToList();
 
-            var instanceList = await _repository.Where<DicomInstance>(t => studyIds.Contains(t.StudyId))
+            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*/)
+            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).

IRaCIS.Core.Application/Triggers/SubjectVisitTrigger.cs

@@ -72,7 +72,9 @@ namespace IRaCIS.Core.Application.Triggers
                 // 检查类型  ModalityForEdit
                 // 检查模态  Modalities
                 var modalities = context.Entity.Modalities;
-                if (modalities.Contains("PT") && modalities.Contains("CT"))
+                List<string> modalitieTypess = new List<string>() { "PT、CT", "CT、PT", "PET-CT"};
+
+				if (modalitieTypess.Contains(modalities))
                 {
 					await _iClinicalAnswerService.AddStudyClinical(new Service.Reading.Dto.AddStudyClinicalInDto()
 					{

IRaCIS.Core.Application/Triggers/TrialCriterionSignTrigger.cs

@@ -34,8 +34,8 @@ namespace IRaCIS.Core.Application.Triggers
             if (context.ChangeType == ChangeType.Modified)
             {
 
-                // 一致性核查通过  生成读片任务
-                if (context.UnmodifiedEntity?.ReadingInfoSignTime != trialCriterion.ReadingInfoSignTime && trialCriterion.ReadingInfoSignTime != null)
+                // 一致性核查通过  生成读片任务  同时要是自动生成的才会触发
+                if (context.UnmodifiedEntity?.ReadingInfoSignTime != trialCriterion.ReadingInfoSignTime && trialCriterion.ReadingInfoSignTime != null && trialCriterion.IsAutoCreate==true)
                 {
 
 

IRaCIS.Core.Application/_MediatR/Handlers/ConsistencyVerificationHandler.cs

@@ -213,7 +213,7 @@ namespace IRaCIS.Core.Application.MediatR.Handlers
                         else
                         {
                             //"Problems are as follows:
-                            dialogMsg.AppendLine($"<br/><div style='color: #f00'>{_localizer["ConsistencyVerification_Prob"]}</div>");
+                            dialogMsg.AppendLine($"<br/><div style='color: yellow'>{_localizer["ConsistencyVerification_Prob"]}</div>");
 
                             num = 0;
                             foreach (var item in dbExceptExcel)

IRaCIS.Core.Domain/_Config/_AppSettings.cs

@@ -21,6 +21,7 @@ namespace IRaCIS.Core.Domain.Share
 
         public int LoginFailLockMinutes  { get; set; }
 
+        public int AutoLoginOutMinutes { get; set; }
     }
 
     public class SystemEmailSendConfig

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

@@ -1940,9 +1940,11 @@ namespace IRaCIS.Core.Infra.EFCore.Common
 
                     ObjectRelationParentId2 = x.ClinicalDataTrialSetId,
 
-                }, new
+				}, new
                 {
-                    Type = ClinicalFileType.PreviousSurgery
+					ClinicalDataLevel= ClinicalLevel.Subject,
+
+					Type = ClinicalFileType.PreviousSurgery
                 });
             }
 
@@ -1967,7 +1969,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                     ObjectRelationParentId = x.SubjectVisitId,
                 }, new
                 {
-                    Type = ClinicalFileType.PreviousHistory
+					ClinicalDataLevel = ClinicalLevel.Subject,
+					Type = ClinicalFileType.PreviousHistory
                 });
             }
 
@@ -1990,7 +1993,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                     ObjectRelationParentId = x.SubjectVisitId,
                 }, new
                 {
-                    Type = ClinicalFileType.PreviousOther
+					ClinicalDataLevel = ClinicalLevel.Subject,
+					Type = ClinicalFileType.PreviousOther
                 });
             }
            

IRaCIS.Core.Infrastructure/Extention/ExportExcelDateConverter.cs

@@ -65,12 +65,14 @@ namespace IRaCIS.Core.API._ServiceExtensions.NewtonsoftJson
                 return obj;
 
             // 将对象序列化为 JSON 字符串
-            string json = JsonConvert.SerializeObject(obj);
+            string json = JsonConvert.SerializeObject(obj,new JsonSerializerSettings() { DateFormatString= "yyyy-MM-dd HH:mm:ss.fff" });
 
             // 将 JSON 字符串反序列化回对象
             var deserializedObj = JsonConvert.DeserializeObject<T>(json, new JsonSerializerSettings
             {
-                Converters = { new ExportExcelDateConverter(clientTimeZone) }
+                Converters = { new ExportExcelDateConverter(clientTimeZone) },
+                DateFormatString = "yyyy-MM-dd HH:mm:ss.fff",
+                DateTimeZoneHandling = DateTimeZoneHandling.RoundtripKind
             });
 
             return deserializedObj!;

IRaCIS.Core.Infrastructure/_IRaCIS/Output/ApiResponseCodeEnum.cs

@@ -18,7 +18,7 @@ namespace IRaCIS.Core.Infrastructure.Extention
         BusinessValidationFailed = 2,
 
         //数据不存在
-        DataNotExist=3,
+        DataNotExist = 3,
 
         //程序异常                                     相当于之前的 IsSuccess = false
         ProgramException = 4,
@@ -27,10 +27,10 @@ namespace IRaCIS.Core.Infrastructure.Extention
 
 
         //需要提示 ,需要提示  从Result 取数据       （  0  可以继续处理提交 ,1  不能进行继续处理提交 ,2  刷新列表    )
-        NeedTips = 5,  
+        NeedTips = 5,
 
 
-        CloseCurrentWindows=6,
+        CloseCurrentWindows = 6,
 
 
 
@@ -38,15 +38,17 @@ namespace IRaCIS.Core.Infrastructure.Extention
         //在其他地方登陆，被迫下线
         LoginInOtherPlace = -1,
 
+        AutoLoginOut = -2,
+
         //没有带token访问（未登陆）
-        NoToken=10,
+        NoToken = 10,
 
         //带了Token,但是没有相应权限（该用户类型不能做）
-        HaveTokenNotAccess=11
+        HaveTokenNotAccess = 11
 
     }
 
-    
- 
+
+
 
 }

irc_api.drone.yml

@@ -133,7 +133,7 @@ steps:
   
 trigger:
   branch:
-    - Test_IRC_Net8    
+    - master    
        
 ---