修改一版
This commit is contained in:
he
@@ -7,49 +7,89 @@ using System;
|
||||
using IRaCIS.Core.Domain.Share;
|
||||
using System.Collections.Generic;
|
||||
namespace IRaCIS.Core.Application.ViewModel
|
||||
{
|
||||
/// <summary> OrganInfoView 列表视图模型 </summary>
|
||||
public class OrganInfoView
|
||||
{
|
||||
public Guid Id { get; set; }
|
||||
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; }
|
||||
public Guid CreateUserId { get; set; }
|
||||
}
|
||||
{
|
||||
|
||||
///<summary>OrganInfoQuery 列表查询参数模型</summary>
|
||||
public class OrganInfoQuery
|
||||
{
|
||||
///<summary> 部位</summary>
|
||||
public string Part { get; set; }
|
||||
|
||||
///<summary> TULOC</summary>
|
||||
public string TULOC { get; set; }
|
||||
public class BatchAddTrialOrganInDto
|
||||
{
|
||||
public Guid TrialId { get; set; }
|
||||
|
||||
///<summary> 位置</summary>
|
||||
public string TULAT { get; set; }
|
||||
public string TypeName { get; set; }
|
||||
|
||||
///<summary> 类型名称</summary>
|
||||
public string TypeName { get; set; }
|
||||
public List<Guid> OrganIds { get; set; }
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
///<summary> OrganInfoAddOrEdit 列表查询参数模型</summary>
|
||||
public class OrganInfoAddOrEdit
|
||||
{
|
||||
public Guid? Id { get; set; }
|
||||
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; }
|
||||
public Guid CreateUserId { get; set; }
|
||||
}
|
||||
/// <summary> OrganInfoView 列表视图模型 </summary>
|
||||
public class OrganInfoView
|
||||
{
|
||||
public Guid Id { get; set; }
|
||||
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; }
|
||||
|
||||
/// <summary>
|
||||
/// 备注
|
||||
/// </summary>
|
||||
public string Remark { get; set; }
|
||||
public Guid CreateUserId { get; set; }
|
||||
}
|
||||
|
||||
|
||||
public class GetTrialOrganListInDto
|
||||
{
|
||||
public Guid TrialId { get; set; }
|
||||
public string TypeName { get; set; }
|
||||
}
|
||||
|
||||
public class GetTrialCheckOrganList : GetTrialOrganListOutDto
|
||||
{
|
||||
public bool IsCheckd { get; set; }
|
||||
}
|
||||
|
||||
public class GetTrialOrganListOutDto
|
||||
{
|
||||
public Guid Id { get; set; }
|
||||
public string Part { get; set; }
|
||||
public string TULOC { get; set; }
|
||||
public string TULAT { get; set; }
|
||||
public string TypeName { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 备注
|
||||
/// </summary>
|
||||
public string Remark { get; set; }
|
||||
}
|
||||
|
||||
///<summary>OrganInfoQuery 列表查询参数模型</summary>
|
||||
public class OrganInfoQuery
|
||||
{
|
||||
///<summary> 类型名称</summary>
|
||||
public string TypeName { get; set; }
|
||||
|
||||
}
|
||||
|
||||
///<summary> OrganInfoAddOrEdit 列表查询参数模型</summary>
|
||||
public class OrganInfoAddOrEdit
|
||||
{
|
||||
public Guid? Id { get; set; }
|
||||
public string Part { get; set; }
|
||||
public string TULOC { get; set; }
|
||||
public string TULAT { get; set; }
|
||||
public string TypeName { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 备注
|
||||
/// </summary>
|
||||
public string Remark { get; set; }
|
||||
|
||||
public DateTime CreateTime { get; set; }
|
||||
public Guid CreateUserId { get; set; }
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -9,50 +9,160 @@ using Microsoft.AspNetCore.Mvc;
|
||||
using IRaCIS.Core.Application.Interfaces;
|
||||
using IRaCIS.Core.Application.ViewModel;
|
||||
namespace IRaCIS.Core.Application.Service
|
||||
{
|
||||
/// <summary>
|
||||
/// OrganInfoService
|
||||
/// </summary>
|
||||
[ ApiExplorerSettings(GroupName = "Test")]
|
||||
public class OrganInfoService: BaseService, IOrganInfoService
|
||||
{
|
||||
/// <summary>
|
||||
/// 器官服务层
|
||||
/// </summary>
|
||||
[ApiExplorerSettings(GroupName = "Reading")]
|
||||
public class OrganInfoService : BaseService, IOrganInfoService
|
||||
{
|
||||
|
||||
private readonly IRepository<OrganInfo> _organInfoRepository;
|
||||
private readonly IRepository<OrganInfo> _organInfoRepository;
|
||||
private readonly IRepository<OrganTrialInfo> _organTrialInfoRepository;
|
||||
|
||||
public OrganInfoService(IRepository<OrganInfo> organInfoRepository)
|
||||
{
|
||||
_organInfoRepository = organInfoRepository;
|
||||
}
|
||||
public OrganInfoService(
|
||||
IRepository<OrganInfo> organInfoRepository,
|
||||
IRepository<OrganTrialInfo> organTrialInfoRepository
|
||||
)
|
||||
{
|
||||
_organInfoRepository = organInfoRepository;
|
||||
this._organTrialInfoRepository = organTrialInfoRepository;
|
||||
}
|
||||
|
||||
|
||||
public async Task<List<OrganInfoView>> GetOrganInfoList(OrganInfoQuery inQuery)
|
||||
{
|
||||
|
||||
|
||||
var organInfoQueryable = _organInfoRepository
|
||||
.ProjectTo<OrganInfoView>(_mapper.ConfigurationProvider);
|
||||
|
||||
return await organInfoQueryable.ToListAsync();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 获取系统器官信息
|
||||
/// </summary>
|
||||
/// <param name="inQuery"></param>
|
||||
/// <returns></returns>
|
||||
[HttpPost]
|
||||
public async Task<List<OrganInfoView>> GetOrganInfoList(OrganInfoQuery inQuery)
|
||||
{
|
||||
var organInfoQueryable = _organInfoRepository
|
||||
.Where(x=>x.TypeName== inQuery.TypeName)
|
||||
.ProjectTo<OrganInfoView>(_mapper.ConfigurationProvider);
|
||||
return await organInfoQueryable.ToListAsync();
|
||||
}
|
||||
|
||||
public async Task<IResponseOutput> AddOrUpdateOrganInfo(OrganInfoAddOrEdit addOrEditOrganInfo)
|
||||
{
|
||||
|
||||
var entity = await _organInfoRepository.InsertOrUpdateAsync(addOrEditOrganInfo, true);
|
||||
|
||||
/// <summary>
|
||||
/// 新增或修改系统器官数据
|
||||
/// </summary>
|
||||
/// <param name="addOrEditOrganInfo"></param>
|
||||
/// <returns></returns>
|
||||
[HttpPost]
|
||||
public async Task<IResponseOutput> AddOrUpdateOrganInfo(OrganInfoAddOrEdit addOrEditOrganInfo)
|
||||
{
|
||||
var entity = await _organInfoRepository.InsertOrUpdateAsync(addOrEditOrganInfo, true);
|
||||
return ResponseOutput.Ok(entity.Id.ToString());
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
[HttpDelete("{organInfoId:guid}")]
|
||||
public async Task<IResponseOutput> DeleteOrganInfo(Guid organInfoId)
|
||||
{
|
||||
var success = await _organInfoRepository.DeleteFromQueryAsync(t => t.Id == organInfoId,true);
|
||||
return ResponseOutput.Ok();
|
||||
}
|
||||
/// <summary>
|
||||
/// 删除系统器官
|
||||
/// </summary>
|
||||
/// <param name="Id"></param>
|
||||
/// <returns></returns>
|
||||
[HttpDelete("{Id:guid}")]
|
||||
public async Task<IResponseOutput> DeleteOrganInfo(Guid Id)
|
||||
{
|
||||
var success = await _organInfoRepository.DeleteFromQueryAsync(t => t.Id == Id, true);
|
||||
return ResponseOutput.Ok();
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 批量添加项目器官
|
||||
/// </summary>
|
||||
/// <param name="inDto"></param>
|
||||
/// <returns></returns>
|
||||
public async Task<IResponseOutput> BatchAddTrialOrgan(BatchAddTrialOrganInDto inDto)
|
||||
{
|
||||
await _organTrialInfoRepository.BatchDeleteNoTrackingAsync(t => t.TrialId==inDto.TrialId&&t.TypeName==inDto.TypeName);
|
||||
|
||||
List<OrganTrialInfo> organTrialInfos = inDto.OrganIds.Select(x => new OrganTrialInfo()
|
||||
{
|
||||
OrganInfoId=x,
|
||||
TrialId=inDto.TrialId,
|
||||
TypeName=inDto.TypeName,
|
||||
}).ToList();
|
||||
|
||||
|
||||
await _organTrialInfoRepository.AddRangeAsync(organTrialInfos);
|
||||
|
||||
await _organInfoRepository.SaveChangesAsync();
|
||||
|
||||
return ResponseOutput.Ok();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 删除系统器官
|
||||
/// </summary>
|
||||
/// <param name="Id"></param>
|
||||
/// <returns></returns>
|
||||
[HttpDelete("{Id:guid}")]
|
||||
public async Task<IResponseOutput> DeleteTrialOrganInfo(Guid Id)
|
||||
{
|
||||
var success = await _organTrialInfoRepository.DeleteFromQueryAsync(t => t.Id == Id, true);
|
||||
return ResponseOutput.Ok();
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 获取项目器官信息
|
||||
/// </summary>
|
||||
/// <param name="inDto"></param>
|
||||
/// <returns></returns>
|
||||
[HttpPost]
|
||||
public async Task<List<GetTrialOrganListOutDto>> 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)
|
||||
on data.Id equals trialData.OrganInfoId
|
||||
select new GetTrialOrganListOutDto()
|
||||
{
|
||||
Id = trialData.Id,
|
||||
Part = data.Part,
|
||||
TULAT = data.TULAT,
|
||||
TULOC = data.TULOC,
|
||||
TypeName = data.TypeName,
|
||||
Remark= data.Remark,
|
||||
|
||||
};
|
||||
|
||||
|
||||
return await organInfoQueryable.ToListAsync();
|
||||
}
|
||||
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 获取项目勾选器官信息
|
||||
/// </summary>
|
||||
/// <param name="inDto"></param>
|
||||
/// <returns></returns>
|
||||
[HttpPost]
|
||||
public async Task<List<GetTrialCheckOrganList>> 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)
|
||||
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,
|
||||
TypeName = data.TypeName,
|
||||
IsCheckd= leftjoin!=null,
|
||||
Remark = data.Remark,
|
||||
|
||||
};
|
||||
|
||||
|
||||
return await organInfoQueryable.ToListAsync();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user