增加查询条件-修改最新查询记录-导表对应修改

IRaCIS.Core.API/IRaCIS.Core.API.xml

@@ -213,13 +213,6 @@
             <param name="opt"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.API.Controllers.InspectionController.SubmitJudgeForm(IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionDto{IRaCIS.Core.Application.Service.Reading.Dto.SetJudgeFormInDto})">
-            <summary>
-            提交阅片裁判表单
-            </summary>
-            <param name="opt"></param>
-            <returns></returns>
-        </member>
         <member name="M:IRaCIS.Core.API.Controllers.InspectionController.ConfigTrialBasicInfoConfirm(IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionDto{IRaCIS.Core.Application.Contracts.BasicTrialConfig})">
             <summary>
             配置 基础逻辑信息并确认

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

@@ -855,7 +855,7 @@
             裁决日期 CODTC
             </summary>
         </member>
-        <member name="M:IRaCIS.Core.Application.Service.Common.ExcelExportService.GetSiteSurveyEquipmentList_Export(IRaCIS.Core.Application.Contracts.SiteSurveyEquipmentQuery,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialSiteEquipmentSurvey},IRaCIS.Application.Interfaces.IDictionaryService)">
+        <member name="M:IRaCIS.Core.Application.Service.Common.ExcelExportService.GetSiteSurveyEquipmentList_Export(IRaCIS.Core.Application.Contracts.SiteSurveyEquipmentQuery,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialSiteEquipmentSurvey},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialSiteSurvey},IRaCIS.Application.Interfaces.IDictionaryService)">
             <summary>
             获取中心设备信息
             </summary>
@@ -10522,21 +10522,6 @@
             默认SegmentName
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadingTaskDto.JudgeModeEnum">
-            <summary>
-            仲裁模式
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadingTaskDto.JudgeRuleEnum">
-            <summary>
-            裁判规则
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadingTaskDto.ArbitrationRule">
-            <summary>
-            仲裁对象
-            </summary>
-        </member>
         <member name="T:IRaCIS.Core.Application.Service.Reading.Dto.GetTrialConfirmCriterionListOutDto">
             <summary>
             返回对象
@@ -11982,31 +11967,6 @@
             阅片期名称
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.TrialQuestionVisitJudgeRuleItemDto.Type">
-            <summary>
-            类型
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.TrialQuestionVisitJudgeRuleItemDto.QuestionGenre">
-            <summary>
-            问题类型
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.TrialQuestionVisitJudgeRuleItemDto.DictionaryCode">
-            <summary>
-            字典code
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.TrialQuestionVisitJudgeRuleItemDto.Unit">
-            <summary>
-            单位
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.TrialQuestionVisitJudgeRuleItemDto.AnswerCombination">
-            <summary>
-            答案组合
-            </summary>
-        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateTumorAssessmentInDto.CriterionId">
             <summary>
             标准ID
@@ -12368,21 +12328,6 @@
             仲裁规则
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTrialJudgyInfoOutDto.JudgeModeEnum">
-            <summary>
-            仲裁模式
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTrialJudgyInfoOutDto.JudgeRuleEnum">
-            <summary>
-            裁判规则
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTrialJudgyInfoOutDto.JudgeGenerateEnum">
-            <summary>
-            裁判任务生成
-            </summary>
-        </member>
         <member name="F:IRaCIS.Core.Application.Service.Reading.Dto.NeedSynchronize.Need">
             <summary>
             需要
@@ -14413,11 +14358,6 @@
             <param name="inDto"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.Application.Service.RC.ReadingQuestionService.SetTrialJudgeRuleInfo(IRaCIS.Core.Application.Service.Reading.Dto.SetTrialJudgeRuleInfoInDto)">
-            <summary>
-            编辑裁判规则配置
-            </summary>
-        </member>
         <member name="M:IRaCIS.Core.Application.Service.RC.ReadingQuestionService.AddOrUpdateReadingQuestionCriterionTrial(IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionCriterionTrialInDto)">
             <summary>
             新增修改项目问题标准（项目）
@@ -14519,22 +14459,11 @@
             阅片问题.标准
             </summary>
         </member>
