重复请求code改为-4 取消Get类型验证

IRC.Core.SCP/appsettings.Prod_Rayplus_SCP.json

@@ -63,8 +63,8 @@
     }
   },
   "ConnectionStrings": {
-    "RemoteNew": "Server=prod_mssql_standard,1433;Database=Prod_Rayplus;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true",
-    "Hangfire": "Server=prod_mssql_standard,1433;Database=Prod_Rayplus_Hangfire;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true"
+    "RemoteNew": "Server=106.14.89.110,1435;Database=Test_Rayplus;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
+    "Hangfire": "Server=106.14.89.110,1435;Database=Test_Rayplus_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true"
   },
   "DicomSCPServiceConfig": {
     "CalledAEList": [

IRaCIS.Core.API/IRaCIS.Core.API.csproj

@@ -9,7 +9,6 @@
 		<Company>上海展影医疗科技有限公司</Company>
 		<Product>IRC影像系统 (EICS)</Product>
 		<Copyright>上海展影医疗科技有限公司版权所有</Copyright>
-		<NoWarn>$(NoWarn);NU1903</NoWarn>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

IRaCIS.Core.API/appsettings.Prod_IRC.json

@@ -9,7 +9,7 @@
   "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",
+    "RemoteNew": "Server=101.132.193.237,1433;Database=Prod_IRC_pidr_restore_2;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
     "Hangfire": "Server=prod_mssql_standard,1433;Database=Prod_IRC_Hangfire;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true"
   },
   "WeComNoticeConfig": {

IRaCIS.Core.API/appsettings.Prod_Rayplus.json

@@ -7,8 +7,8 @@
     }
   },
   "ConnectionStrings": {
-    "RemoteNew": "Server=prod_mssql_standard,1433;Database=Prod_Rayplus;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true",
-    "Hangfire": "Server=prod_mssql_standard,1433;Database=Prod_Rayplus_Hangfire;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true"
+    "RemoteNew": "Server=101.132.253.119,1435;Database=Uat_Rayplus;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
+    "Hangfire": "Server=101.132.253.119,1435;Database=Uat_Rayplus_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true"
   },
   "WeComNoticeConfig": {
     "IsOpenWeComNotice": true,
@@ -110,9 +110,9 @@
     "Imap": "imap.qiye.aliyun.com",
     "ImapPort": 993,
     "FromEmail": "irc@mail.rayplus.net",
-    "FromName": "RayPlus Imaging System",
+    "FromName": "Uat RayPlus Imaging System",
     "AuthorizationCode": "QWE1zxcv7632",
-    "SiteUrl": "https://irc.rayplus.net/login",
+    "SiteUrl": "https://irc.uat.rayplus.net/login",
 
     "PlatformName": "RayPlus",
     "PlatformNameCN": "睿佳影像云平台",
@@ -130,7 +130,7 @@
 
   "SystemPacsConfig": {
     "Port": "11113",
-    "IP": "47.117.165.18"
+    "IP": "101.132.253.119"
   },
   "RequestDuplicationOptions": {
     "IsEnabled": true,

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

@@ -143,7 +143,7 @@ namespace IRaCIS.Core.Application.BusinessFilter.LegacyController
                         var uri = new Uri(_config["SystemEmailSendConfig:SiteUrl"]);
                         var baseUrl = uri.GetLeftPart(UriPartial.Authority);
 
-                        var userList = _config.GetSection("WeComNoticeConfig:VueNoticeUserList").Get<string[]>();
+                        var userList = _config.GetSection("WeComNoticeConfig:APINoticeUserList").Get<string[]>();
 
                         var request = accessor?.HttpContext?.Request;
 

IRaCIS.Core.Application/IRaCIS.Core.Application.csproj

@@ -10,7 +10,6 @@
 		<OutputPath>..\bin\</OutputPath>
 		<DocumentationFile>.\IRaCIS.Core.Application.xml</DocumentationFile>
 		<NoWarn>1701;1702;1591</NoWarn>
-		<NoWarn>$(NoWarn);NU1903</NoWarn>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">

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

@@ -2940,7 +2940,7 @@
             <param name="modality"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.Application.Service.ImageAndDoc.DownloadAndUploadService.DownloadImageSuccess(System.Guid,System.Nullable{System.Guid})">
+        <member name="M:IRaCIS.Core.Application.Service.ImageAndDoc.DownloadAndUploadService.DownloadImageSuccess(System.Guid)">
             <summary>
             影像下载成功回调
             </summary>
@@ -17543,17 +17543,17 @@
         </member>
         <member name="F:IRaCIS.Core.Application.ViewModel.AccessToDialogueEnum.Question">
             <summary>
-            质疑
+            <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
             </summary>
         </member>
         <member name="F:IRaCIS.Core.Application.ViewModel.AccessToDialogueEnum.Consistency">
             <summary>
-            一致性核查
+            һ<EFBFBD><EFBFBD><EFBFBD>Ժ˲<EFBFBD>
             </summary>
         </member>
         <member name="T:IRaCIS.Core.Application.ViewModel.CopyFrontAuditConfigItemDto">
             <summary>
-            复制
+            <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
             </summary>
         </member>
         <member name="T:IRaCIS.Core.Application.ViewModel.SystemNoticeView">

IRaCIS.Core.Application/MassTransit/Command/ConsistenCheckCommand.cs

@@ -64,7 +64,7 @@ namespace IRaCIS.Core.Application.MassTransit.Command
 
         //[Required(ErrorMessage = "受试者筛选号不能为空")]
         //[ImporterHeader(Name = "Subject ID", AutoTrim = true)]
-        [ExcelColumnName("Participant ID")]
+        [ExcelColumnName("Subject ID")]
         public string SubjectCode { get; set; } = string.Empty;
 
         //[Required(ErrorMessage = "访视名称不能为空")]

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

@@ -58,7 +58,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
         {
             //subject 随机阅片  或者无序 有上传 才处理任务编号
             if (_visitTaskRepository.Any(t => t.SubjectId == subjectId && t.TrialReadingCriterionId == trialReadingCriterionId &&
-           (t.TrialReadingCriterion.IsReadingTaskViewInOrder == ReadingOrder.SubjectRandom
+           (t.TrialReadingCriterion.IsReadingTaskViewInOrder == ReadingOrder.SubjectRandom 
            //||(t.TrialReadingCriterion.IsReadingTaskViewInOrder == ReadingOrder.Random && t.TrialReadingCriterion.ImageDownloadEnum != ReadingImageDownload.None)
            )))
             {
@@ -119,12 +119,6 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
             var subjectCode = string.Empty;
             var subjectId = inQuery.SubjectId;
-            bool? isIRImageDownloaded = null;
-
-            if(inQuery.VisitTaskId != null)
-            {
-                isIRImageDownloaded= _visitTaskRepository.Where(t => t.Id == inQuery.VisitTaskId).Select(t => t.IsIRImageDownloaded).FirstOrDefault();
-            }
 
             if (criterionInfo.IsReadingTaskViewInOrder == ReadingOrder.Random)
             {
@@ -331,7 +325,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                 }
 
 
-                return ResponseOutput.Ok(list, new { TrialModality = criterionInfo.Modalitys, IsReadingTaskViewInOrder = criterionInfo.IsReadingTaskViewInOrder, IsIRImageDownloaded= isIRImageDownloaded });
+                return ResponseOutput.Ok(list, new { TrialModality = criterionInfo.Modalitys , IsReadingTaskViewInOrder = criterionInfo.IsReadingTaskViewInOrder });
             }
 
 
@@ -905,7 +899,6 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
             var subjectCode = inQuery.SubjectCode;
             var subjectId = inQuery.SubjectId;
             var doctorUserId = _userInfo.UserRoleId;
-            bool? isIRImageDownloaded = null;
 
             if (inQuery.VisitTaskId != null)
             {
@@ -917,20 +910,18 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                     SubjectCode = t.IsAnalysisCreate ? t.BlindSubjectCode : t.Subject.Code,
                     SubjectId = t.SubjectId,
                     t.DoctorUserId,
-                    t.IsAnalysisCreate,
-                    t.IsIRImageDownloaded,
+                    t.IsAnalysisCreate
                 }).FirstNotNullAsync();
 
                 subjectId = taskInfo.SubjectId;
                 subjectCode = taskInfo.SubjectCode;
                 doctorUserId = (Guid)taskInfo.DoctorUserId!;
-                isIRImageDownloaded = taskInfo.IsIRImageDownloaded;
             }
 
             var info = await _readingQuestionCriterionTrialRepository.Where(t => t.Id == inQuery.TrialReadingCriterionId)
                  .Select(t => new { t.IsImageFilter, t.CriterionType, t.TrialId, t.CriterionModalitys, t.IsReadingTaskViewInOrder }).FirstNotNullAsync();
 
-            var config = await _subjectRepository.Where(t => t.Id == subjectId).Select(t => new { t.Trial.ImageFormatList, t.Trial.StudyNameList, t.Trial.IsShowStudyName, IsIRImageDownloaded= isIRImageDownloaded }).FirstOrDefaultAsync();
+            var config = await _subjectRepository.Where(t => t.Id == subjectId).Select(t => new { t.Trial.ImageFormatList, t.Trial.StudyNameList, t.Trial.IsShowStudyName }).FirstOrDefaultAsync();
 
 
             //靶段标注上传，查看访视级别，上传绑定访视级别
@@ -1884,15 +1875,10 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
         /// </summary>
         /// <param name="trialImageDownloadId"></param>
         /// <returns></returns>
-        public async Task<IResponseOutput> DownloadImageSuccess(Guid trialImageDownloadId, Guid? visitTaskId)
+        public async Task<IResponseOutput> DownloadImageSuccess(Guid trialImageDownloadId)
         {
             await _trialImageDownloadRepository.UpdatePartialFromQueryAsync(t => t.Id == trialImageDownloadId, u => new TrialImageDownload()
             { DownloadEndTime = DateTime.Now, IsSuccess = true }, true);
-
-            if (visitTaskId != null)
-            {
-                await _visitTaskRepository.BatchUpdateNoTrackingAsync(t => t.Id == visitTaskId.Value, u => new VisitTask() { IsIRImageDownloaded = true });
-            }
             return ResponseOutput.Ok();
         }
 

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

@@ -238,11 +238,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
                 return this.Emm - this.Lumen;
             }
         }
