Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8

IRaCIS.Core.API/appsettings.Prod_IRC.json

@@ -7,10 +7,10 @@
     }
   },
   "ConnectionStrings": {
-    //"RemoteNew": "Server=10.10.10.49,1434;Database=Prod_IRC;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true",
-    //"Hangfire": "Server=10.10.10.49,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"
+    "RemoteNew": "Server=10.10.10.49,1434;Database=Prod_IRC;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true",
+    "Hangfire": "Server=10.10.10.49,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"
   },
   "WeComNoticeConfig": {
     "IsOpenWeComNotice": true,

IRaCIS.Core.Application/BusinessFilter/LegacyController/RequestDuplicationFilter.cs

@@ -70,10 +70,6 @@ namespace IRaCIS.Core.Application.BusinessFilter.LegacyController
                     {
                         this.RequestDuplication();
                     }
-                    catch (BusinessValidationFailedException)
-                    {
-                        throw;
-                    }
                     catch (Exception)
                     {
                       
@@ -95,8 +91,6 @@ namespace IRaCIS.Core.Application.BusinessFilter.LegacyController
 
                 // 验证请求频繁情况
                 if (
-                    requestPath == "/ReadingImageTask/changeDicomReadingQuestionAnswer"&&
-
                     !requestPath
                     .Split("/", StringSplitOptions.RemoveEmptyEntries)
                     .Any(segment => segment.StartsWith("get", StringComparison.OrdinalIgnoreCase)) &&
@@ -112,14 +106,17 @@ namespace IRaCIS.Core.Application.BusinessFilter.LegacyController
                         RequestTime = DateTime.Now
                     };
 
-                    var isAdded = IRCSystemInfo.TryAddRequestRecord(
-                        requestInfo,
-                        RequestDuplicationOptionsMonitor.CurrentValue.CacheTimeSeconds,
-                        RequestDuplicationOptionsMonitor.CurrentValue.DuplicationWindowMs);
-                    if (!isAdded)
+                    IRCSystemInfo.RequestRecordList= IRCSystemInfo.RequestRecordList.Where(x => x.RequestTime >= DateTime.Now.AddSeconds(-RequestDuplicationOptionsMonitor.CurrentValue.CacheTimeSeconds)).ToList();
+
+                   
+                    var requestsTimes = IRCSystemInfo.RequestRecordList.Any(x=>
+                   x.RequestTime>= requestInfo.RequestTime.AddMilliseconds(-RequestDuplicationOptionsMonitor.CurrentValue.DuplicationWindowMs)&&
+                    x.RequestKey== requestInfo.RequestKey);
+                    if (requestsTimes)
                     {
                         throw new BusinessValidationFailedException(_localizer["RequestDuplicationFilter_RequestDuplication"], ApiResponseCodeEnum.BusinessValidationFailed);
                     }
+                    IRCSystemInfo.RequestRecordList.Add(requestInfo);
                 }
             }
 

IRaCIS.Core.Application/BusinessFilter/_Config/_AppSettings.cs

@@ -146,31 +146,6 @@ public class RequestDuplicationOptions
 public static class IRCSystemInfo
 {
     public static List<RequestInfo> RequestRecordList { get; set; } = new List<RequestInfo>();
-
-    private static readonly object requestRecordLock = new object();
-
-    public static bool TryAddRequestRecord(RequestInfo requestInfo, int cacheTimeSeconds, int duplicationWindowMs)
-    {
-        lock (requestRecordLock)
-        {
-            var now = DateTime.Now;
-            RequestRecordList = RequestRecordList
-                .Where(x => x.RequestTime >= now.AddSeconds(-cacheTimeSeconds))
-                .ToList();
-
-            var isDuplicate = RequestRecordList.Any(x =>
-                x.RequestTime >= requestInfo.RequestTime.AddMilliseconds(-duplicationWindowMs) &&
-                x.RequestKey == requestInfo.RequestKey);
-
-            if (isDuplicate)
-            {
-                return false;
-            }
-
-            RequestRecordList.Add(requestInfo);
-            return true;
-        }
-    }
 }
 
 public class RequestInfo
