diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs index bf2269ccc..f281d84ed 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs @@ -86,10 +86,10 @@ namespace IRaCIS.Core.Application.ViewModel public class GetTrialOrganListInDto { public Guid TrialId { get; set; } - /// - /// 类型枚举 - /// - public OrganType? OrganType { get; set; } + + public Guid? CriterionNidusId { get; set; } + + public bool? IsEnable { get; set; } } public class GetTrialCheckOrganList : GetTrialOrganListOutDto @@ -103,12 +103,10 @@ namespace IRaCIS.Core.Application.ViewModel public string? Part { get; set; } public string? TULOC { get; set; } public string? TULAT { get; set; } - - /// - /// 类型枚举 - /// - public OrganType? OrganType { get; set; } + public Guid CriterionNidusId { get; set; } + + public bool IsEnable { get; set; } /// /// 备注 @@ -120,12 +118,14 @@ namespace IRaCIS.Core.Application.ViewModel public class OrganInfoQuery { - /// /// 类型枚举 /// public OrganType? OrganType { get; set; } + + public Guid? CriterionNidusId { get; set; } + } /// OrganInfoAddOrEdit 列表查询参数模型 @@ -137,10 +137,7 @@ namespace IRaCIS.Core.Application.ViewModel public string TULAT { get; set; } - /// - /// 类型枚举 - /// - public OrganType OrganType { get; set; } + /// /// 备注 @@ -148,9 +145,14 @@ namespace IRaCIS.Core.Application.ViewModel public string Remark { get; set; } /// - /// 是否关联 + /// 是否是淋巴结 /// - public IsDepend IsDepend { get; set; } + public bool IsLymphNodes { get; set; } + + /// + /// 标准 病灶类型 + /// + public Guid CriterionNidusId { get; set; } public DateTime CreateTime { get; set; } public Guid CreateUserId { get; set; } diff --git a/IRaCIS.Core.Application/Service/Reading/OrganInfoService.cs b/IRaCIS.Core.Application/Service/Reading/OrganInfoService.cs index 977b8705a..40c0f0a72 100644 --- a/IRaCIS.Core.Application/Service/Reading/OrganInfoService.cs +++ b/IRaCIS.Core.Application/Service/Reading/OrganInfoService.cs @@ -88,7 +88,7 @@ namespace IRaCIS.Core.Application.Service { var organInfoQueryable = _organInfoRepository - .WhereIf(inQuery.OrganType!=null, x => x.OrganType == inQuery.OrganType) + .WhereIf(inQuery.CriterionNidusId != null, x => x.CriterionNidusId == inQuery.CriterionNidusId) .ProjectTo(_mapper.ConfigurationProvider); return await organInfoQueryable.ToListAsync(); } @@ -165,8 +165,8 @@ namespace IRaCIS.Core.Application.Service [HttpPost] public async Task> GetTrialOrganList(GetTrialOrganListInDto inDto) { - var organInfoQueryable = from data in _organInfoRepository.WhereIf(inDto.OrganType!=null, x => x.OrganType == inDto.OrganType) - join trialData in _organTrialInfoRepository.WhereIf(inDto.OrganType != null, x => x.OrganType == inDto.OrganType) + var organInfoQueryable = from data in _organInfoRepository.WhereIf(inDto.CriterionNidusId !=null, x => x.CriterionNidusId == inDto.CriterionNidusId) + join trialData in _organTrialInfoRepository.WhereIf(inDto.IsEnable != null, x => x.IsEnable == inDto.IsEnable) .Where(x => x.TrialId == inDto.TrialId) on data.Id equals trialData.OrganInfoId select new GetTrialOrganListOutDto() @@ -176,7 +176,8 @@ namespace IRaCIS.Core.Application.Service TULAT = data.TULAT, TULOC = data.TULOC, Remark= data.Remark, - OrganType=data.OrganType, + CriterionNidusId = data.CriterionNidusId, + IsEnable= trialData.IsEnable, }; @@ -193,8 +194,8 @@ namespace IRaCIS.Core.Application.Service [HttpPost] public async Task> GetTrialCheckOrganList(GetTrialOrganListInDto inDto) { - var organInfoQueryable = from data in _organInfoRepository.WhereIf(inDto.OrganType != null, x => x.OrganType == inDto.OrganType) - join trialData in _organTrialInfoRepository.WhereIf(inDto.OrganType != null, x => x.OrganType == inDto.OrganType) + var organInfoQueryable = from data in _organInfoRepository.WhereIf(inDto.CriterionNidusId != null, x => x.CriterionNidusId == inDto.CriterionNidusId) + join trialData in _organTrialInfoRepository.WhereIf(inDto.IsEnable != null, x => x.IsEnable == inDto.IsEnable) .Where(x => x.TrialId == inDto.TrialId) on data.Id equals trialData.OrganInfoId into jtemp from leftjoin in jtemp.DefaultIfEmpty() @@ -207,7 +208,8 @@ namespace IRaCIS.Core.Application.Service IsCheckd= leftjoin!=null, Remark = data.Remark, - OrganType=data.OrganType, + CriterionNidusId = data.CriterionNidusId, + IsEnable = leftjoin.IsEnable, }; diff --git a/IRaCIS.Core.Domain/Reading/OrganInfo.cs b/IRaCIS.Core.Domain/Reading/OrganInfo.cs index fd250c6b9..dd7189d89 100644 --- a/IRaCIS.Core.Domain/Reading/OrganInfo.cs +++ b/IRaCIS.Core.Domain/Reading/OrganInfo.cs @@ -37,16 +37,16 @@ namespace IRaCIS.Core.Domain.Models /// public string Remark { get; set; } - /// - /// 类型名称 - /// - public string TypeName { get; set; } + /// + /// 是否是淋巴结 + /// + public bool IsLymphNodes { get; set; } /// - /// 类型枚举 + /// 标准 病灶类型 /// - public OrganType OrganType { get; set; } + public Guid CriterionNidusId { get; set; } /// /// 创建时间 diff --git a/IRaCIS.Core.Domain/Reading/OrganTrialInfo.cs b/IRaCIS.Core.Domain/Reading/OrganTrialInfo.cs index 42a57954b..c70c18633 100644 --- a/IRaCIS.Core.Domain/Reading/OrganTrialInfo.cs +++ b/IRaCIS.Core.Domain/Reading/OrganTrialInfo.cs @@ -26,19 +26,11 @@ namespace IRaCIS.Core.Domain.Models /// public Guid TrialId { get; set; } - /// - /// 类型枚举 - /// - public OrganType OrganType { get; set; } + public bool IsEnable { get; set; } /// - /// 类型名称 + /// CreateTime /// - public string TypeName { get; set; } - - /// - /// CreateTime - /// public DateTime CreateTime { get; set; } ///