-
-        /// <summary>
-        /// 斑块破裂
-        /// </summary>
-        public string PlaqueRupture { get; set; }
     }
 
     public class TemplateData
@@ -305,16 +300,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public decimal? LipidAngle { get; set; }
 
-        /// <summary>
-        /// 斑块破裂
-        /// </summary>
-        public string PlaqueRupture { get; set; }
-
-        /// <summary>
-        /// 斑块愈合
-        /// </summary>
-        public string PlaqueHealing { get; set; }
-
 
         public decimal? Avg
         {

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

@@ -1546,20 +1546,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         public QuestionClassify? QuestionClassify { get; set; }
     }
 
-    public class GetFilterTableQuestionInDto
-    {
-        public Guid TrialId { get; set; }
-
-        public Guid VisitTaskId { get; set; }
-
-        public Guid QuestionId { get; set; }
-
-        /// <summary>
-        /// 问题分类
-        /// </summary>
-        public QuestionClassify? QuestionClassify { get; set; }
-    }
-
     #endregion
     public class GetHistoryGlobalInfoOutDto
     {

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

@@ -1401,38 +1401,6 @@ namespace IRaCIS.Core.Application.Service
             }); ;
         }
 
-        /// <summary>
-        /// 获取单个表格问题及答案 过滤问题
-        /// </summary>
-        /// <param name="inDto"></param>
-        /// <returns></returns>
-        [HttpPost]
-        public async Task<IResponseOutput> GetFilterTableQuestion(GetFilterTableQuestionInDto inDto)
-        {
-            var taskinfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync();
-            var tableAnswers = await _readingTableQuestionAnswerRepository
-                  .ProjectTo<ReadingTableQuestionAnswerInfo>(_mapper.ConfigurationProvider)
-                .Where(x => x.VisitTaskId == inDto.VisitTaskId).ToListAsync();
-            var tableAnsweRowInfos = await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId).ProjectTo<TableAnsweRowInfo>(_mapper.ConfigurationProvider).ToListAsync();
-            var organIds = tableAnsweRowInfos.Where(x => x.OrganInfoId != null).Select(x => x.OrganInfoId).Distinct().ToList();
-            var organList = await _organInfoRepository.Where(x => organIds.Contains(x.Id)).ToListAsync();
-            var questionPage = await GetReadingTableQuestion(
-                new GetReadingTableQuestionOrAnswerInDto()
-                {
-                    TrialReadingCriterionId = taskinfo.TrialReadingCriterionId,
-                    TaskId = inDto.VisitTaskId,
-                    TableAnswers = tableAnswers,
-                    TableAnsweRowInfos = tableAnsweRowInfos,
-                    OrganInfos = organList,
-                    QuestionClassify = inDto.QuestionClassify,
-                });
-
-
-            var result = questionPage.SinglePage.SelectMany(x => x.Childrens).Where(x => x.Id == inDto.QuestionId).FirstOrDefault();
-
-            return ResponseOutput.Ok(result);
-        }
-
         /// <summary>
         /// 获取自定义问题以及答案
         /// </summary>