@@ -261,4 +236,4 @@ public static class AppSettings
 
     }
 
-}
+}

IRaCIS.Core.Application/Helper/OSSService.cs

@@ -1206,14 +1206,21 @@ public class OSSService(IOptionsMonitor<ObjectStoreServiceOptions> options,
             }
             else if (ObjectStoreServiceOptions.ObjectStoreUse == "MinIO")
             {
+                var httpClientHandler = new HttpClientHandler
+                {
+                    ServerCertificateCustomValidationCallback = HttpClientHandler.DangerousAcceptAnyServerCertificateValidator
+                };
+
                 var minIOConfig = ObjectStoreServiceOptions.MinIO;
 
                 var minioClient = new MinioClient()
                     .WithEndpoint($"{minIOConfig.EndPoint}:{minIOConfig.Port}")
                     .WithCredentials(minIOConfig.AccessKeyId, minIOConfig.SecretAccessKey)
                     .WithSSL(minIOConfig.UseSSL)
+                     .WithHttpClient(new HttpClient(httpClientHandler))
                     .Build();
 
+
                 var pipe = new System.IO.Pipelines.Pipe();
 
                 _ = Task.Run(async () =>
@@ -1226,6 +1233,7 @@ public class OSSService(IOptionsMonitor<ObjectStoreServiceOptions> options,
                             .WithCallbackStream(stream =>
                             {
                                 stream.CopyTo(pipe.Writer.AsStream());
+                                pipe.Writer.FlushAsync();
                             });
 
                         await minioClient.GetObjectAsync(args);
@@ -1233,6 +1241,7 @@ public class OSSService(IOptionsMonitor<ObjectStoreServiceOptions> options,
                     }
                     catch (Exception ex)
                     {
+                        Log.Error($"minio 获取流错误：{ex.Message}");
                         await pipe.Writer.CompleteAsync(ex);
                     }
                 });

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

@@ -3081,7 +3081,7 @@
             SystemAnonymizationService
             </summary>	
         </member>
-        <member name="M:IRaCIS.Core.Application.Service.SystemAnonymizationService.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SystemAnonymization},AutoMapper.IMapper,IRaCIS.Core.Domain.Share.IUserInfo,Microsoft.Extensions.Localization.IStringLocalizer,ZiggyCreatures.Caching.Fusion.IFusionCache)">
+        <member name="M:IRaCIS.Core.Application.Service.SystemAnonymizationService.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SystemAnonymization},AutoMapper.IMapper,IRaCIS.Core.Domain.Share.IUserInfo,Microsoft.Extensions.Localization.IStringLocalizer)">
             <summary>
             SystemAnonymizationService
             </summary>	
@@ -12381,11 +12381,6 @@
             影像工具
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionTrialView.AddDeleteTypeEnum">
-            <summary>
-            新增修改类型
-            </summary>
-        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionTrialView.ImageToolAttribute">
             <summary>
             影像工具属性
@@ -13331,11 +13326,6 @@
             影像工具
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionTrialInDto.AddDeleteTypeEnum">
-            <summary>
-            新增修改类型
-            </summary>
-        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionTrialInDto.ImageToolAttribute">
             <summary>
             影像工具属性
@@ -14746,7 +14736,7 @@
             <param name="inDto"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.Application.Service.ReadingImageTaskService.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.NoneDicomStudy},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.VisitTask},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TaskInstance},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.NoneDicomStudyFile},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingNoneDicomMark},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingNoneDicomMarkBinding},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.UserLog},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingTableQuestionAnswer},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingOncologyTaskInfo},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Segmentation},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SegmentBinding},IRaCIS.Core.Application.Service.IVisitTaskHelpeService,IRaCIS.Core.Application.Service.IVisitTaskService,IRaCIS.Core.Application.Contracts.IReadingClinicalDataService,IRaCIS.Core.Application.Service.IReadingCalculateService,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectVisit},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Subject},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.UserFeedBack},Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.ServiceVerifyConfigOption},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingGlobalTaskInfo},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingCriterionPage},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingTaskRelation},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingJudgeInfo},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadModule},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.DicomInstance},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.OrganInfo},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.OrganTrialInfo},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialDocument},IRaCIS.Core.Application.Service.ReadingCalculate.Interface.ILuganoCalculateService,IRaCIS.Core.Application.Service.ReadingCalculate.Interface.ILuganoWithoutPETCalculateService,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingTaskQuestionMark},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingTrialCriterionDictionary},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingTableAnswerRowInfo},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingTableQuestionSystem},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingTableQuestionTrial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingTaskQuestionAnswer},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingQuestionCriterionTrial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingQuestionSystem},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.CriterionKeyFileRead},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialCriterionKeyFile},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.NoneDicomStudyFile},IRaCIS.Core.Application.Service.IGeneralCalculateService,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingQuestionTrial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TaskStudy},Microsoft.Extensions.Configuration.IConfiguration,IRaCIS.Core.Application.Service.ImageAndDoc.IDownloadAndUploadService,IRaCIS.Core.Application.Interfaces.ITrialEmailNoticeConfigService,AutoMapper.IMapper,IRaCIS.Core.Domain.Share.IUserInfo,Microsoft.Extensions.Localization.IStringLocalizer,ZiggyCreatures.Caching.Fusion.IFusionCache)">