-        <member name="M:IRaCIS.Core.Application.Service.ReadingQuestionService.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectVisit},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingQuestionCriterionSystem},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.ReadingQuestionTrial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ClinicalDataTrialSet},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ClinicalDataSystemSet},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Dictionary},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.CriterionNidusSystem},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SystemCriterionDictionaryCode},IRaCIS.Core.Application.Contracts.IReadingImageTaskService,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingSystemCriterionDictionary},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingTableQuestionTrial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingCriterionPage},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TumorAssessment_RECIST1Point1},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.OrganInfo},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingTableQuestionSystem},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingTaskQuestionAnswer},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.PreviousPDF},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingQuestionVisitJudgeRule},AutoMapper.IMapper,IRaCIS.Core.Domain.Share.IUserInfo,Microsoft.Extensions.Localization.IStringLocalizer)">
+        <member name="M:IRaCIS.Core.Application.Service.ReadingQuestionService.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectVisit},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingQuestionCriterionSystem},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.ReadingQuestionTrial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ClinicalDataTrialSet},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ClinicalDataSystemSet},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Dictionary},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.CriterionNidusSystem},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SystemCriterionDictionaryCode},IRaCIS.Core.Application.Contracts.IReadingImageTaskService,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingSystemCriterionDictionary},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingTableQuestionTrial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingCriterionPage},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TumorAssessment_RECIST1Point1},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.OrganInfo},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingTableQuestionSystem},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingTaskQuestionAnswer},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.PreviousPDF},AutoMapper.IMapper,IRaCIS.Core.Domain.Share.IUserInfo,Microsoft.Extensions.Localization.IStringLocalizer)">
             <summary>
             阅片问题.标准
             </summary>
         </member>
-        <member name="M:IRaCIS.Core.Application.Service.ReadingQuestionService.GetTrialQuestionVisitJudgeRule(IRaCIS.Core.Application.Service.Reading.Dto.GetTrialQuestionVisitJudgeRuleInDto)">
-            <summary>
-            获取项目阅片标准各访视的裁判规则配置。
-            未配置规则的访视问题也会返回，供前端直接进行配置。
-            </summary>
-        </member>
-        <member name="M:IRaCIS.Core.Application.Service.ReadingQuestionService.SetTrialQuestionVisitJudgeRule(IRaCIS.Core.Application.Service.Reading.Dto.SetTrialQuestionVisitJudgeRuleInDto)">
-            <summary>
-            编辑项目阅片标准各访视的裁判规则配置。
-            </summary>
-        </member>
         <member name="M:IRaCIS.Core.Application.Service.ReadingQuestionService.SetTrialQuestionExportResult(IRaCIS.Core.Application.Service.Reading.Dto.SetTrialQuestionExportResultInDto)">
             <summary>
             设置项目问题导出
@@ -14904,7 +14833,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.TrialUserRole},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.EmailNoticeUserType},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.EmailNoticeConfig},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.ReadingQuestionVisitJudgeRule},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,Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.SystemEmailSendConfig},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.TrialUserRole},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.EmailNoticeUserType},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.EmailNoticeConfig},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,Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.SystemEmailSendConfig},AutoMapper.IMapper,IRaCIS.Core.Domain.Share.IUserInfo,Microsoft.Extensions.Localization.IStringLocalizer,ZiggyCreatures.Caching.Fusion.IFusionCache)">
             <summary>
             IR影像阅片
             </summary>
@@ -15334,30 +15263,6 @@
             <param name="inDto"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.Application.Service.ReadingImageTaskService.GetSingleVisitJudgeAnswer(IRaCIS.Core.Application.Service.Reading.Dto.GetSingleVisitJudgeAnswerInDto)">
-            <summary>
-            获取单访视裁判答案
-            </summary>
-            <param name="inDto"></param>
-            <returns></returns>
-        </member>
-        <member name="M:IRaCIS.Core.Application.Service.ReadingImageTaskService.GetJudgeForm(IRaCIS.Core.Application.Service.Reading.Dto.GetJudgeFormInDto)">
-            <summary>
-            获取裁判表单
-            </summary>
-        </member>
-        <member name="M:IRaCIS.Core.Application.Service.ReadingImageTaskService.SetJudgeForm(IRaCIS.Core.Application.Service.Reading.Dto.SetJudgeFormInDto)">
-            <summary>
-            编辑裁判表单
-            </summary>
-        </member>
-        <member name="M:IRaCIS.Core.Application.Service.ReadingImageTaskService.SubmitJudgeForm(IRaCIS.Core.Application.Service.Reading.Dto.SetJudgeFormInDto)">
-            <summary>
-            提交裁判表单
-            </summary>
-            <param name="inDto"></param>
-            <returns></returns>
-        </member>
         <member name="M:IRaCIS.Core.Application.Service.ReadingImageTaskService.GetJudgeReadingInfo(IRaCIS.Core.Application.Service.Reading.Dto.GetJudgeReadingInfo)">
             <summary>
             获取裁判阅片任务信息
@@ -15391,16 +15296,6 @@
             <param name="visitTaskId"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.Application.Service.ReadingImageTaskService.ApplyVisitJudgeRules(System.Collections.Generic.List{IRaCIS.Core.Application.Service.Reading.Dto.TaskAnswerDto},IRaCIS.Core.Domain.Models.JudgeRule)">