IRaCIS.Core.Application/Service/ReadingCalculate/IVUSCalculateService.cs

@@ -298,10 +298,10 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 				//new ReadingCalculateData (){QuestionType=QuestionType.Plaque3PVA,GetDecimalNullFun=GetPlaque3PVA},
 
 
-                // 获取EMM求和
+                // (EEM-Lumen)求和
 				new ReadingCalculateData (){QuestionType=QuestionType.EEMSum,GetDecimalNullFun=GetEmmSum},
 
-                	//  (EEM-Lumen)求和
+                	// 斑块2-PAV
 				new ReadingCalculateData (){QuestionType=QuestionType.EEMSubLumenSum,GetDecimalNullFun=GetEEMLumenSum},
 
                 	// PAV（冠状动脉粥样硬化体积百分比)
@@ -494,30 +494,6 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
              
             }
 
-            string getNone(string value)
-            {
-                if (value == string.Empty || value == null)
-                {
-                    return "无";
-                }
-                else
-                {
-                    return value;
-                }
-            }
-
-
-
-            Dictionary<string, string> isPresent = new Dictionary<string, string>()
-            {
-                { "有","1"},
-                { "无","0"},
-                { "Existence","1"},
-                { "Non-existence","0"},
-                { string.Empty,string.Empty},
-            };
-
-
             List<IVUSMeasuredValue> measuredValueList = new List<IVUSMeasuredValue>();
             var errorRow = new List<int> { };
 
