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

修改一版

Uat_Study
he 2022-06-09 16:13:17 +08:00
parent 83f4e6cbb6
commit 813eaff653
9 changed files with 311 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
View File

@ -445,6 +445,26 @@
<returns></returns>
<exception cref="T:IRaCIS.Core.Infrastructure.BusinessValidationFailedException"></exception>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataTrialSetAddOrEdit.ClinicalDataSetName">
<summary>
名称
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataTrialSetAddOrEdit.ClinicalDataLevel">
<summary>
临床级别
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataTrialSetAddOrEdit.ClinicalUploadType">
<summary>
上传方式
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataTrialSetAddOrEdit.IsEnable">
<summary>
是否启用
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataTrialSetAddOrEdit.TrialId">
<summary>
项目ID
@ -455,6 +475,11 @@
是否勾选
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataSystemSetAddOrEdit.ClinicalDataSetEnum">
<summary>
枚举
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataSystemSetAddOrEdit.ClinicalDataSetName">
<summary>
名称
@ -475,6 +500,31 @@
是否启用
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataTrialSetView.ClinicalDataSetName">
<summary>
名称
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataTrialSetView.ClinicalDataLevel">
<summary>
临床级别
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataTrialSetView.ClinicalUploadType">
<summary>
上传方式
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataTrialSetView.CreateTime">
<summary>
创建时间
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataTrialSetView.CreateUserId">
<summary>
创建人
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataTrialSetView.TrialId">
<summary>
项目ID
@ -500,6 +550,11 @@
是否使用
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataSystemSetView.ClinicalDataSetEnum">
<summary>
枚举
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataSystemSetView.ClinicalDataSetName">
<summary>
名称
@ -890,6 +945,26 @@
排序字段
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingClinicalDataDto.TrialId">
<summary>
项目ID
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingClinicalDataDto.objectId">
<summary>
对象ID
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingClinicalDataDto.ClinicalDataTrialSetId">
<summary>
临床数据类型Id
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingClinicalDataDto.IsVisit">
<summary>
临床数据类型Id
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingPeriodSetAddOrEdit.TrialId">
<summary>
项目ID
@ -3269,60 +3344,60 @@
<param name="password"></param>
<returns></returns>
</member>
<member name="T:IRaCIS.Application.Services.ClinicalDataSetService">
<member name="T:IRaCIS.Application.Services.ReadingClinicalDataService">
<summary>
临床数据配置
</summary>
</member>
<member name="M:IRaCIS.Application.Services.ClinicalDataSetService.AddOrUpdateClinicalDataTrialSet(IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataTrialSetAddOrEdit)">
<member name="M:IRaCIS.Application.Services.ReadingClinicalDataService.AddOrUpdateClinicalDataTrialSet(IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataTrialSetAddOrEdit)">
<summary>
新增或者修改(项目)
</summary>
<param name="indto"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Application.Services.ClinicalDataSetService.AddOrUpdateClinicalDataSystemSet(IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataSystemSetAddOrEdit)">
<member name="M:IRaCIS.Application.Services.ReadingClinicalDataService.AddOrUpdateClinicalDataSystemSet(IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataSystemSetAddOrEdit)">
<summary>
新增或者修改(系统)
</summary>
<param name="indto"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Application.Services.ClinicalDataSetService.GetSystemClinicalDataSystemSetList(IRaCIS.Core.Application.Service.Reading.Dto.GetTrialClinicalDataSystemIndto)">
<member name="M:IRaCIS.Application.Services.ReadingClinicalDataService.GetSystemClinicalDataSystemSetList(IRaCIS.Core.Application.Service.Reading.Dto.GetTrialClinicalDataSystemIndto)">
<summary>
获取系统临床数据（系统）
</summary>
<returns></returns>
</member>
<member name="M:IRaCIS.Application.Services.ClinicalDataSetService.GetTrialClinicalDataTrialSetList(IRaCIS.Core.Application.Service.Reading.Dto.GetTrialClinicalDataTrialIndto)">
<member name="M:IRaCIS.Application.Services.ReadingClinicalDataService.GetTrialClinicalDataTrialSetList(IRaCIS.Core.Application.Service.Reading.Dto.GetTrialClinicalDataTrialIndto)">
<summary>
获取项目的临床数据
</summary>
<param name="inDto"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Application.Services.ClinicalDataSetService.SetClinicalDataCheckd(IRaCIS.Core.Application.Service.Reading.Dto.SetClinicalDataCheckdIndto)">
<member name="M:IRaCIS.Application.Services.ReadingClinicalDataService.SetClinicalDataCheckd(IRaCIS.Core.Application.Service.Reading.Dto.SetClinicalDataCheckdIndto)">
<summary>
设置勾选
</summary>
<param name="setClinicalData"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Application.Services.ClinicalDataSetService.AddTrialClinicalDataTrialSet(System.Guid)">
<member name="M:IRaCIS.Application.Services.ReadingClinicalDataService.AddTrialClinicalDataTrialSet(System.Guid)">
<summary>
将系统配置添加到项目配置
</summary>
<param name="trialId"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Application.Services.ClinicalDataSetService.DeleteClinicalTrialSetData(System.Guid)">
<member name="M:IRaCIS.Application.Services.ReadingClinicalDataService.DeleteClinicalTrialSetData(System.Guid)">
<summary>
删除(项目)
</summary>
<param name="id"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Application.Services.ClinicalDataSetService.DeleteClinicalSystemSetData(System.Guid)">
<member name="M:IRaCIS.Application.Services.ReadingClinicalDataService.DeleteClinicalSystemSetData(System.Guid)">
<summary>
删除(系统)
</summary>
@ -3355,6 +3430,18 @@
<param name="previousPDFId"></param>
<returns></returns>
</member>
<member name="T:IRaCIS.Application.Services.ClinicalDataSetService">
<summary>
临床数据配置
</summary>
</member>
<member name="M:IRaCIS.Application.Services.ClinicalDataSetService.AddOrUpdateReadingClinicalData(IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingClinicalDataDto)">
<summary>
新增或者修改
</summary>
<param name="indto"></param>
<returns></returns>
</member>
<member name="T:IRaCIS.Application.Services.ReadingPeriodSetService">
<summary>
阅片期配置