+        <member name="M:IRaCIS.Core.Application.Service.ReadingImageTaskService.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.NoneDicomStudy},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.VisitTask},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TaskInstance},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.NoneDicomStudyFile},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingNoneDicomMark},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingNoneDicomMarkBinding},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.UserLog},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingTableQuestionAnswer},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingOncologyTaskInfo},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Segmentation},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SegmentBinding},IRaCIS.Core.Application.Service.IVisitTaskHelpeService,IRaCIS.Core.Application.Service.IVisitTaskService,IRaCIS.Core.Application.Contracts.IReadingClinicalDataService,IRaCIS.Core.Application.Service.IReadingCalculateService,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectVisit},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Subject},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.UserFeedBack},Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.ServiceVerifyConfigOption},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingGlobalTaskInfo},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingCriterionPage},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingTaskRelation},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingJudgeInfo},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadModule},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.DicomInstance},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.OrganInfo},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.OrganTrialInfo},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialDocument},IRaCIS.Core.Application.Service.ReadingCalculate.Interface.ILuganoCalculateService,IRaCIS.Core.Application.Service.ReadingCalculate.Interface.ILuganoWithoutPETCalculateService,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingTaskQuestionMark},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingTrialCriterionDictionary},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingTableAnswerRowInfo},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingTableQuestionSystem},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingTableQuestionTrial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingTaskQuestionAnswer},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingQuestionCriterionTrial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingQuestionSystem},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.CriterionKeyFileRead},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialCriterionKeyFile},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.NoneDicomStudyFile},IRaCIS.Core.Application.Service.IGeneralCalculateService,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingQuestionTrial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TaskStudy},IRaCIS.Core.Application.Service.ImageAndDoc.IDownloadAndUploadService,IRaCIS.Core.Application.Interfaces.ITrialEmailNoticeConfigService,AutoMapper.IMapper,IRaCIS.Core.Domain.Share.IUserInfo,Microsoft.Extensions.Localization.IStringLocalizer,ZiggyCreatures.Caching.Fusion.IFusionCache)">
             <summary>
             IR影像阅片
             </summary>
@@ -15188,14 +15178,7 @@
             <param name="visitTaskId"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.Application.Service.ReadingImageTaskService.SendWeComNotifier(System.Guid,System.String)">