@@ -526,19 +502,12 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 IVUSMeasuredValue iVUSMeasuredValue = new IVUSMeasuredValue() { };
                 try
                 {
-                    // 手动抛出异常进入catch
-                    if (dataTable.Rows[i]["D"].ToString().IsNullOrEmpty())
-                    {
-                        throw new InvalidOperationException("NullError");
-                    }
-
                     iVUSMeasuredValue = new IVUSMeasuredValue()
                     {
                         //PlaqueNum = int.Parse(dataTable.Rows[i]["A"].ToString()),
                         FrameNumber = dataTable.Rows[i]["A"].ToString()??string.Empty,
                         Emm = getdecimalEmptyData(dataTable.Rows[i]["B"].ToString()),
                         Lumen = getdecimalEmptyData(dataTable.Rows[i]["C"].ToString()),
-                        PlaqueRupture= getNone(dataTable.Rows[i]["D"].ToString()),
                     };
                 }
                 catch (Exception)
@@ -654,18 +623,6 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                     TableQuestionId = tableQuestionList.Where(x => x.ReadingQuestionId == questionInfo.Id && x.QuestionMark == QuestionMark.ElasticAreaDiffValue).Select(x => x.Id).FirstOrDefault(),
                 });
 
-                // 斑块破裂
-                tableAnswers.Add(new ReadingTableQuestionAnswer()
-                {
-                    Answer = isPresent[item.PlaqueRupture.ToString()],
-                    QuestionId = questionInfo.Id,
-                    TrialId = taskinfo.TrialId,
-                    VisitTaskId = taskinfo.Id,
-                    RowId = newRowId,
-                    RowIndex = maxnum,
-                    TableQuestionId = tableQuestionList.Where(x => x.ReadingQuestionId == questionInfo.Id && x.QuestionMark == QuestionMark.PlaqueRupture).Select(x => x.Id).FirstOrDefault(),
-                });
-
 
                 // 添加其他问题答案
                 foreach (var otherQuestion in tableQuestionList.Where(x => !tableAnswers.Any(y => y.TableQuestionId == x.Id && y.RowId == newRowId)))

IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs

