XCKJ
/
EI-Image-Viewer-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改一版

Test.EIImageViewer
he 2022-08-18 11:43:27 +08:00
parent 041efdb831
commit be94292709
7 changed files with 76 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,8 +31,10 @@ namespace IRaCIS.Core.Application.ViewModel
{ {
public Guid? Id { get; set; } public Guid? Id { get; set; }
public Guid CriterionId { get; set; } public Guid CriterionId { get; set; }
public string NidusType { get; set; } /// <summary>
public string NidusTypeCN { get; set; } /// 病灶类型
/// </summary>
public LesionType LesionType { get; set; }
public DateTime CreateTime { get; set; } public DateTime CreateTime { get; set; }
public Guid CreateUserId { get; set; } public Guid CreateUserId { get; set; }
} }
@ -65,12 +67,7 @@ namespace IRaCIS.Core.Application.ViewModel
/// <summary> /// <summary>
/// 病灶类型 /// 病灶类型
/// </summary> /// </summary>
public string NidusType { get; set; } public LesionType LesionType { get; set; }
/// <summary>
/// 病灶类型
/// </summary>
public string NidusTypeCN { get; set; }
/// <summary> /// <summary>
@ -110,7 +107,10 @@ namespace IRaCIS.Core.Application.ViewModel
{ {
public Guid TrialId { get; set; } public Guid TrialId { get; set; }
public Guid? CriterionNidusId { get; set; } /// <summary>
/// 病灶类型
/// </summary>
public LesionType? LesionType { get; set; }
public bool? IsEnable { get; set; } public bool? IsEnable { get; set; }
} }
@ -127,19 +127,14 @@ namespace IRaCIS.Core.Application.ViewModel
public string? TULOC { get; set; } public string? TULOC { get; set; }
public string? TULAT { get; set; } public string? TULAT { get; set; }
public Guid? CriterionNidusId { get; set; }
public bool IsEnable { get; set; } public bool IsEnable { get; set; }
/// <summary> /// <summary>
/// 病灶类型 /// 病灶类型
/// </summary> /// </summary>
public string NidusType { get; set; } public LesionType LesionType { get; set; }
/// <summary>
/// 病灶类型
/// </summary>
public string NidusTypeCN { get; set; }
/// <summary> /// <summary>
/// 备注 /// 备注
@ -151,7 +146,10 @@ namespace IRaCIS.Core.Application.ViewModel
public class OrganInfoQuery public class OrganInfoQuery
{ {
public Guid? CriterionNidusId { get; set; } /// <summary>
/// 病灶类型
/// </summary>
public LesionType? LesionType { get; set; }
public Guid? CriterionId { get; set; } public Guid? CriterionId { get; set; }
@ -179,14 +177,14 @@ namespace IRaCIS.Core.Application.ViewModel
public bool IsLymphNodes { get; set; } public bool IsLymphNodes { get; set; }
/// <summary> /// <summary>
/// 标准 病灶类型 /// 病灶类型
/// </summary> /// </summary>
public Guid CriterionNidusId { get; set; } public LesionType LesionType { get; set; }
/// <summary> /// <summary>
/// 标准 病灶类型 /// 标准 病灶类型
/// </summary> /// </summary>
public Guid CriterionId { get; set; } public Guid SystemCriterionId { get; set; }
public DateTime CreateTime { get; set; } public DateTime CreateTime { get; set; }
public Guid CreateUserId { get; set; } public Guid CreateUserId { get; set; }

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

@ -92,8 +92,7 @@ namespace IRaCIS.Core.Application.Service
{ {
var organInfoQueryable = _organInfoRepository var organInfoQueryable = _organInfoRepository
.WhereIf(inQuery.CriterionNidusId != null, x => x.CriterionNidusId == inQuery.CriterionNidusId) .WhereIf(inQuery.LesionType != null, x => x.LesionType == inQuery.LesionType)
.WhereIf(inQuery.CriterionId != null, x => x.CriterionId == inQuery.CriterionId)
.ProjectTo<OrganInfoView>(_mapper.ConfigurationProvider); .ProjectTo<OrganInfoView>(_mapper.ConfigurationProvider);
return await organInfoQueryable.ToListAsync(); return await organInfoQueryable.ToListAsync();
} }
@ -170,13 +169,12 @@ namespace IRaCIS.Core.Application.Service
[HttpPost] [HttpPost]
public async Task<List<GetTrialOrganListOutDto>> GetTrialOrganList(GetTrialOrganListInDto inDto) public async Task<List<GetTrialOrganListOutDto>> GetTrialOrganList(GetTrialOrganListInDto inDto)
{ {
var organInfoQueryable = from data in _organInfoRepository.WhereIf(inDto.CriterionNidusId !=null, x => x.CriterionNidusId == inDto.CriterionNidusId) var organInfoQueryable = from data in _organInfoRepository.WhereIf(inDto.LesionType != null, x => x.LesionType == inDto.LesionType)
join trialData in _organTrialInfoRepository.WhereIf(inDto.IsEnable != null, x => x.IsEnable == inDto.IsEnable) join trialData in _organTrialInfoRepository.WhereIf(inDto.IsEnable != null, x => x.IsEnable == inDto.IsEnable)
.Where(x => x.TrialId == inDto.TrialId) .Where(x => x.TrialId == inDto.TrialId)
on data.Id equals trialData.OrganInfoId on data.Id equals trialData.OrganInfoId
join criterionNidus in _criterionNidusRepository.AsQueryable() on trialData.CriterionNidusId equals criterionNidus.Id into criterionNidustemp
from leftcriterionNidus in criterionNidustemp.DefaultIfEmpty()
select new GetTrialOrganListOutDto() select new GetTrialOrganListOutDto()
@ -186,10 +184,9 @@ namespace IRaCIS.Core.Application.Service
TULAT = data.TULAT, TULAT = data.TULAT,
TULOC = data.TULOC, TULOC = data.TULOC,
Remark= data.Remark, Remark= data.Remark,
CriterionNidusId = data.CriterionNidusId,
IsEnable= trialData.IsEnable, IsEnable= trialData.IsEnable,
NidusType= leftcriterionNidus.NidusType, LesionType= trialData.LesionType,
NidusTypeCN= leftcriterionNidus.NidusTypeCN,
}; };
@ -197,37 +194,39 @@ namespace IRaCIS.Core.Application.Service
} }
#region 注释
///// <summary>
///// 获取项目勾选器官信息
///// </summary>
///// <param name="inDto"></param>
///// <returns></returns>
//[HttpPost]
//public async Task<List<GetTrialCheckOrganList>> GetTrialCheckOrganList(GetTrialOrganListInDto inDto)
//{
// 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()
// select new GetTrialCheckOrganList()
// {
// Id = data.Id,
// Part = data.Part,
// TULAT = data.TULAT,
// TULOC = data.TULOC,
/// <summary> // IsCheckd= leftjoin!=null,
/// 获取项目勾选器官信息 // Remark = data.Remark,
/// </summary> // CriterionNidusId = data.CriterionNidusId,
/// <param name="inDto"></param> // IsEnable = leftjoin.IsEnable,
/// <returns></returns>
[HttpPost]
public async Task<List<GetTrialCheckOrganList>> GetTrialCheckOrganList(GetTrialOrganListInDto inDto)
{
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()
select new GetTrialCheckOrganList()
{
Id = data.Id,
Part = data.Part,
TULAT = data.TULAT,
TULOC = data.TULOC,
IsCheckd= leftjoin!=null, // };
Remark = data.Remark,
CriterionNidusId = data.CriterionNidusId,
IsEnable = leftjoin.IsEnable,
};
return await organInfoQueryable.ToListAsync(); // return await organInfoQueryable.ToListAsync();
} //}
#endregion
/// <summary> /// <summary>
/// 同步系统器官到项目 /// 同步系统器官到项目
@ -254,8 +253,7 @@ namespace IRaCIS.Core.Application.Service
{ {
Id = x.Id, Id = x.Id,
CriterionId = trialCriterionId, CriterionId = trialCriterionId,
NidusType = x.NidusType, LesionType = x.LesionType,
NidusTypeCN = x.NidusTypeCN,
OriginalId = x.Id, OriginalId = x.Id,
}).ToListAsync(); }).ToListAsync();
@ -264,9 +262,9 @@ namespace IRaCIS.Core.Application.Service
await _criterionNidusRepository.AddRangeAsync(criterionNidusList); await _criterionNidusRepository.AddRangeAsync(criterionNidusList);
await _organTrialInfoRepository.BatchDeleteNoTrackingAsync(x => x.TrialId == inDto.TrialId); await _organTrialInfoRepository.BatchDeleteNoTrackingAsync(x => x.TrialId == inDto.TrialId);
var originalIds = criterionNidusList.Select(x => x.OriginalId).Distinct().ToList(); var originalIds = criterionNidusList.Select(x => x.OriginalId).Distinct().ToList();
List<OrganTrialInfo> organTrialInfoList = await _organInfoRepository.Where(x =>x.CriterionId== inDto.SystemCriterionId).Select(x => new OrganTrialInfo() List<OrganTrialInfo> organTrialInfoList = await _organInfoRepository.Where(x =>x.SystemCriterionId== inDto.SystemCriterionId).Select(x => new OrganTrialInfo()
{ {
CriterionNidusId = x.CriterionNidusId, LesionType=x.LesionType,
Id = x.Id, Id = x.Id,
IsEnable = true, IsEnable = true,
OrganInfoId = x.Id, OrganInfoId = x.Id,
@ -276,11 +274,7 @@ namespace IRaCIS.Core.Application.Service
criterionNidusList.ForEach(x => x.Id = NewId.NextGuid()); criterionNidusList.ForEach(x => x.Id = NewId.NextGuid());
organTrialInfoList.ForEach(x =>
{
x.CriterionNidusId = criterionNidusList.Where(y => y.OriginalId == x.OrganInfoId).Select(x => x.Id).FirstOrDefault();
});
await _organTrialInfoRepository.AddRangeAsync(organTrialInfoList); await _organTrialInfoRepository.AddRangeAsync(organTrialInfoList);

4
IRaCIS.Core.Application/Service/Reading/_MapConfig.cs
View File

@ -132,9 +132,7 @@ namespace IRaCIS.Core.Application.Service
CreateMap<CriterionNidus, CriterionNidusAddOrEdit>().ReverseMap(); CreateMap<CriterionNidus, CriterionNidusAddOrEdit>().ReverseMap();
CreateMap<OrganInfoAddOrEdit, OrganInfo>(); CreateMap<OrganInfoAddOrEdit, OrganInfo>();
CreateMap<OrganInfo, OrganInfoView>() CreateMap<OrganInfo, OrganInfoView>();
.ForMember(d => d.NidusType, u => u.MapFrom(s => s.CriterionNidus.NidusType))
.ForMember(d => d.NidusTypeCN, u => u.MapFrom(s => s.CriterionNidus.NidusTypeCN));
#endregion #endregion
} }
} }

