From 9e719f51582c7a4fc73a8ca23c8a633238f46ac6 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Fri, 12 Aug 2022 17:54:09 +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/Reading/Dto/OrganInfoViewModel.cs        | 12 ++++--------
 .../Service/Reading/OrganInfoService.cs              |  6 +++---
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs
index 97beb3856..b81c4a8d9 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs
@@ -14,10 +14,7 @@ namespace IRaCIS.Core.Application.ViewModel
     {
         public Guid TrialId { get; set; }
 
-        ///// <summary>
-        ///// 类型枚举
-        ///// </summary>
-        //public OrganType OrganType { get; set; }
+     
 
         public List<Guid> OrganIds { get; set; }
     }
@@ -30,7 +27,7 @@ namespace IRaCIS.Core.Application.ViewModel
         public string Part { get; set; }
         public string TULOC { get; set; }
         public string TULAT { get; set; }
-        public string TypeName { get; set; }
+     
         public DateTime CreateTime { get; set; }
 
         /// <summary>
@@ -67,7 +64,7 @@ namespace IRaCIS.Core.Application.ViewModel
         public string? Part { get; set; }
         public string? TULOC { get; set; }
         public string? TULAT { get; set; }
-        public string? TypeName { get; set; }
+  
 
         /// <summary>
 		/// 类型枚举
@@ -83,8 +80,7 @@ namespace IRaCIS.Core.Application.ViewModel
     ///<summary>OrganInfoQuery  列表查询参数模型</summary>
     public class OrganInfoQuery
     {
-        ///<summary> 类型名称</summary>
-        public string? TypeName { get; set; }
+     
 
         /// <summary>
         /// 类型枚举
diff --git a/IRaCIS.Core.Application/Service/Reading/OrganInfoService.cs b/IRaCIS.Core.Application/Service/Reading/OrganInfoService.cs
index ba973dddc..af3dd129b 100644
--- a/IRaCIS.Core.Application/Service/Reading/OrganInfoService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/OrganInfoService.cs
@@ -41,7 +41,7 @@ namespace IRaCIS.Core.Application.Service
         public async Task<List<OrganInfoView>> GetOrganInfoList(OrganInfoQuery inQuery)
         {
             var organInfoQueryable = _organInfoRepository
-            .WhereIf(!inQuery.TypeName.IsNullOrEmpty(),x=>x.TypeName==inQuery.TypeName)
+         
                .WhereIf(inQuery.OrganType!=null, x => x.OrganType == inQuery.OrganType)
             .ProjectTo<OrganInfoView>(_mapper.ConfigurationProvider);
             return await organInfoQueryable.ToListAsync();
@@ -129,7 +129,7 @@ namespace IRaCIS.Core.Application.Service
                                          Part = data.Part,
                                          TULAT = data.TULAT,
                                          TULOC = data.TULOC,
-                                         TypeName = data.TypeName,
+                                       
                                          Remark= data.Remark,
                                          OrganType=data.OrganType,
                                      };
@@ -159,7 +159,7 @@ namespace IRaCIS.Core.Application.Service
                                          Part = data.Part,
                                          TULAT = data.TULAT,
                                          TULOC = data.TULOC,
-                                         TypeName = data.TypeName,
+                                       
                                          IsCheckd= leftjoin!=null,
                                          Remark = data.Remark,
                                          OrganType=data.OrganType,