@@ -351,29 +351,19 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
             {
                 try
                 {
-
-                    // 手动抛出异常进入catch
-                    if (dataTable.Rows[i]["K"].ToString().IsNullOrEmpty()|| dataTable.Rows[i]["L"].ToString().IsNullOrEmpty())
-                    {
-                        throw new InvalidOperationException("NullError");
-                    }
-
                     measuredValueList.Add(new OCTFCTUploadData()
                     {
                         //PlaqueNum = int.Parse(dataTable.Rows[i]["A"].ToString()),
                         FrameNumber = dataTable.Rows[i]["A"].ToString() ?? string.Empty,
-                        LumenAreaMeasurement = getdecimalEmptyData(dataTable.Rows[i]["B"].ToString()),
-                        LipidAngle = getdecimalEmptyData(dataTable.Rows[i]["C"].ToString() ?? string.Empty),
-                        FirstData = getdecimalEmptyData(dataTable.Rows[i]["D"].ToString()),
-                        SecondData = getdecimalEmptyData(dataTable.Rows[i]["E"].ToString()),
-                        ThirdData = getdecimalEmptyData(dataTable.Rows[i]["F"].ToString()),
+                        FirstData = getdecimalEmptyData(dataTable.Rows[i]["B"].ToString()),
+                        SecondData = getdecimalEmptyData(dataTable.Rows[i]["C"].ToString()),
+                        ThirdData = getdecimalEmptyData(dataTable.Rows[i]["D"].ToString()),
+                        MacrophageInfiltrationMeasurement = getNone(dataTable.Rows[i]["E"].ToString()),
+                        MacrophageInfiltrationAngle = getdecimalEmptyData(dataTable.Rows[i]["F"].ToString() ?? string.Empty),
                         MicrochannelMeasurement = getNone(dataTable.Rows[i]["G"].ToString()),
                         CholesterolCrystalMeasurement = getNone(dataTable.Rows[i]["H"].ToString()),
-                        MacrophageInfiltrationMeasurement = getNone(dataTable.Rows[i]["I"].ToString()),
-                        MacrophageInfiltrationAngle = getdecimalEmptyData(dataTable.Rows[i]["J"].ToString() ?? string.Empty),
-                        PlaqueRupture = getNone(dataTable.Rows[i]["K"].ToString()),
-                        PlaqueHealing = getNone(dataTable.Rows[i]["L"].ToString()),
-
+                        LumenAreaMeasurement = getdecimalEmptyData(dataTable.Rows[i]["I"].ToString()),
+                        LipidAngle = getdecimalEmptyData(dataTable.Rows[i]["J"].ToString() ?? string.Empty),
                     });
                 }
                 catch (Exception)
@@ -608,30 +598,6 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                         TableQuestionId = tableQuestionList.Where(x => x.ReadingQuestionId == questionInfo.Id && x.QuestionMark == QuestionMark.LipidAngle).Select(x => x.Id).FirstOrDefault(),
                     });
 
-                    // 斑块破裂
-                    tableAnswers.Add(new ReadingTableQuestionAnswer()
-                    {
-                        Answer = isPresent[item.PlaqueRupture.ToString()],
-                        QuestionId = questionInfo.Id,
-                        TrialId = taskinfo.TrialId,
-                        VisitTaskId = taskinfo.Id,
-                        RowId = newRowId,
-                        RowIndex = maxnum,
-                        TableQuestionId = tableQuestionList.Where(x => x.ReadingQuestionId == questionInfo.Id && x.QuestionMark == QuestionMark.PlaqueRupture).Select(x => x.Id).FirstOrDefault(),
-                    });
-
-                    // 斑块愈合
-                    tableAnswers.Add(new ReadingTableQuestionAnswer()
-                    {
-                        Answer = isPresent[item.PlaqueHealing.ToString()],
-                        QuestionId = questionInfo.Id,
-                        TrialId = taskinfo.TrialId,
-                        VisitTaskId = taskinfo.Id,
-                        RowId = newRowId,
-                        RowIndex = maxnum,
-                        TableQuestionId = tableQuestionList.Where(x => x.ReadingQuestionId == questionInfo.Id && x.QuestionMark == QuestionMark.PlaqueHealing).Select(x => x.Id).FirstOrDefault(),
-                    });
-
                 }
                 catch (Exception)
                 {

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

@@ -2518,16 +2518,6 @@ namespace IRaCIS.Core.Domain.Share
         /// </summary>
         FrameNumber =1032,
 
-        /// <summary>
-        /// 斑块破裂
-        /// </summary>
-        PlaqueRupture = 1033,
-
-        /// <summary>
-        /// 斑块愈合
-        /// </summary>
-        PlaqueHealing = 1034,
-
         /// <summary>
         /// 第一次测量
         /// </summary>

IRaCIS.Core.Domain/Allocation/VisitTask.cs

@@ -324,10 +324,4 @@ public class VisitTask : BaseFullAuditEntity
 
     #endregion
 
-    #region 支持控制IR 下载影像
-
-    public bool? IsIRImageDownloaded { get; set; }
-
-    #endregion
-
 }

IRaCIS.Core.Domain/IRaCIS.Core.Domain.csproj

@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <OutputPath>..\bin</OutputPath>
-	  <NoWarn>$(NoWarn);NU1903</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

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

@@ -112,7 +112,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                 return string.Empty;
             }
 
-
+           
 
 
             if (answerType == "upload")
@@ -144,7 +144,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                     transList.Add(item + string.Empty + unitDataList.Where(y => y.Unit == unit).Select(x => x.UnitName).FirstIsNullReturnEmpty());
                 }
 
-
+               
             }
 
             return string.Join(",", transList);
@@ -1979,7 +1979,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                 await InsertInspection<Subject>(entity, type, x => new InspectionConvertDTO()
                 {
                     SubjectId = x.Id,
-                    Reason = entity.SuspendReason,
+                    Reason= entity.SuspendReason,
                     TrialSiteId = x.TrialSiteId,
 
                     //项目的信息 找离的最近的项目稽查信息
@@ -2447,8 +2447,6 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                     Reason = reason,
                     ExtraIndentification = extraIdentification,
 
-                    SubjectVisitId = entity.SourceSubjectVisitId,
-
                     ObjectRelationParentId = entity.SourceSubjectVisitId != null ? entity.SourceSubjectVisitId : entity.SouceReadModuleId,
 
                     ObjectRelationParentId2 = entity.DoctorUserId,
@@ -2479,7 +2477,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
 
                         break;
                     case "Study/amendmentPatientInfo":
-                        reason = entity.Reason;
+                        reason=entity.Reason;
 
                         break;
                 }
@@ -2580,7 +2578,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                 if (entity.VisitTaskId != null)
                 {
                     extraIdentification = "/VisitTask";
-                    var obj = await _dbContext.VisitTask.FindAsync(entity.VisitTaskId);
+                    var obj = await _dbContext.VisitTask.FindAsync( entity.VisitTaskId);
                     armEnum = obj?.ArmEnum;
                     subjectVisitId = obj.SourceSubjectVisitId;
                 }
@@ -2600,7 +2598,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                 {
                     SubjectVisitId = subjectVisitId,
                     //SubjectId = noneDicomStudy.SubjectId,
-                    VisitTaskId = x.VisitTaskId,
+                    VisitTaskId= x.VisitTaskId,
                     ObjectRelationParentId = subjectVisitId,
                     ObjectRelationParentId2 = x.NoneDicomStudyId,
                     ObjectRelationParentId3 = x.OriginNoneDicomStudyId,
@@ -2823,7 +2821,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                     SubjectVisitId = x.IsVisit ? x.ReadingId : null,
 
                     ObjectRelationParentId = entity.ClinicalDataTrialSetId,
-                    AuditIdentification = extraIndentification,
+                    AuditIdentification= extraIndentification,
 
                     //ObjectRelationParentId2 = x.IsVisit == false?x.ReadingId:null
                 },
@@ -3657,7 +3655,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
 
                 await InsertInspection<Segment>(entity, type, x => new InspectionConvertDTO()
                 {
-                    SubjectId = segmentation != null ? segmentation.SubjectId : null,
+                    SubjectId= segmentation != null ? segmentation.SubjectId : null,
                     SubjectVisitId = segmentation != null ? segmentation.SubjectVisitId : null,
                     TrialReadingCriterionId = visitTask != null ? visitTask.TrialReadingCriterionId : null,
                 });
@@ -3707,7 +3705,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                 }
                 else
                 {
-                    var questionAnswer = entitys.Where(x => x.Entity.GetType() == typeof(ReadingTaskQuestionAnswer)).Select(x => x.Entity as ReadingTaskQuestionAnswer)
+                    var questionAnswer= entitys.Where(x => x.Entity.GetType() == typeof(ReadingTaskQuestionAnswer)).Select(x => x.Entity as ReadingTaskQuestionAnswer)
                     .Where(x => x.VisitTaskId == entity.VisitTaskId && x.ReadingQuestionTrialId == entity.QuestionId).FirstOrDefault();
 
                     if (questionAnswer != null)
@@ -3736,9 +3734,9 @@ namespace IRaCIS.Core.Infra.EFCore.Common
 
 
 
-                var segmentation = await _dbContext.Segmentation.Where(x => x.Id == entity.SegmentationId).Include(x => x.VisitTask).FirstOrDefaultAsync() ?? new Segmentation() { };
+                var segmentation = await _dbContext.Segmentation.Where(x => x.Id == entity.SegmentationId).Include(x=>x.VisitTask).FirstOrDefaultAsync()?? new Segmentation() { };
 
-                var segment = await _dbContext.Segment.Where(x => x.Id == entity.SegmentId).FirstOrDefaultAsync() ?? new Segment() { };
+                var segment= await _dbContext.Segment.Where(x => x.Id == entity.SegmentId).FirstOrDefaultAsync()?? new Segment() { };
 
                 var tableQuestionName = await _dbContext.ReadingTableQuestionTrial.Where(x => x.Id == entity.TableQuestionId).Select(x => _userInfo.IsEn_Us ? x.QuestionEnName : x.QuestionName).FirstOrDefaultAsync();
                 var questionName = await _dbContext.ReadingQuestionTrial.Where(x => x.Id == entity.QuestionId).Select(x => _userInfo.IsEn_Us ? x.QuestionEnName : x.QuestionName).FirstOrDefaultAsync();
@@ -3747,15 +3745,15 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                 Guid? trialReadingCriterionId = null;
                 if (segmentation.VisitTask != null)
                 {
-                    trialReadingCriterionId = segmentation.VisitTask.TrialReadingCriterionId;
+                    trialReadingCriterionId= segmentation.VisitTask.TrialReadingCriterionId;
                 }
 
 
 
                 await InsertInspection<SegmentBinding>(entity, type, x => new InspectionConvertDTO()
                 {
-                    TrialReadingCriterionId = trialReadingCriterionId,
-                }, new
+                    TrialReadingCriterionId= trialReadingCriterionId,
+                },new 
                 {
                     segmentation.SegmentationName,
                     segmentation.SEGUrl,
@@ -3785,11 +3783,11 @@ namespace IRaCIS.Core.Infra.EFCore.Common
 
                 await InsertInspection<ReadingNoneDicomMark>(entity, type, x => new InspectionConvertDTO()
                 {
-                    SelfDefineIdentification = selfDefineIdentification + type
+                    SelfDefineIdentification= selfDefineIdentification + type
 
                 }, new
                 {
-
+                  
                 });
             }
 
@@ -3801,9 +3799,9 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                 var selfDefineIdentification = string.Empty;
 
                 var answer = string.Empty;
-                Guid? questionId = Guid.Empty;
+                Guid? questionId=Guid.Empty;
                 string tableQuestionName = string.Empty;
-                var rowMark = string.Empty;
+                var rowMark= string.Empty;
                 if (entity.TableQuestionId == null)
                 {
                     switch (type)
@@ -3837,15 +3835,15 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                             break;
                     }
                     questionId = entity.QuestionId;
-                    tableQuestionName = _dbContext.ReadingTableQuestionTrial.Where(x => x.Id == entity.TableQuestionId).Select(x => _userInfo.IsEn_Us ? x.QuestionEnName : x.QuestionName).FirstOrDefault();
+                    tableQuestionName= _dbContext.ReadingTableQuestionTrial.Where(x => x.Id == entity.TableQuestionId).Select(x => _userInfo.IsEn_Us ? x.QuestionEnName : x.QuestionName).FirstOrDefault();
                     answer = entitys.Where(x => x.Entity.GetType() == typeof(ReadingTableQuestionAnswer)).Select(x => x.Entity as ReadingTableQuestionAnswer).Select(x => x.Answer).FirstOrDefault();
-                    rowMark = _dbContext.ReadingTableAnswerRowInfo.Where(x => x.Id == entity.RowId).Select(x => x.RowMark).FirstOrDefault();
+                    rowMark= _dbContext.ReadingTableAnswerRowInfo.Where(x => x.Id == entity.RowId).Select(x => x.RowMark).FirstOrDefault();
                 }
 
 
 
 
-                var mark = entitys.Where(x => x.Entity.GetType() == typeof(ReadingNoneDicomMark)).Select(x => x.Entity as ReadingNoneDicomMark).FirstOrDefault();
+                    var mark = entitys.Where(x => x.Entity.GetType() == typeof(ReadingNoneDicomMark)).Select(x => x.Entity as ReadingNoneDicomMark).FirstOrDefault();
                 if (mark == null)
                 {
                     mark = await _dbContext.ReadingNoneDicomMark.Where(x => x.Id == entity.NoneDicomMarkId).FirstOrDefaultAsync();
@@ -3854,7 +3852,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                 var QuestionName = string.Empty;
                 if (answer != null)
                 {
-                    QuestionName = _dbContext.ReadingQuestionTrial.Where(x => x.Id == questionId).Select(x => _userInfo.IsEn_Us ? x.QuestionEnName : x.QuestionName).FirstOrDefault();
+                    QuestionName= _dbContext.ReadingQuestionTrial.Where(x => x.Id == questionId).Select(x => _userInfo.IsEn_Us ? x.QuestionEnName : x.QuestionName).FirstOrDefault();
                 }
 
                 await InsertInspection<ReadingNoneDicomMarkBinding>(entity, type, x => new InspectionConvertDTO()
@@ -3863,12 +3861,12 @@ namespace IRaCIS.Core.Infra.EFCore.Common
 
                 }, new
                 {
-                    RowMark = rowMark,
+                    RowMark= rowMark,
                     TableQuestionName = tableQuestionName,
-                    MarkName = mark == null || type == "Deleted" ? string.Empty : mark.OrderMarkName,
-                    PicturePath = mark == null ? string.Empty : mark.PicturePath,
+                    MarkName = mark==null|| type== "Deleted" ? string.Empty: mark.OrderMarkName,
+                    PicturePath= mark == null ? string.Empty : mark.PicturePath,
                     QuestionName = QuestionName,
-                    QuestinonAnswer = answer
+                    QuestinonAnswer= answer
                 });
             }
 
