修改一版
parent
988c5959ae
commit
a2971f9e08
|
@ -445,76 +445,86 @@
|
||||||
<returns></returns>
|
<returns></returns>
|
||||||
<exception cref="T:IRaCIS.Core.Infrastructure.BusinessValidationFailedException"></exception>
|
<exception cref="T:IRaCIS.Core.Infrastructure.BusinessValidationFailedException"></exception>
|
||||||
</member>
|
</member>
|
||||||
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataSetAddOrEdit.TrialId">
|
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataTrialSetAddOrEdit.TrialId">
|
||||||
<summary>
|
<summary>
|
||||||
项目ID
|
项目ID
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataSetAddOrEdit.ClinicalDataSetName">
|
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataSystemSetAddOrEdit.ClinicalDataSetName">
|
||||||
<summary>
|
<summary>
|
||||||
名称
|
名称
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataSetAddOrEdit.ClinicalDataLevel">
|
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataSystemSetAddOrEdit.ClinicalDataLevel">
|
||||||
<summary>
|
<summary>
|
||||||
临床级别
|
临床级别
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataSetAddOrEdit.ClinicalUploadType">
|
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataSystemSetAddOrEdit.ClinicalUploadType">
|
||||||
<summary>
|
<summary>
|
||||||
上传方式
|
上传方式
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataSetView.TrialId">
|
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataSystemSetAddOrEdit.IsEnable">
|
||||||
<summary>
|
|
||||||
项目ID
|
|
||||||
</summary>
|
|
||||||
</member>
|
|
||||||
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataSetView.ClinicalDataSetName">
|
|
||||||
<summary>
|
|
||||||
名称
|
|
||||||
</summary>
|
|
||||||
</member>
|
|
||||||
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataSetView.ClinicalDataLevel">
|
|
||||||
<summary>
|
|
||||||
临床级别
|
|
||||||
</summary>
|
|
||||||
</member>
|
|
||||||
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataSetView.ClinicalUploadType">
|
|
||||||
<summary>
|
|
||||||
上传方式
|
|
||||||
</summary>
|
|
||||||
</member>
|
|
||||||
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataSetView.SystemClinicalDataSetId">
|
|
||||||
<summary>
|
|
||||||
系统的ClinicalDataSetId
|
|
||||||
</summary>
|
|
||||||
</member>
|
|
||||||
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataSetView.CreateTime">
|
|
||||||
<summary>
|
|
||||||
创建时间
|
|
||||||
</summary>
|
|
||||||
</member>
|
|
||||||
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataSetView.CreateUserId">
|
|
||||||
<summary>
|
|
||||||
创建人
|
|
||||||
</summary>
|
|
||||||
</member>
|
|
||||||
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataSetView.IsEnable">
|
|
||||||
<summary>
|
<summary>
|
||||||
是否启用
|
是否启用
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataSetView.IsCheck">
|
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataSystemSetAddOrEdit.IsCheck">
|
||||||
<summary>
|
<summary>
|
||||||
是否勾选
|
是否勾选
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataSetView.IsFromSystemData">
|
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataTrialSetView.TrialId">
|
||||||
|
<summary>
|
||||||
|
项目ID
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataTrialSetView.SystemClinicalDataSetId">
|
||||||
|
<summary>
|
||||||
|
系统的ClinicalDataSetId
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataTrialSetView.IsFromSystemData">
|
||||||
<summary>
|
<summary>
|
||||||
是否来自于系统数据
|
是否来自于系统数据
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
|
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataSystemSetView.ClinicalDataSetName">
|
||||||
|
<summary>
|
||||||
|
名称
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataSystemSetView.ClinicalDataLevel">
|
||||||
|
<summary>
|
||||||
|
临床级别
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataSystemSetView.ClinicalUploadType">
|
||||||
|
<summary>
|
||||||
|
上传方式
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataSystemSetView.CreateTime">
|
||||||
|
<summary>
|
||||||
|
创建时间
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataSystemSetView.CreateUserId">
|
||||||
|
<summary>
|
||||||
|
创建人
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataSystemSetView.IsEnable">
|
||||||
|
<summary>
|
||||||
|
是否启用
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataSystemSetView.IsCheck">
|
||||||
|
<summary>
|
||||||
|
是否勾选
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataInDto.TrialId">
|
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataInDto.TrialId">
|
||||||
<summary>
|
<summary>
|
||||||
项目Id
|
项目Id
|
||||||
|
@ -3224,38 +3234,52 @@
|
||||||
临床数据配置
|
临床数据配置
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
<member name="M:IRaCIS.Application.Services.ClinicalDataSetService.AddOrUpdateClinicalDataSet(IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataSetAddOrEdit)">
|
<member name="M:IRaCIS.Application.Services.ClinicalDataSetService.AddOrUpdateClinicalDataTrialSet(IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataTrialSetAddOrEdit)">
|
||||||
<summary>
|
<summary>
|
||||||
新增或者修改
|
新增或者修改(项目)
|
||||||
</summary>
|
</summary>
|
||||||
<param name="indto"></param>
|
<param name="indto"></param>
|
||||||
<returns></returns>
|
<returns></returns>
|
||||||
</member>
|
</member>
|
||||||
<member name="M:IRaCIS.Application.Services.ClinicalDataSetService.GetClinicalDataSetList(IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataQuery)">
|
<member name="M:IRaCIS.Application.Services.ClinicalDataSetService.AddOrUpdateClinicalDataSystemSet(IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataSystemSetAddOrEdit)">
|
||||||
<summary>
|
<summary>
|
||||||
分页获取
|
新增或者修改(系统)
|
||||||
</summary>
|
</summary>
|
||||||
<param name="query"></param>
|
<param name="indto"></param>
|
||||||
<returns></returns>
|
<returns></returns>
|
||||||
</member>
|
</member>
|
||||||
<member name="M:IRaCIS.Application.Services.ClinicalDataSetService.GetSystemClinicalDataSetList">
|
<member name="M:IRaCIS.Application.Services.ClinicalDataSetService.GetSystemClinicalDataSystemSetList">
|
||||||
<summary>
|
<summary>
|
||||||
获取系统临床数据
|
获取系统临床数据(系统)
|
||||||
</summary>
|
</summary>
|
||||||
<returns></returns>
|
<returns></returns>
|
||||||
</member>
|
</member>
|
||||||
<member name="M:IRaCIS.Application.Services.ClinicalDataSetService.AddTrialClinicalDataSet(IRaCIS.Core.Application.Service.Reading.Dto.AddTrialClinicalDataSetInDto)">
|
<member name="M:IRaCIS.Application.Services.ClinicalDataSetService.GetTrialClinicalDataTrialSetList(IRaCIS.Core.Application.Service.Reading.Dto.AddTrialClinicalDataSetInDto)">
|
||||||
|
<summary>
|
||||||
|
获取项目的临床数据
|
||||||
|
</summary>
|
||||||
|
<param name="inDto"></param>
|
||||||
|
<returns></returns>
|
||||||
|
</member>
|
||||||
|
<member name="M:IRaCIS.Application.Services.ClinicalDataSetService.AddTrialClinicalDataTrialSet(IRaCIS.Core.Application.Service.Reading.Dto.AddTrialClinicalDataSetInDto)">
|
||||||
<summary>
|
<summary>
|
||||||
将系统配置添加到项目配置
|
将系统配置添加到项目配置
|
||||||
</summary>
|
</summary>
|
||||||
<param name="inDto"></param>
|
<param name="inDto"></param>
|
||||||
<returns></returns>
|
<returns></returns>
|
||||||
</member>
|
</member>
|
||||||
<member name="M:IRaCIS.Application.Services.ClinicalDataSetService.DeleteClinicalSetData(System.Guid)">
|
<member name="M:IRaCIS.Application.Services.ClinicalDataSetService.DeleteClinicalTrialSetData(System.Guid)">
|
||||||
<summary>
|
<summary>
|
||||||
删除
|
删除(项目)
|
||||||
</summary>
|
</summary>
|
||||||
<param name="clinicalDataId"></param>
|
<param name="id"></param>
|
||||||
|
<returns></returns>
|
||||||
|
</member>
|
||||||
|
<member name="M:IRaCIS.Application.Services.ClinicalDataSetService.DeleteClinicalSystemSetData(System.Guid)">
|
||||||
|
<summary>
|
||||||
|
删除(系统)
|
||||||
|
</summary>
|
||||||
|
<param name="id"></param>
|
||||||
<returns></returns>
|
<returns></returns>
|
||||||
</member>
|
</member>
|
||||||
<member name="T:IRaCIS.Application.Services.PreviousPDFService">
|
<member name="T:IRaCIS.Application.Services.PreviousPDFService">
|
||||||
|
|
|
@ -21,71 +21,59 @@ namespace IRaCIS.Application.Services
|
||||||
|
|
||||||
public IRepository<SubjectVisit> _subjectVisitRepository;
|
public IRepository<SubjectVisit> _subjectVisitRepository;
|
||||||
private readonly IRepository<ClinicalData> _clinicalDataRepository;
|
private readonly IRepository<ClinicalData> _clinicalDataRepository;
|
||||||
private readonly IRepository<ClinicalDataSet> _clinicalDataSetRepository;
|
private readonly IRepository<ClinicalDataTrialSet> _clinicalDataTrialSetRepository;
|
||||||
|
private readonly IRepository<ClinicalDataSystemSet> _clinicalDataSystemSetRepository;
|
||||||
private readonly IRepository<PreviousPDF> _previousPDFRepository;
|
private readonly IRepository<PreviousPDF> _previousPDFRepository;
|
||||||
|
|
||||||
public ClinicalDataSetService(IRepository<SubjectVisit> subjectVisitRepository,
|
public ClinicalDataSetService(IRepository<SubjectVisit> subjectVisitRepository,
|
||||||
IRepository<ClinicalData> clinicalDataRepository,
|
IRepository<ClinicalData> clinicalDataRepository,
|
||||||
IRepository<ClinicalDataSet> ClinicalDataSetRepository,
|
IRepository<ClinicalDataTrialSet> ClinicalDataTrialSetRepository,
|
||||||
|
IRepository<ClinicalDataSystemSet> ClinicalDataSystemSetRepository,
|
||||||
IRepository<PreviousPDF> previousPDFRepository
|
IRepository<PreviousPDF> previousPDFRepository
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
_subjectVisitRepository = subjectVisitRepository;
|
_subjectVisitRepository = subjectVisitRepository;
|
||||||
_clinicalDataRepository = clinicalDataRepository;
|
_clinicalDataRepository = clinicalDataRepository;
|
||||||
_clinicalDataSetRepository = ClinicalDataSetRepository;
|
_clinicalDataTrialSetRepository = ClinicalDataTrialSetRepository;
|
||||||
|
_clinicalDataSystemSetRepository = ClinicalDataSystemSetRepository;
|
||||||
this._previousPDFRepository = previousPDFRepository;
|
this._previousPDFRepository = previousPDFRepository;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 新增或者修改
|
/// 新增或者修改(项目)
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="indto"></param>
|
/// <param name="indto"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
[HttpPost]
|
[HttpPost]
|
||||||
public async Task<IResponseOutput> AddOrUpdateClinicalDataSet(ClinicalDataSetAddOrEdit indto)
|
public async Task<IResponseOutput> AddOrUpdateClinicalDataTrialSet(ClinicalDataTrialSetAddOrEdit indto)
|
||||||
{
|
{
|
||||||
var entity = await _clinicalDataSetRepository.InsertOrUpdateAsync(indto,true);
|
var entity = await _clinicalDataTrialSetRepository.InsertOrUpdateAsync(indto,true);
|
||||||
return ResponseOutput.Ok(entity.Id.ToString());
|
return ResponseOutput.Ok(entity.Id.ToString());
|
||||||
}
|
}
|
||||||
|
|
||||||
///// <summary>
|
/// <summary>
|
||||||
///// 分页获取
|
/// 新增或者修改(系统)
|
||||||
///// </summary>
|
/// </summary>
|
||||||
///// <param name="query"></param>
|
/// <param name="indto"></param>
|
||||||
///// <returns></returns>
|
/// <returns></returns>
|
||||||
//[HttpPost]
|
[HttpPost]
|
||||||
//public async Task<PageOutput<ClinicalDataSetView>> GetClinicalDataSetList(ClinicalDataQuery query)
|
public async Task<IResponseOutput> AddOrUpdateClinicalDataSystemSet(ClinicalDataSystemSetAddOrEdit indto)
|
||||||
//{
|
{
|
||||||
// var readquery = _clinicalDataSetRepository.AsQueryable()
|
var entity = await _clinicalDataSystemSetRepository.InsertOrUpdateAsync(indto, true);
|
||||||
// .Where( x => x.TrialId == query.TrialId)
|
return ResponseOutput.Ok(entity.Id.ToString());
|
||||||
// .WhereIf(query.ClinicalDataSetName!=string.Empty,x=>x.ClinicalDataSetName.Contains(query.ClinicalDataSetName))
|
}
|
||||||
// .ProjectTo<ClinicalDataSetView>(_mapper.ConfigurationProvider);
|
|
||||||
// var pageList = await readquery.ToPagedListAsync(query.PageIndex, query.PageSize, query.SortField == null ? "CreateTime" : query.SortField,
|
|
||||||
// query.Asc);
|
|
||||||
|
|
||||||
// return pageList;
|
|
||||||
//}
|
|
||||||
|
|
||||||
///// <summary>
|
|
||||||
///// 设置项目
|
|
||||||
///// </summary>
|
|
||||||
///// <returns></returns>
|
|
||||||
//public async Task<IResponseOutput> SetClinicalDataCheck()
|
|
||||||
//{
|
|
||||||
// _clinicalDataSetRepository.UpdateAsync()
|
|
||||||
//}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 获取系统临床数据
|
/// 获取系统临床数据(系统)
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
[HttpGet]
|
[HttpGet]
|
||||||
public async Task<List<ClinicalDataSetView>> GetSystemClinicalDataSetList()
|
public async Task<List<ClinicalDataSystemSetView>> GetSystemClinicalDataSystemSetList()
|
||||||
{
|
{
|
||||||
return await _clinicalDataSetRepository.AsQueryable()
|
return await _clinicalDataSystemSetRepository.AsQueryable()
|
||||||
.Where(x => x.TrialId == null)
|
|
||||||
.ProjectTo<ClinicalDataSetView>(_mapper.ConfigurationProvider).ToListAsync();
|
.ProjectTo<ClinicalDataSystemSetView>(_mapper.ConfigurationProvider).ToListAsync();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
@ -93,32 +81,29 @@ namespace IRaCIS.Application.Services
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="inDto"></param>
|
/// <param name="inDto"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
|
|
||||||
[HttpGet]
|
[HttpGet]
|
||||||
public async Task<List<ClinicalDataSetView>> GetTrialClinicalDataSetList(AddTrialClinicalDataSetInDto inDto)
|
public async Task<List<ClinicalDataTrialSetView>> GetTrialClinicalDataTrialSetList(AddTrialClinicalDataSetInDto inDto)
|
||||||
{
|
{
|
||||||
await this.AddTrialClinicalDataSet(inDto);
|
await this.AddTrialClinicalDataTrialSet(inDto);
|
||||||
|
return await _clinicalDataTrialSetRepository.AsQueryable()
|
||||||
return await _clinicalDataSetRepository.AsQueryable()
|
|
||||||
.Where(x => x.TrialId == inDto.TrialId)
|
.Where(x => x.TrialId == inDto.TrialId)
|
||||||
.ProjectTo<ClinicalDataSetView>(_mapper.ConfigurationProvider).ToListAsync();
|
.ProjectTo<ClinicalDataTrialSetView>(_mapper.ConfigurationProvider).ToListAsync();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 将系统配置添加到项目配置
|
/// 将系统配置添加到项目配置
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="inDto"></param>
|
/// <param name="inDto"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
|
|
||||||
private async Task<IResponseOutput> AddTrialClinicalDataSet(AddTrialClinicalDataSetInDto inDto)
|
private async Task<IResponseOutput> AddTrialClinicalDataTrialSet(AddTrialClinicalDataSetInDto inDto)
|
||||||
{
|
{
|
||||||
var systemIds = await _clinicalDataSetRepository.Where(x => x.TrialId == null).Select(x => x.Id).ToListAsync();
|
var systemIds = await _clinicalDataSystemSetRepository.Select(x => x.Id).ToListAsync();
|
||||||
var trialSystemIds =await _clinicalDataSetRepository.Where(x => x.TrialId == inDto.TrialId && x.SystemClinicalDataSetId != null).Select(x => x.SystemClinicalDataSetId.Value).ToListAsync();
|
var trialSystemIds =await _clinicalDataTrialSetRepository.Where(x => x.TrialId == inDto.TrialId && x.SystemClinicalDataSetId != null).Select(x => x.SystemClinicalDataSetId.Value).ToListAsync();
|
||||||
var needAddids = systemIds.Except(trialSystemIds).ToList();
|
var needAddids = systemIds.Except(trialSystemIds).ToList();
|
||||||
var systemDataList =await _clinicalDataSetRepository.Where(x => needAddids.Contains(x.Id)).ToListAsync();
|
var systemDataList =await _clinicalDataSystemSetRepository.Where(x => needAddids.Contains(x.Id)).ToListAsync();
|
||||||
List<ClinicalDataSet> dataSets = systemDataList.Select(x => new ClinicalDataSet()
|
List<ClinicalDataTrialSet> dataSets = systemDataList.Select(x => new ClinicalDataTrialSet()
|
||||||
{
|
{
|
||||||
Id= NewId.NextGuid(),
|
Id= NewId.NextGuid(),
|
||||||
SystemClinicalDataSetId=x.Id,
|
SystemClinicalDataSetId=x.Id,
|
||||||
|
@ -127,23 +112,32 @@ namespace IRaCIS.Application.Services
|
||||||
ClinicalUploadType=x.ClinicalUploadType,
|
ClinicalUploadType=x.ClinicalUploadType,
|
||||||
TrialId=inDto.TrialId,
|
TrialId=inDto.TrialId,
|
||||||
}).ToList();
|
}).ToList();
|
||||||
await _clinicalDataSetRepository.AddRangeAsync(dataSets);
|
await _clinicalDataTrialSetRepository.AddRangeAsync(dataSets);
|
||||||
var result= await _clinicalDataSetRepository.SaveChangesAsync();
|
var result= await _clinicalDataTrialSetRepository.SaveChangesAsync();
|
||||||
return ResponseOutput.Ok(result);
|
return ResponseOutput.Ok(result);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 删除
|
/// 删除(项目)
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="clinicalDataId"></param>
|
/// <param name="id"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
[HttpDelete("{id:guid}")]
|
[HttpDelete("{id:guid}")]
|
||||||
public async Task<IResponseOutput> DeleteClinicalSetData(Guid id)
|
public async Task<IResponseOutput> DeleteClinicalTrialSetData(Guid id)
|
||||||
{
|
{
|
||||||
await _clinicalDataSetRepository.DeleteFromQueryAsync(x=>x.Id== id,true);
|
await _clinicalDataTrialSetRepository.DeleteFromQueryAsync(x=>x.Id== id,true);
|
||||||
|
return ResponseOutput.Result(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 删除(系统)
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="id"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
[HttpDelete("{id:guid}")]
|
||||||
|
public async Task<IResponseOutput> DeleteClinicalSystemSetData(Guid id)
|
||||||
|
{
|
||||||
|
await _clinicalDataSystemSetRepository.DeleteFromQueryAsync(x => x.Id == id, true);
|
||||||
return ResponseOutput.Result(true);
|
return ResponseOutput.Result(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,15 +13,19 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public class ClinicalDataTrialSetAddOrEdit: ClinicalDataSystemSetAddOrEdit
|
||||||
public class ClinicalDataSetAddOrEdit
|
|
||||||
{
|
{
|
||||||
public Guid? Id { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 项目ID
|
/// 项目ID
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public Guid? TrialId { get; set; }
|
public Guid? TrialId { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public class ClinicalDataSystemSetAddOrEdit
|
||||||
|
{
|
||||||
|
public Guid? Id { get; set; }
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
@ -56,15 +60,37 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public class ClinicalDataSetView
|
public class ClinicalDataTrialSetView : ClinicalDataSystemSetView
|
||||||
{
|
{
|
||||||
public Guid Id { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 项目ID
|
/// 项目ID
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public Guid? TrialId { get; set; }
|
public Guid? TrialId { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 系统的ClinicalDataSetId
|
||||||
|
/// </summary>
|
||||||
|
public Guid? SystemClinicalDataSetId { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 是否来自于系统数据
|
||||||
|
/// </summary>
|
||||||
|
public bool IsFromSystemData
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
return this.SystemClinicalDataSetId == null ? false : true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public class ClinicalDataSystemSetView
|
||||||
|
{
|
||||||
|
public Guid Id { get; set; }
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 名称
|
/// 名称
|
||||||
|
@ -83,10 +109,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||||
public ClinicalUploadType ClinicalUploadType { get; set; }
|
public ClinicalUploadType ClinicalUploadType { get; set; }
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 系统的ClinicalDataSetId
|
|
||||||
/// </summary>
|
|
||||||
public Guid? SystemClinicalDataSetId { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 创建时间
|
/// 创建时间
|
||||||
|
@ -108,14 +131,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public bool IsCheck { get; set; }
|
public bool IsCheck { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 是否来自于系统数据
|
|
||||||
/// </summary>
|
|
||||||
public bool IsFromSystemData {
|
|
||||||
get {
|
|
||||||
return this.SystemClinicalDataSetId == null ? false : true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public class ClinicalDataInDto
|
public class ClinicalDataInDto
|
||||||
|
@ -150,25 +166,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public class SetClinicalDataCheckIndto
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// 项目ID
|
|
||||||
/// </summary>
|
|
||||||
public Guid TrialId { get; set; }
|
|
||||||
|
|
||||||
List<>
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 勾选的ID
|
|
||||||
/// </summary>
|
|
||||||
public List<Guid> CheckIds { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 启用的ID
|
|
||||||
/// </summary>
|
|
||||||
public List<Guid> EnableIds { get; set; }
|
|
||||||
}
|
|
||||||
public class AddTrialClinicalDataSetInDto
|
public class AddTrialClinicalDataSetInDto
|
||||||
{
|
{
|
||||||
public Guid TrialId { get; set; }
|
public Guid TrialId { get; set; }
|
||||||
|
|
|
@ -25,11 +25,17 @@ namespace IRaCIS.Core.Application.Service
|
||||||
|
|
||||||
CreateMap<ClinicalData, ClinicalDataAddOrEdit>().ReverseMap();
|
CreateMap<ClinicalData, ClinicalDataAddOrEdit>().ReverseMap();
|
||||||
|
|
||||||
CreateMap<ClinicalDataSet, ClinicalDataSetAddOrEdit>().ReverseMap();
|
|
||||||
|
|
||||||
CreateMap<ClinicalData, ClinicalDataView>();
|
CreateMap<ClinicalData, ClinicalDataView>();
|
||||||
|
|
||||||
CreateMap<ClinicalDataSet, ClinicalDataSetView>();
|
|
||||||
|
CreateMap<ClinicalDataTrialSet, ClinicalDataTrialSetAddOrEdit>().ReverseMap();
|
||||||
|
|
||||||
|
CreateMap<ClinicalDataSystemSet, ClinicalDataSystemSetAddOrEdit>().ReverseMap();
|
||||||
|
|
||||||
|
CreateMap<ClinicalDataTrialSet, ClinicalDataTrialSetView>();
|
||||||
|
CreateMap<ClinicalDataSystemSet, ClinicalDataSystemSetView>();
|
||||||
|
|
||||||
CreateMap<PreviousPDF, PreviousPDFAddOrEdit>().ReverseMap();
|
CreateMap<PreviousPDF, PreviousPDFAddOrEdit>().ReverseMap();
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,64 @@
|
||||||
|
|
||||||
|
|
||||||
|
using System;
|
||||||
|
using IRaCIS.Core.Domain.Share;
|
||||||
|
using System.ComponentModel.DataAnnotations;
|
||||||
|
using System.ComponentModel.DataAnnotations.Schema;
|
||||||
|
using IRaCIS.Core.Domain.Share.Reading;
|
||||||
|
|
||||||
|
namespace IRaCIS.Core.Domain.Models
|
||||||
|
{
|
||||||
|
///<summary>
|
||||||
|
/// 临床资料系统配置
|
||||||
|
///</summary>
|
||||||
|
[Table("ClinicalDataSystemSet")]
|
||||||
|
public class ClinicalDataSystemSet : Entity, IAuditAdd
|
||||||
|
{
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 名称
|
||||||
|
/// </summary>
|
||||||
|
public string ClinicalDataSetName { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 临床级别
|
||||||
|
/// </summary>
|
||||||
|
public ClinicalLevel ClinicalDataLevel { get; set; }
|
||||||
|
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 上传方式
|
||||||
|
/// </summary>
|
||||||
|
public ClinicalUploadType ClinicalUploadType { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 创建时间
|
||||||
|
/// </summary>
|
||||||
|
public DateTime CreateTime { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 创建人
|
||||||
|
/// </summary>
|
||||||
|
public Guid CreateUserId { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 是否启用
|
||||||
|
/// </summary>
|
||||||
|
public bool IsEnable { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 是否勾选
|
||||||
|
/// </summary>
|
||||||
|
public bool IsCheck { get; set; }
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
}
|
|
@ -9,10 +9,10 @@ using IRaCIS.Core.Domain.Share.Reading;
|
||||||
namespace IRaCIS.Core.Domain.Models
|
namespace IRaCIS.Core.Domain.Models
|
||||||
{
|
{
|
||||||
///<summary>
|
///<summary>
|
||||||
/// 临床资料配置
|
/// 临床资料项目配置
|
||||||
///</summary>
|
///</summary>
|
||||||
[Table("ClinicalDataSet")]
|
[Table("ClinicalDataTrialSet")]
|
||||||
public class ClinicalDataSet : Entity, IAuditAdd
|
public class ClinicalDataTrialSet : Entity, IAuditAdd
|
||||||
{
|
{
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
|
@ -183,7 +183,10 @@ namespace IRaCIS.Core.Infra.EFCore
|
||||||
public virtual DbSet<ReadModule> ReadModule { get; set; }
|
public virtual DbSet<ReadModule> ReadModule { get; set; }
|
||||||
public virtual DbSet<ReadModuleView> ReadModuleView { get; set; }
|
public virtual DbSet<ReadModuleView> ReadModuleView { get; set; }
|
||||||
|
|
||||||
public virtual DbSet<ClinicalDataSet> ClinicalDataSet { get; set; }
|
public virtual DbSet<ClinicalDataTrialSet> ClinicalDataTrialSet { get; set; }
|
||||||
|
|
||||||
|
public virtual DbSet<ClinicalDataSystemSet> ClinicalDataSystemSet { get; set; }
|
||||||
|
|
||||||
public virtual DbSet<ClinicalData> ClinicalData { get; set; }
|
public virtual DbSet<ClinicalData> ClinicalData { get; set; }
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue