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; }
- /////
- ///// 类型枚举
- /////
- //public OrganType OrganType { get; set; }
+
public List 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; }
///
@@ -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; }
+
///
/// 类型枚举
@@ -83,8 +80,7 @@ namespace IRaCIS.Core.Application.ViewModel
///OrganInfoQuery 列表查询参数模型
public class OrganInfoQuery
{
- /// 类型名称
- public string? TypeName { get; set; }
+
///
/// 类型枚举
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> 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(_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,