diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs index cc7391c6d..a8ee6f5f6 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs @@ -35,13 +35,22 @@ namespace IRaCIS.Core.Application.ViewModel /// public string Remark { get; set; } public Guid CreateUserId { get; set; } + + + /// + /// 类型枚举 + /// + public OrganType OrganType { get; set; } } public class GetTrialOrganListInDto { public Guid TrialId { get; set; } - public string TypeName { get; set; } + /// + /// 类型枚举 + /// + public OrganType OrganType { get; set; } } public class GetTrialCheckOrganList : GetTrialOrganListOutDto @@ -57,6 +66,11 @@ namespace IRaCIS.Core.Application.ViewModel public string TULAT { get; set; } public string TypeName { get; set; } + /// + /// 类型枚举 + /// + public OrganType OrganType { get; set; } + /// /// 备注 /// @@ -80,6 +94,11 @@ namespace IRaCIS.Core.Application.ViewModel public string TULAT { get; set; } public string TypeName { get; set; } + /// + /// 类型枚举 + /// + public OrganType OrganType { get; set; } + /// /// 备注 /// diff --git a/IRaCIS.Core.Application/Service/Reading/OrganInfoService.cs b/IRaCIS.Core.Application/Service/Reading/OrganInfoService.cs index 77bb2e94c..602bf2e01 100644 --- a/IRaCIS.Core.Application/Service/Reading/OrganInfoService.cs +++ b/IRaCIS.Core.Application/Service/Reading/OrganInfoService.cs @@ -116,8 +116,8 @@ namespace IRaCIS.Core.Application.Service [HttpPost] public async Task> GetTrialOrganList(GetTrialOrganListInDto inDto) { - var organInfoQueryable = from data in _organInfoRepository.Where(x => x.TypeName == inDto.TypeName) - join trialData in _organTrialInfoRepository.Where(x => x.TrialId == inDto.TrialId && x.TypeName == inDto.TypeName) + var organInfoQueryable = from data in _organInfoRepository.Where(x => x.OrganType == inDto.OrganType) + join trialData in _organTrialInfoRepository.Where(x => x.TrialId == inDto.TrialId && x.OrganType == inDto.OrganType) on data.Id equals trialData.OrganInfoId select new GetTrialOrganListOutDto() { @@ -127,7 +127,7 @@ namespace IRaCIS.Core.Application.Service TULOC = data.TULOC, TypeName = data.TypeName, Remark= data.Remark, - + OrganType=data.OrganType, }; @@ -144,8 +144,8 @@ namespace IRaCIS.Core.Application.Service [HttpPost] public async Task> GetTrialCheckOrganList(GetTrialOrganListInDto inDto) { - var organInfoQueryable = from data in _organInfoRepository.Where(x => x.TypeName == inDto.TypeName) - join trialData in _organTrialInfoRepository.Where(x => x.TrialId == inDto.TrialId && x.TypeName == inDto.TypeName) + var organInfoQueryable = from data in _organInfoRepository.Where(x => x.OrganType == inDto.OrganType) + join trialData in _organTrialInfoRepository.Where(x => x.TrialId == inDto.TrialId && x.OrganType == inDto.OrganType) on data.Id equals trialData.OrganInfoId into jtemp from leftjoin in jtemp.DefaultIfEmpty() select new GetTrialCheckOrganList() diff --git a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs index 0513fde29..b57ae9829 100644 --- a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs +++ b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs @@ -155,6 +155,26 @@ namespace IRaCIS.Core.Domain.Share Hydrothorax = 2, } + public enum OrganType + { + /// + /// 非靶和新病灶 + /// + OffTargetAndNewLesions = 0, + + + /// + /// 结节靶病灶 + /// + NodularTargetLesions = 1, + + + /// + /// 非结节靶病灶 + /// + NonNodularTargetLesions = 2, + } + /// /// 临床分组级别 /// diff --git a/IRaCIS.Core.Domain/Reading/OrganInfo.cs b/IRaCIS.Core.Domain/Reading/OrganInfo.cs index 0f1ce6861..fd250c6b9 100644 --- a/IRaCIS.Core.Domain/Reading/OrganInfo.cs +++ b/IRaCIS.Core.Domain/Reading/OrganInfo.cs @@ -42,6 +42,12 @@ namespace IRaCIS.Core.Domain.Models /// public string TypeName { get; set; } + + /// + /// 类型枚举 + /// + public OrganType OrganType { get; set; } + /// /// 创建时间 /// diff --git a/IRaCIS.Core.Domain/Reading/OrganTrialInfo.cs b/IRaCIS.Core.Domain/Reading/OrganTrialInfo.cs index a5294cd64..42a57954b 100644 --- a/IRaCIS.Core.Domain/Reading/OrganTrialInfo.cs +++ b/IRaCIS.Core.Domain/Reading/OrganTrialInfo.cs @@ -26,6 +26,11 @@ namespace IRaCIS.Core.Domain.Models /// public Guid TrialId { get; set; } + /// + /// 类型枚举 + /// + public OrganType OrganType { get; set; } + /// /// 类型名称 ///