-            <summary>
-            发送微信通知
-            </summary>
-            <param name="visiTaskId"></param>
-            <returns></returns>
-        </member>
-        <member name="M:IRaCIS.Core.Application.Service.ReadingImageTaskService.ComputeJudgeResult(System.Collections.Generic.List{IRaCIS.Core.Application.Service.Reading.Dto.GroupTaskAnswerDto},System.Guid)">
+        <member name="M:IRaCIS.Core.Application.Service.ReadingImageTaskService.ComputeJudgeResult(System.Collections.Generic.List{IRaCIS.Core.Application.Service.Reading.Dto.GroupTaskAnswerDto})">
             <summary>
             计算返回的结果  为True表示不相等
             </summary>
@@ -17513,17 +17496,17 @@
         </member>
         <member name="F:IRaCIS.Core.Application.ViewModel.AccessToDialogueEnum.Question">
             <summary>
-            ����
+            质疑
             </summary>
         </member>
         <member name="F:IRaCIS.Core.Application.ViewModel.AccessToDialogueEnum.Consistency">
             <summary>
-            һ���Ժ˲�
+            一致性核查
             </summary>
         </member>
         <member name="T:IRaCIS.Core.Application.ViewModel.CopyFrontAuditConfigItemDto">
             <summary>
-            ����
+            复制
             </summary>
         </member>
         <member name="T:IRaCIS.Core.Application.ViewModel.SystemNoticeView">
@@ -20262,12 +20245,11 @@
             <param name="editTrialSiteCommand"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.Application.Services.TrialMaintenanceService.GetTrialSiteSelect(System.Guid,System.Nullable{System.Boolean})">
+        <member name="M:IRaCIS.Core.Application.Services.TrialMaintenanceService.GetTrialSiteSelect(System.Guid)">
             <summary>
               获取项目下的 site 下拉框数据    CRC只看到他负责的    
             </summary>
             <param name="trialId"></param>
-            <param name="ignoreDisable"></param>
             <returns></returns>
         </member>
         <member name="M:IRaCIS.Core.Application.Services.TrialMaintenanceService.DeleteTrialSite(System.Guid)">

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

@@ -4,7 +4,6 @@
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
 //--------------------------------------------------------------------
 
-using IRaCIS.Core.Application.Helper;
 using IRaCIS.Core.Application.Interfaces;
 using IRaCIS.Core.Application.ViewModel;
 using Microsoft.AspNetCore.Mvc;
@@ -14,7 +13,7 @@ namespace IRaCIS.Core.Application.Service
     /// SystemAnonymizationService
     /// </summary>	
     [ApiExplorerSettings(GroupName = "Image")]