2
IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
View File

@ -155,7 +155,7 @@ namespace IRaCIS.Core.Domain.Share
Hydrothorax = 2, Hydrothorax = 2,
} }
public enum OrganType public enum LesionType
{ {
/// <summary> /// <summary>
/// 非靶和新病灶 /// 非靶和新病灶

7
IRaCIS.Core.Domain/Reading/CriterionLesion.cs
View File

@ -24,12 +24,7 @@ namespace IRaCIS.Core.Domain.Models
/// <summary> /// <summary>
/// 病灶类型 /// 病灶类型
/// </summary> /// </summary>
public string NidusType { get; set; } public LesionType LesionType { get; set; }
/// <summary>
/// 病灶类型
/// </summary>
public string NidusTypeCN { get; set; }
/// <summary> /// <summary>
/// CreateTime /// CreateTime

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

@ -44,15 +44,14 @@ namespace IRaCIS.Core.Domain.Models
public bool IsLymphNodes { get; set; } public bool IsLymphNodes { get; set; }
/// <summary> /// <summary>
/// 标准 病灶类型 /// 病灶类型
/// </summary> /// </summary>
public Guid? CriterionNidusId { get; set; } public LesionType LesionType { get; set; }
/// <summary> /// <summary>
/// 标准Id /// 标准Id
/// </summary> /// </summary>
public Guid CriterionId { get; set; } public Guid SystemCriterionId { get; set; }
/// <summary> /// <summary>
/// 创建时间 /// 创建时间
@ -64,8 +63,6 @@ namespace IRaCIS.Core.Domain.Models
/// </summary> /// </summary>
public Guid CreateUserId { get; set; } public Guid CreateUserId { get; set; }
[ForeignKey("CriterionNidusId")]
public CriterionNidus CriterionNidus { get; set; }
} }

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

@ -40,9 +40,9 @@ namespace IRaCIS.Core.Domain.Models
/// <summary> /// <summary>
/// 标准 病灶类型 /// 病灶类型
/// </summary> /// </summary>
public Guid? CriterionNidusId { get; set; } public LesionType LesionType { get; set; }
} }