@@ -4154,7 +4152,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
 
                 //if (_userInfo.RequestUrl == " ReadingImageTask/splitLesion")
                 var originalRowMark = string.Empty;
-                var mergeRowMark = string.Empty;
+                var mergeRowMark =  string.Empty;
                 if (entity.SplitRowId != null)
                 {
 
@@ -4205,7 +4203,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                 }, new
                 {
                     OriginalRowMark = originalRowMark,
-                    MergeRowMark = mergeRowMark,
+                    MergeRowMark= mergeRowMark,
                     //TableName = tableName,
                     QuestionAnswerList =
 
@@ -4483,7 +4481,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
             //var generalData = await GetInspectionGeneralDataAsync(inspection);
 
             var generalData = await GetInspectionGeneralGuidAsync(inspection);
-
+         
 
             //不可少  因为稽查实体可能某些Id没有 
             MapEntityPropertyToAuditEntity(generalData, inspection);
@@ -4548,7 +4546,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
             inspection.EntityName = entityName;
             inspection.RealUrlAndEntity = _userInfo.RequestUrl + "/" + entityName + "/" + type;
 
-            inspection.Reason = inspection.Reason == string.Empty && reason != string.Empty ? reason : inspection.Reason;
+            inspection.Reason=inspection.Reason==string.Empty&&reason!=string.Empty?reason:inspection.Reason;
             await _dbContext.DataInspection.AddAsync(inspection);
 
 

IRaCIS.Core.Infra.EFCore/Migrations/20260727054038_addIRDownload.cs

@@ -1,28 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace IRaCIS.Core.Infra.EFCore.Migrations
-{
-    /// <inheritdoc />
-    public partial class addIRDownload : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<bool>(
-                name: "IsIRImageDownloaded",
-                table: "VisitTask",
-                type: "bit",
-                nullable: true);
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "IsIRImageDownloaded",
-                table: "VisitTask");
-        }
-    }
-}

IRaCIS.Core.Infra.EFCore/Migrations/IRaCISDBContextModelSnapshot.cs

@@ -16668,9 +16668,6 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                         .HasColumnType("bit")
                         .HasComment("重阅重置任务的 标注是转化之前的 还是转化之后的");
 
-                    b.Property<bool?>("IsIRImageDownloaded")
-                        .HasColumnType("bit");
-
                     b.Property<bool>("IsNeedClinicalDataSign")
                         .HasColumnType("bit")
                         .HasComment("临床数据");

IRaCIS.Core.Infrastructure/IRaCIS.Core.Infrastructure.csproj

@@ -2,7 +2,6 @@
 
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
 		<OutputPath>..\bin</OutputPath>
-		<NoWarn>$(NoWarn);NU1903</NoWarn>
 	</PropertyGroup>
 
 	<ItemGroup>