修改一版
This commit is contained in:
he
@@ -0,0 +1,111 @@
|
||||
using IRaCIS.Application.Interfaces;
|
||||
using IRaCIS.Core.Infra.EFCore;
|
||||
using IRaCIS.Core.Domain.Share;
|
||||
using IRaCIS.Core.Application.Filter;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using IRaCIS.Core.Application.Service.WorkLoad.DTO;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using IRaCIS.Core.Application.Auth;
|
||||
using IRaCIS.Core.Application.Service.Reading.Dto;
|
||||
using IRaCIS.Core.Domain.Share.Reading;
|
||||
using MassTransit;
|
||||
|
||||
namespace IRaCIS.Application.Services
|
||||
{
|
||||
/// <summary>
|
||||
/// 临床数据配置
|
||||
/// </summary>
|
||||
[ApiExplorerSettings(GroupName = "Reading")]
|
||||
public class ClinicalDataSetService : BaseService
|
||||
{
|
||||
|
||||
public IRepository<SubjectVisit> _subjectVisitRepository;
|
||||
private readonly IRepository<ClinicalData> _clinicalDataRepository;
|
||||
private readonly IRepository<ClinicalDataSet> _clinicalDataSetRepository;
|
||||
private readonly IRepository<PreviousPDF> _previousPDFRepository;
|
||||
|
||||
public ClinicalDataSetService(IRepository<SubjectVisit> subjectVisitRepository,
|
||||
IRepository<ClinicalData> clinicalDataRepository,
|
||||
IRepository<ClinicalDataSet> ClinicalDataSetRepository,
|
||||
IRepository<PreviousPDF> previousPDFRepository
|
||||
)
|
||||
{
|
||||
_subjectVisitRepository = subjectVisitRepository;
|
||||
_clinicalDataRepository = clinicalDataRepository;
|
||||
_clinicalDataSetRepository = ClinicalDataSetRepository;
|
||||
this._previousPDFRepository = previousPDFRepository;
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 新增或者修改
|
||||
/// </summary>
|
||||
/// <param name="indto"></param>
|
||||
/// <returns></returns>
|
||||
[HttpPost]
|
||||
public async Task<IResponseOutput> AddOrUpdateClinicalDataSet(ClinicalDataSetAddOrEdit indto)
|
||||
{
|
||||
var entity = await _clinicalDataSetRepository.InsertOrUpdateAsync(indto,true);
|
||||
return ResponseOutput.Ok(entity.Id.ToString());
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 分页获取
|
||||
/// </summary>
|
||||
/// <param name="query"></param>
|
||||
/// <returns></returns>
|
||||
[HttpPost]
|
||||
public async Task<PageOutput<ClinicalDataSetView>> GetClinicalDataSetList(ClinicalDataQuery query)
|
||||
{
|
||||
var readquery = _clinicalDataSetRepository.AsQueryable()
|
||||
.Where( x => x.TrialId == query.TrialId)
|
||||
.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>
|
||||
/// <param name="inDto"></param>
|
||||
/// <returns></returns>
|
||||
[HttpPost]
|
||||
public async Task<IResponseOutput> AddTrialClinicalDataSet(AddTrialClinicalDataSetInDto inDto)
|
||||
{
|
||||
var trialSystemIds =await _clinicalDataSetRepository.Where(x => x.TrialId == inDto.TrialId && x.SystemClinicalDataSetId != null).Select(x => x.SystemClinicalDataSetId.Value).ToListAsync();
|
||||
var needAddids = inDto.Ids.Except(trialSystemIds).ToList();
|
||||
var systemDataList =await _clinicalDataSetRepository.Where(x => needAddids.Contains(x.Id)).ToListAsync();
|
||||
List<ClinicalDataSet> dataSets = systemDataList.Select(x => new ClinicalDataSet()
|
||||
{
|
||||
Id= NewId.NextGuid(),
|
||||
SystemClinicalDataSetId=x.Id,
|
||||
ClinicalDataSetName=x.ClinicalDataSetName,
|
||||
ClinicalDataLevel=x.ClinicalDataLevel,
|
||||
ClinicalUploadType=x.ClinicalUploadType,
|
||||
TrialId=inDto.TrialId,
|
||||
}).ToList();
|
||||
await _clinicalDataSetRepository.AddRangeAsync(dataSets);
|
||||
var result= await _clinicalDataSetRepository.SaveChangesAsync();
|
||||
return ResponseOutput.Ok(result);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 删除
|
||||
/// </summary>
|
||||
/// <param name="clinicalDataId"></param>
|
||||
/// <returns></returns>
|
||||
[HttpDelete("{id:guid}")]
|
||||
public async Task<IResponseOutput> DeleteClinicalSetData(Guid id)
|
||||
{
|
||||
await _clinicalDataSetRepository.DeleteFromQueryAsync(x=>x.Id== id,true);
|
||||
return ResponseOutput.Result(true);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,4 +1,5 @@
|
||||
using System;
|
||||
using IRaCIS.Core.Domain.Share.Reading;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
@@ -13,11 +14,81 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||
}
|
||||
|
||||
|
||||
public class ClinicalDataSetAddOrEdit
|
||||
{
|
||||
public Guid? Id { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 项目ID
|
||||
/// </summary>
|
||||
public Guid? TrialId { get; set; }
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 名称
|
||||
/// </summary>
|
||||
public string ClinicalDataSetName { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 临床级别
|
||||
/// </summary>
|
||||
public ClinicalLevel ClinicalDataLevel { get; set; }
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 上传方式
|
||||
/// </summary>
|
||||
public ClinicalUploadType ClinicalUploadType { get; set; }
|
||||
}
|
||||
|
||||
public class ClinicalDataView : ClinicalData
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public class ClinicalDataSetView
|
||||
{
|
||||
public Guid Id { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 项目ID
|
||||
/// </summary>
|
||||
public Guid? TrialId { get; set; }
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 名称
|
||||
/// </summary>
|
||||
public string ClinicalDataSetName { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 临床级别
|
||||
/// </summary>
|
||||
public ClinicalLevel ClinicalDataLevel { get; set; }
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 上传方式
|
||||
/// </summary>
|
||||
public ClinicalUploadType ClinicalUploadType { get; set; }
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 系统的ClinicalDataSetId
|
||||
/// </summary>
|
||||
public Guid? SystemClinicalDataSetId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 创建时间
|
||||
/// </summary>
|
||||
public DateTime CreateTime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 创建人
|
||||
/// </summary>
|
||||
public Guid CreateUserId { get; set; }
|
||||
}
|
||||
|
||||
public class ClinicalDataInDto
|
||||
{
|
||||
/// <summary>
|
||||
@@ -35,34 +106,24 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||
/// </summary>
|
||||
public Guid VisitOrReadId { get; set; }
|
||||
}
|
||||
public class ClinicalDataQuery
|
||||
public class ClinicalDataQuery:PageInput
|
||||
{
|
||||
/// <summary>
|
||||
/// 项目ID
|
||||
/// </summary>
|
||||
public Guid? TrialId { get; set; }
|
||||
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 页码
|
||||
/// 名称
|
||||
/// </summary>
|
||||
public int PageIndex { get; set; } = 1;
|
||||
public string ClinicalDataSetName { get; set; }=string.Empty;
|
||||
|
||||
/// <summary>
|
||||
/// 每页大小
|
||||
/// </summary>
|
||||
public int PageSize { get; set; } = 10;
|
||||
}
|
||||
|
||||
public class AddTrialClinicalDataSetInDto
|
||||
{
|
||||
public List<Guid> Ids { get; set; } = new List<Guid>();
|
||||
|
||||
/// <summary>
|
||||
/// 排序字段
|
||||
/// </summary>
|
||||
public string? SortField { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 排序字段
|
||||
/// </summary>
|
||||
public bool SortAsc { get; set; } = true;
|
||||
public Guid TrialId { get; set; }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -25,8 +25,12 @@ namespace IRaCIS.Core.Application.Service
|
||||
|
||||
CreateMap<ClinicalData, ClinicalDataAddOrEdit>().ReverseMap();
|
||||
|
||||
CreateMap<ClinicalDataSet, ClinicalDataSetAddOrEdit>().ReverseMap();
|
||||
|
||||
CreateMap<ClinicalData, ClinicalDataView>();
|
||||
|
||||
CreateMap<ClinicalDataSet, ClinicalDataSetView>();
|
||||
|
||||
CreateMap<PreviousPDF, PreviousPDFAddOrEdit>().ReverseMap();
|
||||
|
||||
CreateMap<PreviousPDF, PreviousPDFView>();
|
||||
|
||||
Reference in New Issue
Block a user