-    public class SystemAnonymizationService(IRepository<SystemAnonymization> _systemAnonymizationRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer, IFusionCache _fusionCache) : BaseService, ISystemAnonymizationService
+    public class SystemAnonymizationService(IRepository<SystemAnonymization> _systemAnonymizationRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ISystemAnonymizationService
     {
 
 
@@ -38,7 +37,6 @@ namespace IRaCIS.Core.Application.Service
 
             var entity = await _systemAnonymizationRepository.InsertOrUpdateAsync(addOrEditSystemAnonymization, true);
 
-            await _fusionCache.SetAsync(CacheKeys.SystemAnonymization, CacheHelper.GetSystemAnonymizationListAsync(_systemAnonymizationRepository), TimeSpan.FromDays(7));
 
             return ResponseOutput.Ok(entity.Id.ToString());
 

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

@@ -1002,11 +1002,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public string ImageTool { get; set; } = string.Empty;
 
-        /// <summary>
-        /// 新增修改类型
-        /// </summary>
-        public AddDeleteType AddDeleteTypeEnum { get; set; } = AddDeleteType.Arbitrium;
-
         /// <summary>
         /// 影像工具属性
         /// </summary>
@@ -2488,11 +2483,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public string ImageTool { get; set; } = string.Empty;
 
-        /// <summary>
-        /// 新增修改类型
-        /// </summary>
-        public AddDeleteType AddDeleteTypeEnum { get; set; } = AddDeleteType.Arbitrium;
-
         /// <summary>
         /// 影像工具属性
         /// </summary>

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

@@ -5,7 +5,6 @@ using DocumentFormat.OpenXml.Office2019.Excel.ThreadedComments;
 using IRaCIS.Core.Application.Contracts;
 using IRaCIS.Core.Application.Filter;
 using IRaCIS.Core.Application.Helper;
-using IRaCIS.Core.Application.Helper.OtherTool;
 using IRaCIS.Core.Application.Interfaces;
 using IRaCIS.Core.Application.Service.ImageAndDoc;
 using IRaCIS.Core.Application.Service.OAuth;
@@ -17,7 +16,6 @@ using IRaCIS.Core.Infra.EFCore.Common;
 using IRaCIS.Core.Infrastructure;
 using MassTransit;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
@@ -82,7 +80,6 @@ namespace IRaCIS.Core.Application.Service
         IGeneralCalculateService _generalCalculateService,
         IRepository<ReadingQuestionTrial> _readingQuestionTrialRepository,
          IRepository<TaskStudy> _taskStudyRepository,
-         IConfiguration _config,
          IDownloadAndUploadService _downloadAndUploadService,
         ITrialEmailNoticeConfigService _trialEmailNoticeConfigService,
         IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer, IFusionCache _fusionCache) : BaseService, IReadingImageTaskService
@@ -3366,18 +3363,6 @@ namespace IRaCIS.Core.Application.Service
         [HttpPost]
         public async Task<IResponseOutput> VerifyVisitTaskQuestions(VerifyVisitTaskQuestionsInDto inDto)
         {
-            // 验证一个问题不能有多个答案
-            bool hasDuplicate = await _readingTaskQuestionAnswerRepository
-             .Where(x => x.VisitTaskId == inDto.VisitTaskId)
-             .GroupBy(x => x.ReadingQuestionTrialId)
-             .AnyAsync(g => g.Count() > 1);
-
-            if (hasDuplicate)
-            {
-                _ = SendWeComNotifier(inDto.VisitTaskId, "阅片问题答案有重复");
-            }
-
-
             //验证后处理影像必须传
             if (_visitTaskRepository.Any(t => t.Id == inDto.VisitTaskId && t.TrialReadingCriterion.ImageUploadEnum != ReadingImageUpload.None))
             {

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

@@ -1,6 +1,5 @@
 using IRaCIS.Core.Application.Contracts;
 using IRaCIS.Core.Application.Filter;
-using IRaCIS.Core.Application.Helper.OtherTool;
 using IRaCIS.Core.Application.Service.Reading.Dto;
 using IRaCIS.Core.Application.ViewModel;
 using IRaCIS.Core.Domain.Share;
@@ -8,7 +7,6 @@ using IRaCIS.Core.Infra.EFCore.Common;
 using IRaCIS.Core.Infrastructure;
 using MassTransit;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Configuration;
 using Newtonsoft.Json;
 
 namespace IRaCIS.Core.Application.Service
@@ -678,7 +676,7 @@ namespace IRaCIS.Core.Application.Service
                                         JudgeDifferenceType = x.Key.JudgeDifferenceType,
                                         TaskAnswerList = x.Select(y => y.Answer).ToList(),
                                     }).ToList();
-                                    noteEqual = noteEqual || ComputeJudgeResult(groupTasks, visitTask.Id);
+                                    noteEqual = noteEqual || ComputeJudgeResult(groupTasks);
                                 }
 
                             }
@@ -710,7 +708,7 @@ namespace IRaCIS.Core.Application.Service
                                     JudgeDifferenceType = x.Key.JudgeDifferenceType,
                                     TaskAnswerList = x.Select(y => y.Answer).ToList(),
                                 }).ToList();
-                                noteEqual = ComputeJudgeResult(groupTasks, visitTask.Id);
+                                noteEqual = ComputeJudgeResult(groupTasks);
                             }
 
                             break;