-            <summary>
-            应用访视裁判规则 以及剔除排除的问题
-            </summary>
-        </member>
-        <member name="M:IRaCIS.Core.Application.Service.ReadingImageTaskService.ApplyVisitJudgeRules(System.Collections.Generic.List{IRaCIS.Core.Application.Service.Reading.Dto.GlobalQuestionInfo},System.Decimal,IRaCIS.Core.Domain.Models.JudgeRule)">
-            <summary>
-            应用访视裁判规则 以及剔除排除的问题
-            </summary>
-        </member>
         <member name="M:IRaCIS.Core.Application.Service.ReadingImageTaskService.SendWeComNotifier(System.Guid,System.String)">
             <summary>
             发送微信通知

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

@@ -85,9 +85,23 @@ namespace IRaCIS.Core.Application.Service.Common
         [HttpPost]
         public async Task<IActionResult> GetSiteSurveyEquipmentList_Export(SiteSurveyEquipmentQuery inQuery,
              [FromServices] IRepository<TrialSiteEquipmentSurvey> _trialSiteEquipmentSurveyRepository,
+             [FromServices] IRepository<TrialSiteSurvey> _trialSiteSurveyRepository,
             [FromServices] IDictionaryService _dictionaryService)
         {
+
+
+            //找到该中心最新的调研记录
+            var groupSelectIdQuery =
+                _trialSiteSurveyRepository.Where(t => t.TrialId == inQuery.TrialId)
+                    .WhereIf(inQuery.TrialSiteId != null, t => t.TrialSiteId == inQuery.TrialSiteId)
+                    .GroupBy(t => t.TrialSiteId)
+                    .Select(g => g.OrderByDescending(u => u.CreateTime).Select(t => t.Id).First());
+
+
             var query = _trialSiteEquipmentSurveyRepository.Where(t => t.TrialSiteSurvey.TrialId == inQuery.TrialId)
+                .IgnoreQueryFilters().Where(t => groupSelectIdQuery.Contains(t.TrialSiteSurveyId))
+                .WhereIf(inQuery.IsDeleted != null, t => t.TrialSiteSurvey.IsDeleted == inQuery.IsDeleted)
+                .WhereIf(inQuery.State != null, t => t.TrialSiteSurvey.State == inQuery.State)
                 .WhereIf(inQuery.TrialSiteId != null, t => t.TrialSiteSurvey.TrialSiteId == inQuery.TrialSiteId)
                 .WhereIf(inQuery.TrialSiteCode.IsNotNullOrEmpty(), t => t.TrialSiteSurvey.TrialSite.TrialSiteCode.Contains(inQuery.TrialSiteCode))
                 .WhereIf(inQuery.TrialSiteName.IsNotNullOrEmpty(), t => t.TrialSiteSurvey.TrialSite.TrialSiteAliasName.Contains(inQuery.TrialSiteName) ||
@@ -145,7 +159,18 @@ namespace IRaCIS.Core.Application.Service.Common
             [FromServices] IRepository<TrialSiteSurvey> _trialSiteSurveyRepository,
             [FromServices] IDictionaryService _dictionaryService)
         {
-            var query = _trialSiteSurveyRepository.Where(t => t.TrialId == inQuery.TrialId)
+
+            //找到该中心最新的调研记录
+            var groupSelectIdQuery =
+                _trialSiteSurveyRepository.Where(t => t.TrialId == inQuery.TrialId)
+                    .WhereIf(inQuery.TrialSiteId != null, t => t.TrialSiteId == inQuery.TrialSiteId)
+                    .GroupBy(t => t.TrialSiteId)
+                    .Select(g => g.OrderByDescending(u => u.CreateTime).Select(t => t.Id).First());
+
+            var query = _trialSiteSurveyRepository.Where(t => t.TrialId == inQuery.TrialId).IgnoreQueryFilters()
+                .Where(t => groupSelectIdQuery.Contains(t.Id))
+                .WhereIf(inQuery.IsDeleted != null, t => t.IsDeleted == inQuery.IsDeleted)
+                .WhereIf(inQuery.State != null, t => t.State == inQuery.State)
                 .WhereIf(inQuery.TrialSiteId != null, t => t.TrialSiteId == inQuery.TrialSiteId)
                 .WhereIf(inQuery.TrialSiteCode.IsNotNullOrEmpty(), t => t.TrialSite.TrialSiteCode.Contains(inQuery.TrialSiteCode))
                 .WhereIf(inQuery.TrialSiteName.IsNotNullOrEmpty(), t => t.TrialSite.TrialSiteAliasName.Contains(inQuery.TrialSiteName) ||

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

@@ -507,6 +507,12 @@ namespace IRaCIS.Core.Application.Contracts
         public string UserName { get; set; } = string.Empty;
         public string Phone { get; set; } = string.Empty;
         public string Email { get; set; } = string.Empty;
+
+        [DictionaryTranslate("YesOrNo")]
+        public bool IsDeleted { get; set; }
+
+        [DictionaryTranslate("ResearchRecord")]
+        public TrialSiteSurveyEnum State { get; set; }
     }
 
     public class SiteSurveyEquipmentQuery : PageInput
@@ -518,6 +524,10 @@ namespace IRaCIS.Core.Application.Contracts
         public string? TrialSiteCode { get; set; }
 
         public string? TrialSiteName { get; set; }
+
+        public bool? IsDeleted { get; set; }
+
+        public TrialSiteSurveyEnum? State { get; set; }
     }
 
     public class SiteSurveyInfoQuery : PageInput
@@ -530,6 +540,10 @@ namespace IRaCIS.Core.Application.Contracts
         public string? TrialSiteCode { get; set; }
 
         public string? TrialSiteName { get; set; }
+
+        public bool? IsDeleted { get; set; }
+
+        public TrialSiteSurveyEnum? State { get; set; }
     }
 
     public class SiteSurveyInfoDto

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

