From 04aa2c79f6884cc6a67c846abacdfff61ef5f224 Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Tue, 10 Jun 2025 09:13:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Inspection/DTO/InspectionModel.cs          |  2 ++
 .../Service/Inspection/FrontAuditConfigService.cs      | 10 ++++------
 .../Service/Inspection/InspectionService.cs            |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs b/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs
index 01c14b8df..187c35e81 100644
--- a/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs
+++ b/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs
@@ -350,6 +350,7 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO
     public class GetDataInspectionOutDto : DataInspection
     {
         public bool IsShow { get; set; }
+
         public string TrialReadingCriterionName { get; set; }
         public string BlindName { get; set; }
 
@@ -461,6 +462,7 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO
     {
 
 
+        public Guid? FrontAuditConfigId { get; set; }
         /// <summary>
         /// 项目iD
         /// </summary>
diff --git a/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs b/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs
index 6fe49152e..b47e30801 100644
--- a/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs
+++ b/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs
@@ -8,7 +8,6 @@ using IRaCIS.Application.Contracts;
 using IRaCIS.Core.Application.Interfaces;
 using IRaCIS.Core.Application.ViewModel;
 using IRaCIS.Core.Domain.Models;
-using IRaCIS.Core.Domain.Share;
 using IRaCIS.Core.Infra.EFCore.Common;
 using MassTransit;
 using Microsoft.AspNetCore.Mvc;
@@ -16,8 +15,6 @@ using Microsoft.Data.SqlClient;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Npgsql;
-using NPOI.POIFS.Properties;
-using NPOI.SS.Formula.Functions;
 
 namespace IRaCIS.Core.Application.Service
 {
@@ -1198,7 +1195,7 @@ namespace IRaCIS.Core.Application.Service
         /// <param name="trialId"></param>
         /// <returns></returns>
         [HttpGet]
-        public async Task<List<string>> GetModuleTypeDescriptionList(Guid moduleTypeId,Guid trialId)
+        public async Task<object> GetModuleTypeDescriptionLiset(Guid moduleTypeId,Guid trialId)
         {
 
 
@@ -1208,10 +1205,11 @@ namespace IRaCIS.Core.Application.Service
                          select new
                          {
                              IsShow= lefttrialshow==null? data.IsDefaultChoice : lefttrialshow.IsShow,
-                             Description=  _userInfo.IsEn_Us ? data.Description : data.DescriptionCN
+                             FrontAuditConfigId = data.Id,
+                             Description =  _userInfo.IsEn_Us ? data.Description : data.DescriptionCN
                          };
           
-            return result.Where(x=>x.IsShow).Select(x=>x.Description).Distinct().ToList();
+            return result.Where(x=>x.IsShow).Distinct().ToList();
         }
 
         /// <summary>
diff --git a/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs b/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs
index 405c11185..665bd0618 100644
--- a/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs
+++ b/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs
@@ -209,7 +209,7 @@ namespace IRaCIS.Core.Application.Service.Inspection
                     //.Where(x => (x.TrialId == dto.TrialId) || (x.TrialId == null && x.CreateTime >= trialData.CreateTime && x.CreateTime <= trialData.TrialFinishTime))
                     .Where(x => x.TrialId == inQuery.TrialId)
                      .Where(x => x.IsShow)
-
+                       .WhereIf(inQuery.FrontAuditConfigId != null, x => x.FrontAuditConfigId == inQuery.FrontAuditConfigId)
             #region 废弃
                    //   .WhereIf(dto.BatchId != null && dto.ObjectRelationParentId == null && dto.GeneralId == null, x => x.BatchId == dto.BatchId)
                    //  .WhereIf(dto.BatchId != null && dto.GeneralId != null && dto.ObjectRelationParentId == null, x => x.BatchId == dto.BatchId ||