@@ -759,8 +757,7 @@ namespace IRaCIS.Core.Application.Service
                                             JudgeDifferenceValue = x.Key.JudgeDifferenceValue,
                                             JudgeDifferenceType = x.Key.JudgeDifferenceType,
                                         }).ToList();
-
-                                        noteEqual = noteEqual || ComputeJudgeResult(globalGroupTasks, visitTask.Id);
+                                        noteEqual = noteEqual || ComputeJudgeResult(globalGroupTasks);
                                     }
 
                                 }
@@ -822,8 +819,7 @@ namespace IRaCIS.Core.Application.Service
                                 JudgeDifferenceType = x.Key.JudgeDifferenceType,
                                 TaskAnswerList = x.Select(y => y.Answer).ToList(),
                             }).ToList();
-
-                            noteEqual = noteEqual || ComputeJudgeResult(globalGroupTasks, visitTask.Id);
+                            noteEqual = noteEqual || ComputeJudgeResult(globalGroupTasks);
                         }
 
 
@@ -926,61 +922,12 @@ namespace IRaCIS.Core.Application.Service
         }
 
 
-        /// <summary>
-        /// 发送微信通知
-        /// </summary>
-        /// <param name="visiTaskId"></param>
-        /// <returns></returns>
-        public async Task SendWeComNotifier(Guid visiTaskId,string msg)
-        {
-            try
-            {
-                bool isOpenWeComNotice = _config.GetValue<bool>("WeComNoticeConfig:IsOpenWeComNotice");
-
-                if (isOpenWeComNotice)
-                {
-                    string webhook = _config["WeComNoticeConfig:WebhookUrl"] ?? string.Empty;
-
-                    var uri = new Uri(_config["SystemEmailSendConfig:SiteUrl"]);
-                    var baseUrl = uri.GetLeftPart(UriPartial.Authority);
-
-                    var userList = _config.GetSection("WeComNoticeConfig:APINoticeUserList").Get<string[]>();
-
-                    var visitTask =  _visitTaskRepository.Where(x => x.Id == visiTaskId).Include(x=>x.Subject).Include(x=>x.Trial).Include(x=>x.SourceSubjectVisit).FirstOrDefault();
-
-
-                    // 🔔 异步告警（不要阻塞请求）
-                    _ = WeComNotifier.SendAlertAsync(
-                        webhook: webhook,
-                        alert: new WeComAlert
-                        {
-                            Env = baseUrl,
-                            UserName = msg,
-                            Api = "",
-                            Message = $"异常信息:{msg}, 项目方案号：{visitTask.Trial.ResearchProgramNo}, 试验参与者：{visitTask.Subject.Code}, 访视：{visitTask.SourceSubjectVisit.VisitName}, 任务名称：{visitTask.TaskName}， 任务Id:{visiTaskId}",
-                            Stack = string.Empty,
-                            AtUsers = userList ?? []
-                        }
-                    );
-
-                }
-
-
-            }
-            catch (Exception ex)
-            {
-                Log.Logger.Error($"MassTransit里发送企业微信出现错误：{ex.Message}");
-            }
-        }
-
-
-
         /// <summary>
         /// 计算返回的结果  为True表示不相等
         /// </summary>
         /// <param name="groupTasks"></param>
         /// <returns></returns>
