IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs

@@ -350,7 +350,6 @@ 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; }
 
@@ -462,7 +461,6 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO
     {
 
 
-        public Guid? FrontAuditConfigId { get; set; }
         /// <summary>
         /// 项目iD
         /// </summary>

IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs

@@ -8,6 +8,7 @@ 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;
@@ -15,6 +16,8 @@ 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
 {
@@ -1195,7 +1198,7 @@ namespace IRaCIS.Core.Application.Service
         /// <param name="trialId"></param>
         /// <returns></returns>
         [HttpGet]
-        public async Task<object> GetModuleTypeDescriptionLiset(Guid moduleTypeId,Guid trialId)
+        public async Task<List<string>> GetModuleTypeDescriptionList(Guid moduleTypeId,Guid trialId)
         {
 
 
@@ -1205,11 +1208,10 @@ namespace IRaCIS.Core.Application.Service
                          select new
                          {
                              IsShow= lefttrialshow==null? data.IsDefaultChoice : lefttrialshow.IsShow,
-                             FrontAuditConfigId = data.Id,
-                             Description =  _userInfo.IsEn_Us ? data.Description : data.DescriptionCN
+                             Description=  _userInfo.IsEn_Us ? data.Description : data.DescriptionCN
                          };
           
-            return result.Where(x=>x.IsShow).Distinct().ToList();
+            return result.Where(x=>x.IsShow).Select(x=>x.Description).Distinct().ToList();
         }
 
         /// <summary>

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 ||