@@ -1489,7 +1489,9 @@ namespace IRaCIS.Core.Application.Contracts
         [HttpPost]
         public async Task<IResponseOutput> GetSiteSurveyEquipmentList(SiteSurveyEquipmentQuery inQuery)
         {
-            var pageList = await _trialSiteEquipmentSurveyRepository.Where(t => t.TrialSiteSurvey.TrialId == inQuery.TrialId)
+            var pageList = await _trialSiteEquipmentSurveyRepository.Where(t => t.TrialSiteSurvey.TrialId == inQuery.TrialId).IgnoreQueryFilters()
+                .WhereIf(inQuery.IsDeleted != null, t => t.TrialSiteSurvey.IsDeleted == inQuery.IsDeleted)
+                .WhereIf(inQuery.State != null, t => t.TrialSiteSurvey.State == inQuery.State)
                 .WhereIf(inQuery.TrialSiteId != null, t => t.TrialSiteSurvey.TrialSiteId == inQuery.TrialSiteId)
                 .WhereIf(inQuery.TrialSiteCode.IsNotNullOrEmpty(), t => t.TrialSiteSurvey.TrialSite.TrialSiteCode.Contains(inQuery.TrialSiteCode))
                 .WhereIf(inQuery.TrialSiteName.IsNotNullOrEmpty(), t => t.TrialSiteSurvey.TrialSite.TrialSiteAliasName.Contains(inQuery.TrialSiteName) ||
@@ -1511,7 +1513,9 @@ namespace IRaCIS.Core.Application.Contracts
         [HttpPost]
         public async Task<IResponseOutput> GetSiteSurveyInfoList(SiteSurveyInfoQuery inQuery)
         {
-            var pageList = await _trialSiteSurveyRepository.Where(t => t.TrialId == inQuery.TrialId)
+            var pageList = await _trialSiteSurveyRepository.Where(t => t.TrialId == inQuery.TrialId).IgnoreQueryFilters()
+                .WhereIf(inQuery.IsDeleted != null, t => t.IsDeleted == inQuery.IsDeleted)
+                .WhereIf(inQuery.State != null, t => t.State == inQuery.State)
                 .WhereIf(inQuery.TrialSiteId != null, t => t.TrialSiteId == inQuery.TrialSiteId)
                 .WhereIf(inQuery.TrialSiteCode.IsNotNullOrEmpty(), t => t.TrialSite.TrialSiteCode.Contains(inQuery.TrialSiteCode))
                 .WhereIf(inQuery.TrialSiteName.IsNotNullOrEmpty(), t => t.TrialSite.TrialSiteAliasName.Contains(inQuery.TrialSiteName) ||

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

@@ -102,6 +102,8 @@ namespace IRaCIS.Core.Application.AutoMapper
             CreateMap<SiteSurveyLog, SiteSurveyLogDTO>();
 
             CreateMap<TrialSiteEquipmentSurvey, SiteSurveyEquipmentDto>()
+                 .ForMember(d => d.IsDeleted, u => u.MapFrom(s => s.TrialSiteSurvey.IsDeleted))
+             .ForMember(d => d.State, u => u.MapFrom(s => s.TrialSiteSurvey.State))
               .ForMember(d => d.Email, u => u.MapFrom(s => s.TrialSiteSurvey.Email))
              .ForMember(d => d.Phone, u => u.MapFrom(s => s.TrialSiteSurvey.Phone))
              .ForMember(d => d.UserName, u => u.MapFrom(s => s.TrialSiteSurvey.UserName))