-        private bool ComputeJudgeResult(List<GroupTaskAnswerDto> groupTasks,Guid visiTaskId)
+        private bool ComputeJudgeResult(List<GroupTaskAnswerDto> groupTasks)
         {
             var noteEqual = false;
             foreach (var item in groupTasks)
@@ -988,13 +935,11 @@ namespace IRaCIS.Core.Application.Service
                 // 裁判问题可以不必填
                 if(item.TaskAnswerList.Count()==0)
                 {
-                    _ = SendWeComNotifier(visiTaskId, "两个阅片任务的答案等于0");
                     break;
                 }
                 else if (item.TaskAnswerList.Count() != 2)
                 {
-                    // 发送微信通知
-                    _ = SendWeComNotifier(visiTaskId, "两个阅片任务的答案不等于2");
+                    noteEqual = true;
                     break;
                 }
                 else if (noteEqual)

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

@@ -527,7 +527,7 @@ namespace IRaCIS.Core.Application.Service
 
             var subjectVisitQuery = _subjectVisitRepository.Where(t => t.TrialId == inQuery.TrialId)/*.Where(t => t.IsLostVisit == false)*/
             .Where(t => t.Subject.IsSubjectQuit == false || (t.Subject.IsSubjectQuit == true && t.SubmitState == SubmitStateEnum.Submitted))
-            .Where(sv => sv.Subject.FinalSubjectVisitId == null ? true : sv.VisitNum <= sv.Subject.FinalSubjectVisit.VisitNum).Select(sv => new ReadModuleView()
+            .Where(sv => sv.Subject.FinalSubjectVisitId == null ? true : sv.VisitNum <= sv.Subject.LatestSubjectVisit.VisitNum).Select(sv => new ReadModuleView()
             {
                 Id = sv.Id,
                 CreateTime = sv.CreateTime,

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

@@ -296,8 +296,6 @@ namespace IRaCIS.Application.Contracts
         #endregion
 
         public TrialDataStore TrialDataStoreType { get; set; }
-
-        public TrialType TrialType { get; set; }
     }
 
     public class TrialPacsInfo

IRaCIS.Core.Application/Service/TrialSiteUser/Interface/ITrialSiteService.cs

@@ -13,6 +13,6 @@ namespace IRaCIS.Core.Application.Interfaces
         Task<PageOutput<SiteStatDTO>> GetSiteCRCList(SiteCrcQueryDTO param);
         Task<IResponseOutput<PageOutput<SiteStatSimpleDTO>> > GetSiteCRCSimpleList(SiteCrcQueryDTO param);
         Task<PageOutput<TrialSiteScreeningDTO>> GetTrialSiteScreeningList(TrialSiteQuery trialSiteQuery);
-        Task<IEnumerable<TrialSiteForSelect>> GetTrialSiteSelect(Guid trialId, bool? ignoreDisable);
+        Task<IEnumerable<TrialSiteForSelect>> GetTrialSiteSelect(Guid trialId);
     }
 }

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

@@ -1566,7 +1566,7 @@ namespace IRaCIS.Core.Application
         [AllowAnonymous]
         public async Task<TrialConfigInfo> GetTrialExtralConfig(Guid trialId)
         {
-            var extralObj = _trialRepository.Where(t => t.Id == trialId).Select(t => new { t.TrialExtraConfigJsonStr, t.TrialDataStoreType, t.IsExternalViewTrialChart, t.TrialObjectNameList, t.CollectImagesEnum, t.IsIQCAutoNextTask, t.IsImageQualityControl, t.TrialType }).FirstOrDefault();
+            var extralObj = _trialRepository.Where(t => t.Id == trialId).Select(t => new { t.TrialExtraConfigJsonStr, t.TrialDataStoreType, t.IsExternalViewTrialChart, t.TrialObjectNameList, t.CollectImagesEnum, t.IsIQCAutoNextTask, t.IsImageQualityControl }).FirstOrDefault();
 
             var extralConfig = JsonConvert.DeserializeObject<TrialExtraConfig>(extralObj?.TrialExtraConfigJsonStr) ?? new TrialExtraConfig();
 
@@ -1578,7 +1578,6 @@ namespace IRaCIS.Core.Application
             trialConfig.CollectImagesEnum = extralObj.CollectImagesEnum;
             trialConfig.IsIQCAutoNextTask = extralObj.IsIQCAutoNextTask;
             trialConfig.TrialDataStoreType = extralObj.TrialDataStoreType;
-            trialConfig.TrialType = extralObj.TrialType;
 
             return trialConfig;
         }

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

@@ -268,21 +268,13 @@ namespace IRaCIS.Core.Application.Services
         ///   获取项目下的 site 下拉框数据    CRC只看到他负责的    
         /// </summary>
         /// <param name="trialId"></param>
-        /// <param name="ignoreDisable"></param>
         /// <returns></returns>
         [HttpGet("{trialId:guid}")]
-        public async Task<IEnumerable<TrialSiteForSelect>> GetTrialSiteSelect(Guid trialId, bool? ignoreDisable)
+        public async Task<IEnumerable<TrialSiteForSelect>> GetTrialSiteSelect(Guid trialId)
         {
             //CRC只看到他负责的    
 
-            var query = _trialSiteRepository.Where(t => t.TrialId == trialId);
-
-            if (ignoreDisable == true)
-            {
-                query = query.IgnoreQueryFilters();
-            }
-
-            var list = await query
+            var list = await _trialSiteRepository.Where(t => t.TrialId == trialId)
                           .WhereIf(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ClinicalResearchCoordinator || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.CRA, t => t.CRCUserList.Any(t => t.UserId == _userInfo.UserRoleId))
                           .ProjectTo<TrialSiteForSelect>(_mapper.ConfigurationProvider).OrderBy(t => t.TrialSiteCode).ToListAsync();
 

IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs

@@ -504,28 +504,6 @@ namespace IRaCIS.Core.Domain.Share
 
     }
 
-    /// <summary>
-    /// 问题增删类型
-    /// </summary>
-    public enum AddDeleteType
-    {
-        /// <summary>
-        /// 任意
-        /// </summary>
-        Arbitrium = 0,
-
-        /// <summary>
-        /// 仅基线
-        /// </summary>
-        OnlyBaseLine = 1,
-
-        /// <summary>
-        /// 仅随访
-        /// </summary>
-        OnlyVisit = 2,
-
-    }
-
     /// <summary>
     /// 影像标记类型
     /// </summary>

IRaCIS.Core.Domain/Management/User.cs

@@ -47,7 +47,6 @@ public class UserRole : BaseFullAuditEntity
 
 
 
-
     [Comment("医生生成账号后，会有值")]
     public Guid? DoctorId { get; set; }
 

IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs

@@ -311,12 +311,7 @@ public class ReadingQuestionTrial : BaseAddAuditEntity
     /// </summary>
     public string ImageToolAttribute { get; set; } = string.Empty;
 
-    /// <summary>
-    /// 新增修改类型
-    /// </summary>
-    public AddDeleteType AddDeleteTypeEnum { get; set; } = AddDeleteType.Arbitrium;
-
-
+   
 
     [NotMapped]
     public List<ExportResult> ExportResult

irc_api.drone.yml

@@ -1,37 +1,4 @@
-kind: pipeline
-type: ssh
-name: ssh-linux-uat-irc-build-image
 
-platform:
-  os: Linux
-  arch: 386
-  
-clone:
-  disable: true
-
-server:
-  host: 101.132.253.119
-  user: root
-  password:
-    from_secret: test_ssh_pwd
-
-steps:
-  - name: publish-test-irc
-    commands:
-      - bash /opt/1panel/xc-deploy-new/Uat_IRC/devops-publish/uat-branch-publish.sh
-  - name: notify-wecom
-    commands:
-      - bash /opt/1panel/xc-deploy-new/devops-center/drone-notify-wecom.sh "$DRONE_BUILD_STATUS" "$DRONE_REPO_NAME" "$DRONE_BRANCH" "$DRONE_BUILD_NUMBER" "4355b98e-1e72-4678-8dfb-2fc6ad0bf449" "$DRONE_COMMIT_MESSAGE" "$DRONE_COMMIT_AUTHOR" "Uat_IRC_API   Uat_IRC_SCP_API" "irc.uat.extimaging.com"
-    when:
-      status:
-        - success
-        - failure
-  
-trigger:
-  branch:
-    - Uat_IRC_Net8    
-       
----
 kind: pipeline
 type: ssh
 name: ssh-linux-test-irc-publish