5
IRaCIS.Core.Application/Service/Reading/ClinicalDataSetService.cs
View File

@ -16,7 +16,7 @@ namespace IRaCIS.Application.Services
/// 临床数据配置
/// </summary>
[ApiExplorerSettings(GroupName = "Reading")]
public class ClinicalDataSetService : BaseService
public class ReadingClinicalDataService : BaseService
{
public IRepository<SubjectVisit> _subjectVisitRepository;
@ -25,7 +25,7 @@ namespace IRaCIS.Application.Services
private readonly IRepository<ClinicalDataSystemSet> _clinicalDataSystemSetRepository;
private readonly IRepository<PreviousPDF> _previousPDFRepository;
public ClinicalDataSetService(IRepository<SubjectVisit> subjectVisitRepository,
public ReadingClinicalDataService(IRepository<SubjectVisit> subjectVisitRepository,
IRepository<ClinicalDataTrialSet> ClinicalDataTrialSetRepository,
IRepository<ClinicalDataSystemSet> ClinicalDataSystemSetRepository,
@ -79,6 +79,7 @@ namespace IRaCIS.Application.Services
.ProjectTo<ClinicalDataSystemSetView>(_mapper.ConfigurationProvider).ToListAsync();
}
/// <summary>
/// 获取项目的临床数据
/// </summary>

3
IRaCIS.Core.Application/Service/Reading/Dto/ClinicalDataServiceViewModel.cs
View File

@ -89,9 +89,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public Guid Id { get; set; }
/// <summary>
/// 名称
/// </summary>

39
IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs Normal file
View File

@ -0,0 +1,39 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace IRaCIS.Core.Application.Service.Reading.Dto
{
public class AddOrUpdateReadingClinicalDataDto
{
public Guid? Id { get; set; }
/// <summary>
/// 项目ID
/// </summary>
public Guid TrialId { get; set; }
/// <summary>
/// 对象ID
/// </summary>
public Guid objectId { get; set; }
/// <summary>
/// 临床数据类型Id
/// </summary>
public Guid ClinicalDataTrialSetId { get; set; }
/// <summary>
/// 临床数据类型Id
/// </summary>
public bool IsVisit { get; set; }
}
public class GetTrialClinicalData
{
}
}

134
IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs Normal file
View File

@ -0,0 +1,134 @@
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
{
private readonly IRepository<ReadingClinicalData> _readingClinicalDataRepository;
public ClinicalDataSetService(IRepository<ReadingClinicalData> readingClinicalDataRepository
)
{
this._readingClinicalDataRepository = readingClinicalDataRepository;
}
/// <summary>
/// 新增或者修改
/// </summary>
/// <param name="indto"></param>
/// <returns></returns>
[HttpPost]
public async Task<IResponseOutput> AddOrUpdateReadingClinicalData(AddOrUpdateReadingClinicalDataDto indto)
{
var entity = await _readingClinicalDataRepository.InsertOrUpdateAsync(indto,true);
return ResponseOutput.Ok(entity.Id.ToString());
}
//public async Task<List<>> GetTrialClinicalData()
///// <summary>
///// 获取系统临床数据（系统）
///// </summary>
///// <returns></returns>
//[HttpPost]
//public async Task<List<ClinicalDataSystemSetView>> GetSystemClinicalDataSystemSetList(GetTrialClinicalDataSystemIndto inDto)
//{
// return await _clinicalDataSystemSetRepository.AsQueryable()
// .WhereIf(inDto.ClinicalDataLevel != null, x => x.ClinicalDataLevel == inDto.ClinicalDataLevel)
// .WhereIf(inDto.ClinicalUploadType != null, x => x.ClinicalUploadType == inDto.ClinicalUploadType)
// .WhereIf(inDto.ClinicalDataSetName != String.Empty, x => x.ClinicalDataSetName.Contains(inDto.ClinicalDataSetName))
// .ProjectTo<ClinicalDataSystemSetView>(_mapper.ConfigurationProvider).ToListAsync();
//}
///// <summary>
///// 获取项目的临床数据
///// </summary>
///// <param name="inDto"></param>
///// <returns></returns>
//[HttpPost]
//public async Task<List<ClinicalDataTrialSetView>> GetTrialClinicalDataTrialSetList(GetTrialClinicalDataTrialIndto inDto)
//{
// await this.AddTrialClinicalDataTrialSet(inDto.TrialId);
// return await _clinicalDataTrialSetRepository.AsQueryable()
// .Where(x => x.TrialId == inDto.TrialId)
// .WhereIf(inDto.ClinicalDataLevel!=null,x=>x.ClinicalDataLevel== inDto.ClinicalDataLevel)
// .WhereIf(inDto.ClinicalUploadType != null, x => x.ClinicalUploadType == inDto.ClinicalUploadType)
// .WhereIf(inDto.ClinicalDataSetName != String.Empty, x => x.ClinicalDataSetName.Contains(inDto.ClinicalDataSetName))
// .ProjectTo<ClinicalDataTrialSetView>(_mapper.ConfigurationProvider).ToListAsync();
//}
///// <summary>
///// 将系统配置添加到项目配置
///// </summary>
///// <param name="trialId"></param>
///// <returns></returns>
//private async Task<IResponseOutput> AddTrialClinicalDataTrialSet(Guid trialId)
//{
// var systemIds = await _clinicalDataSystemSetRepository.Select(x => x.Id).ToListAsync();
// var trialSystemIds =await _clinicalDataTrialSetRepository.Where(x => x.TrialId == trialId && x.SystemClinicalDataSetId != null).Select(x => x.SystemClinicalDataSetId.Value).ToListAsync();
// var needAddids = systemIds.Except(trialSystemIds).ToList();
// var systemDataList =await _clinicalDataSystemSetRepository.Where(x => needAddids.Contains(x.Id)).ToListAsync();
// List<ClinicalDataTrialSet> dataSets = systemDataList.Select(x => new ClinicalDataTrialSet()
// {
// Id= NewId.NextGuid(),
// SystemClinicalDataSetId=x.Id,
// ClinicalDataSetName=x.ClinicalDataSetName,
// ClinicalDataLevel=x.ClinicalDataLevel,
// ClinicalUploadType=x.ClinicalUploadType,
// TrialId= trialId,
// }).ToList();
// await _clinicalDataTrialSetRepository.AddRangeAsync(dataSets);
// var result= await _clinicalDataTrialSetRepository.SaveChangesAsync();
// return ResponseOutput.Ok(result);
//}
///// <summary>
///// 删除(项目)
///// </summary>
///// <param name="id"></param>
///// <returns></returns>
//[HttpDelete("{id:guid}")]
//public async Task<IResponseOutput> DeleteClinicalTrialSetData(Guid id)
//{
// 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);
//}
}
}

2
IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
View File

@ -76,6 +76,8 @@ namespace IRaCIS.Core.Application.Contracts
public List<Guid> CriterionIds { get; set; } = new List<Guid>();
public List<Guid> ClinicalDataTrialSetIds { get; set; } = new List<Guid>();
public Guid TrialId { get; set; }

29
IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
View File

@ -311,17 +311,28 @@ namespace IRaCIS.Core.Application
_mapper.Map(trialConfig, trialInfo);
trialInfo.UpdateTime = DateTime.Now;
await _clinicalDataTrialSetRepository.BatchUpdateNoTrackingAsync(x => x.TrialId == trialConfig.TrialId, x => new ClinicalDataTrialSet
{
IsConfirm = false
});
await _clinicalDataTrialSetRepository.BatchUpdateNoTrackingAsync(x => x.TrialId == trialConfig.TrialId && x.IsCheck, x => new ClinicalDataTrialSet
{
IsConfirm = true
});
var noconfirmids = await _clinicalDataTrialSetRepository.Where(x => x.TrialId == trialConfig.TrialId && !trialConfig.ClinicalDataTrialSetIds.Contains(x.Id)).Select(x => x.Id).ToListAsync();
foreach (var item in trialConfig.ClinicalDataTrialSetIds)
{
await _clinicalDataTrialSetRepository.UpdatePartialFromQueryAsync(item, x => new ClinicalDataTrialSet()
{
IsConfirm = true
});
}
foreach (var item in noconfirmids)
{
await _clinicalDataTrialSetRepository.UpdatePartialFromQueryAsync(item, x => new ClinicalDataTrialSet()
{
IsConfirm = false
});
}
return ResponseOutput.Ok(await _repository.SaveChangesAsync());
}

15
IRaCIS.Core.Domain/Reading/ReadingClinicalData.cs
View File

@ -19,6 +19,21 @@ namespace IRaCIS.Core.Domain.Models
/// </summary>
public Guid TrialId { get; set; }
/// <summary>
/// 对象ID
/// </summary>
public Guid ObjectId { get; set; }
/// <summary>
/// 临床数据类型Id
/// </summary>
public Guid ClinicalDataTrialSetId { get; set; }
/// <summary>
/// 临床数据类型Id
/// </summary>
public bool IsVisit { get; set; }
/// <summary>
/// 创建时间
/// </summary>

2
IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs
View File

@ -180,6 +180,8 @@ namespace IRaCIS.Core.Infra.EFCore
public virtual DbSet<ReadingPeriodPlan> ReadingPeriodPlan { get; set; }
public virtual DbSet<ReadingClinicalData> ReadingClinicalData { get; set; }
public virtual DbSet<ReadModule> ReadModule { get; set; }
public virtual DbSet<ReadModuleView> ReadModuleView { get; set; }