From ca44f1ea82250f346b3073cd8a4287f35972a65a Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Thu, 5 May 2022 14:06:45 +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

---
 IRaCIS.Core.Application/IRaCIS.Core.Application.xml    |  7 +++++++
 .../Service/Inspection/DTO/InspectionModel.cs          |  2 +-
 .../Service/Inspection/InspectionService.cs            | 10 +++++-----
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index ce63ae54..19b163f5 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -56,6 +56,13 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.FrontAuditConfigService.CopyFrontAuditConfigItem(IRaCIS.Core.Infra.EFCore.Dto.CopyFrontAuditConfigItemDto)">
+            <summary>
+            
+            </summary>
+            <param name="input"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.Service.FrontAuditConfigService.BatchAddFrontAudit(IRaCIS.Core.Application.ViewModel.BatchAddFrontAudit)">
             <summary>
             批量添加字段
diff --git a/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs b/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs
index c68303aa..bb3ccb31 100644
--- a/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs
+++ b/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs
@@ -426,7 +426,7 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO
         /// <summary>
         /// 功能模块
         /// </summary>
-        public string ModuleType { get; set; } = string.Empty;
+        public Guid? ModuleType { get; set; }
 
         /// <summary>
         /// Description
diff --git a/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs b/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs
index ba903468..2afcd835 100644
--- a/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs
+++ b/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs
@@ -90,19 +90,19 @@ namespace IRaCIS.Core.Application.Service.Inspection
 
 
 
-                        join moduleTypec in _repository.GetQueryable<Dictionary>() on new { ModuleType = leftfrontAuditConfig.ModuleTypeId } equals new { ModuleType = moduleTypec.Id.ToString() } into moduleTypectemp
+                        join moduleTypec in _repository.GetQueryable<Dictionary>() on new { ModuleType = leftfrontAuditConfig.ModuleTypeId.Value } equals new { ModuleType = moduleTypec.Id } into moduleTypectemp
                         from leftmoduleTypec in moduleTypectemp.DefaultIfEmpty()
 
 
                       
-                        join OptTypec in _repository.GetQueryable<Dictionary>() on new { ModuleType = leftfrontAuditConfig.OptTypeId } equals new { ModuleType = OptTypec.Id.ToString() } into optTypetemp
+                        join OptTypec in _repository.GetQueryable<Dictionary>() on new { ModuleType = leftfrontAuditConfig.OptTypeId.Value } equals new { ModuleType = OptTypec.Id } into optTypetemp
                         from leftOptType in optTypetemp.DefaultIfEmpty()
 
                         select new GetDataInspectionOutDto()
                         {
                             CreateTime = data.CreateTime,
                             CreateUserId = data.CreateUserId,
-                            ModuleType = leftmoduleTypec.Id.ToString(),
+                            ModuleType = leftmoduleTypec.Id,
                             BlindName = data.BlindName,
                             TrialId = data.TrialId,
                             SiteId = data.SiteId,
@@ -140,7 +140,7 @@ namespace IRaCIS.Core.Application.Service.Inspection
                             SignText= lefttrialSign.SignText,
                             Identification= leftfrontAuditConfig.Identification,
                             ParentIdentification = leftparent.Identification,
-                            OptType = leftOptType.Value,
+                            OptType = leftOptType.Id,
                             VisitNum=leftsubjectVisit.VisitNum,
                             IsFrontAdd=data.IsFrontAdd
 
@@ -152,7 +152,7 @@ namespace IRaCIS.Core.Application.Service.Inspection
                  .WhereIf(dto.VisitPlanInfo != null, x => x.VisitNum == dto.VisitPlanInfo)
                  .WhereIf(dto.StartTime != null, x => x.CreateTime >= dto.StartTime)
                  .WhereIf(dto.EndTime != null, x => x.CreateTime <= dto.EndTime)
-                 .WhereIf(!dto.ModuleType.IsNullOrEmpty(), x => x.ModuleType == dto.ModuleType)
+                 .WhereIf(dto.ModuleType!=null, x => x.ModuleType == dto.ModuleType)
                  .WhereIf(!dto.Description.IsNullOrEmpty(), x => x.Description == dto.Description)
                  .WhereIf(!dto.OpByUserName.IsNullOrEmpty(), x => x.CreateUserName.Contains(dto.OpByUserName))
                  //.WhereIf(!dto.SubjectInfo.IsNullOrEmpty(), x => x.SubjectCode.Contains(dto.SubjectInfo))