XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改

Uat_Study
he 2022-08-16 16:54:22 +08:00
parent 64b507ce10
commit 6eadf97701
4 changed files with 35 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs
View File

@ -86,10 +86,10 @@ namespace IRaCIS.Core.Application.ViewModel
public class GetTrialOrganListInDto
{
public Guid TrialId { get; set; }
/// <summary>
/// 类型枚举
/// </summary>
public OrganType? OrganType { get; set; }
public Guid? CriterionNidusId { get; set; }
public bool? IsEnable { get; set; }
}
public class GetTrialCheckOrganList : GetTrialOrganListOutDto
@ -104,11 +104,9 @@ namespace IRaCIS.Core.Application.ViewModel
public string? TULOC { get; set; }
public string? TULAT { get; set; }
public Guid CriterionNidusId { get; set; }
/// <summary>
/// 类型枚举
/// </summary>
public OrganType? OrganType { get; set; }
public bool IsEnable { get; set; }
/// <summary>
/// 备注
@ -120,12 +118,14 @@ namespace IRaCIS.Core.Application.ViewModel
public class OrganInfoQuery
{
/// <summary>
/// 类型枚举
/// </summary>
public OrganType? OrganType { get; set; }
public Guid? CriterionNidusId { get; set; }
}
///<summary> OrganInfoAddOrEdit 列表查询参数模型</summary>
@ -137,10 +137,7 @@ namespace IRaCIS.Core.Application.ViewModel
public string TULAT { get; set; }
/// <summary>
/// 类型枚举
/// </summary>
public OrganType OrganType { get; set; }
/// <summary>
/// 备注
@ -148,9 +145,14 @@ namespace IRaCIS.Core.Application.ViewModel
public string Remark { get; set; }
/// <summary>
/// 是否关联
/// 是否是淋巴结
/// </summary>
public IsDepend IsDepend { get; set; }
public bool IsLymphNodes { get; set; }
/// <summary>
/// 标准 病灶类型
/// </summary>
public Guid CriterionNidusId { get; set; }
public DateTime CreateTime { get; set; }
public Guid CreateUserId { get; set; }

16
IRaCIS.Core.Application/Service/Reading/OrganInfoService.cs
View File

@ -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<OrganInfoView>(_mapper.ConfigurationProvider);
return await organInfoQueryable.ToListAsync();
}
@ -165,8 +165,8 @@ namespace IRaCIS.Core.Application.Service
[HttpPost]
public async Task<List<GetTrialOrganListOutDto>> 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<List<GetTrialCheckOrganList>> 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,
};

14
IRaCIS.Core.Domain/Reading/OrganInfo.cs
View File

@ -37,16 +37,16 @@ namespace IRaCIS.Core.Domain.Models
/// </summary>
public string Remark { get; set; }
/// <summary>
/// 类型名称
/// </summary>
public string TypeName { get; set; }
/// <summary>
/// 类型枚举
/// 是否是淋巴结
/// </summary>
public OrganType OrganType { get; set; }
public bool IsLymphNodes { get; set; }
/// <summary>
/// 标准 病灶类型
/// </summary>
public Guid CriterionNidusId { get; set; }
/// <summary>
/// 创建时间

10
IRaCIS.Core.Domain/Reading/OrganTrialInfo.cs
View File

@ -26,15 +26,7 @@ namespace IRaCIS.Core.Domain.Models
/// </summary>
public Guid TrialId { get; set; }
/// <summary>
/// 类型枚举
/// </summary>
public OrganType OrganType { get; set; }
/// <summary>
/// 类型名称
/// </summary>
public string TypeName { get; set; }
public bool IsEnable { get; set; }
/// <summary>
/// CreateTime