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

修改一版

Uat_Study
he 2022-06-24 11:29:30 +08:00
parent 440790a01a
commit 83480730f0
9 changed files with 117 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -580,6 +580,11 @@
上传方式 上传方式
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataTrialSetAddOrEdit.UploadRole">
<summary>
上传角色
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataTrialSetAddOrEdit.IsEnable"> <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataTrialSetAddOrEdit.IsEnable">
<summary> <summary>
是否启用 是否启用
@ -610,6 +615,11 @@
临床级别 临床级别
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataSystemSetAddOrEdit.UploadRole">
<summary>
上传角色
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataSystemSetAddOrEdit.ClinicalUploadType"> <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataSystemSetAddOrEdit.ClinicalUploadType">
<summary> <summary>
上传方式 上传方式
@ -645,6 +655,11 @@
创建人 创建人
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataTrialSetView.UploadRole">
<summary>
上传角色
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataTrialSetView.TrialId"> <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataTrialSetView.TrialId">
<summary> <summary>
项目ID 项目ID
@ -690,6 +705,11 @@
上传方式 上传方式
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataSystemSetView.UploadRole">
<summary>
上传角色
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataSystemSetView.CreateTime"> <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataSystemSetView.CreateTime">
<summary> <summary>
创建时间 创建时间
@ -1085,6 +1105,11 @@
临床级别 临床级别
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadingClinicalDataListOutDto.UploadRole">
<summary>
上传角色
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadingClinicalDataListOutDto.ClinicalUploadType"> <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadingClinicalDataListOutDto.ClinicalUploadType">
<summary> <summary>
上传方式 上传方式
@ -1155,6 +1180,11 @@
是否是基线 是否是基线
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTrialClinicalDataSelectIndto.UploadRole">
<summary>
上传角色
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTrialClinicalDataSelectOutDto.ClinicalDataSetName"> <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTrialClinicalDataSelectOutDto.ClinicalDataSetName">
<summary> <summary>
名称 名称

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

@ -96,16 +96,6 @@ namespace IRaCIS.Application.Services
.WhereIf(inDto.ClinicalUploadType != null, x => x.ClinicalUploadType == inDto.ClinicalUploadType) .WhereIf(inDto.ClinicalUploadType != null, x => x.ClinicalUploadType == inDto.ClinicalUploadType)
.WhereIf(inDto.ClinicalDataSetName != String.Empty, x => x.ClinicalDataSetName.Contains(inDto.ClinicalDataSetName)) .WhereIf(inDto.ClinicalDataSetName != String.Empty, x => x.ClinicalDataSetName.Contains(inDto.ClinicalDataSetName))
.ProjectTo<ClinicalDataTrialSetView>(_mapper.ConfigurationProvider).ToListAsync(); .ProjectTo<ClinicalDataTrialSetView>(_mapper.ConfigurationProvider).ToListAsync();
var crcClinicalData = await _previousPDFRepository.AnyAsync(x => x.TrialId == inDto.TrialId);
trialClinicalDataList.ForEach(x =>
{
if (x.ClinicalDataSetName == "既往局部治疗史")
{
x.IsUsed = crcClinicalData;
}
});
return trialClinicalDataList; return trialClinicalDataList;
} }

7
IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs
View File

@ -93,6 +93,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
[Required(ErrorMessage = "ReadingId为null")] [Required(ErrorMessage = "ReadingId为null")]
public Guid ReadingId { get; set; } public Guid ReadingId { get; set; }
public UploadRole UploadRole { get; set; }
} }
public class GetReadingClinicalDataPDFListIndto:PageInput public class GetReadingClinicalDataPDFListIndto:PageInput
@ -211,6 +213,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary> /// </summary>
public ClinicalLevel ClinicalDataLevel { get; set; } public ClinicalLevel ClinicalDataLevel { get; set; }
/// <summary>
/// 上传角色
/// </summary>
public UploadRole UploadRole { get; set; }
public Guid SubjectId { get; set; } public Guid SubjectId { get; set; }
/// <summary> /// <summary>

4
IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
View File

@ -148,7 +148,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public class GetReadingPastResultListInDto public class GetReadingPastResultListInDto
{ {
[NotDefault]
public Guid TrialId { get; set; } public Guid TrialId { get; set; }
[NotDefault]
public Guid SubjectId { get; set; }
} }
public class SaveJudgeVisitTaskResult public class SaveJudgeVisitTaskResult

71
IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs
View File

@ -25,14 +25,13 @@ namespace IRaCIS.Application.Services
{ {
private readonly IRepository<ReadingClinicalData> _readingClinicalDataRepository; private readonly IRepository<ReadingClinicalData> _readingClinicalDataRepository;
private readonly IRepository<ClinicalDataTrialSet> _clinicalDataTrialSetRepository; private readonly IRepository<ClinicalDataTrialSet> _clinicalDataTrialSetRepository;
private readonly IRepository<ReadingClinicalDataView> _readingClinicalDataViewRepository;
private readonly IRepository<PreviousPDF> _previousPDFRepository; private readonly IRepository<PreviousPDF> _previousPDFRepository;
private readonly IRepository<SubjectVisit> _subjectVisitRepository; private readonly IRepository<SubjectVisit> _subjectVisitRepository;
private readonly IRepository<ReadingClinicalDataPDF> _readingClinicalDataPDFRepository; private readonly IRepository<ReadingClinicalDataPDF> _readingClinicalDataPDFRepository;
public ReadingClinicalDataService(IRepository<ReadingClinicalData> readingClinicalDataRepository, public ReadingClinicalDataService(IRepository<ReadingClinicalData> readingClinicalDataRepository,
IRepository<ClinicalDataTrialSet> clinicalDataTrialSetRepository, IRepository<ClinicalDataTrialSet> clinicalDataTrialSetRepository,
IRepository<ReadingClinicalDataView> readingClinicalDataViewRepository,
IRepository<PreviousPDF> previousPDFRepository, IRepository<PreviousPDF> previousPDFRepository,
IRepository<SubjectVisit> subjectVisitRepository, IRepository<SubjectVisit> subjectVisitRepository,
IRepository<ReadingClinicalDataPDF> readingClinicalDataPDFRepository IRepository<ReadingClinicalDataPDF> readingClinicalDataPDFRepository
@ -40,7 +39,6 @@ namespace IRaCIS.Application.Services
{ {
this._readingClinicalDataRepository = readingClinicalDataRepository; this._readingClinicalDataRepository = readingClinicalDataRepository;
this._clinicalDataTrialSetRepository = clinicalDataTrialSetRepository; this._clinicalDataTrialSetRepository = clinicalDataTrialSetRepository;
this._readingClinicalDataViewRepository = readingClinicalDataViewRepository;
this._previousPDFRepository = previousPDFRepository; this._previousPDFRepository = previousPDFRepository;
this._subjectVisitRepository = subjectVisitRepository; this._subjectVisitRepository = subjectVisitRepository;
this._readingClinicalDataPDFRepository = readingClinicalDataPDFRepository; this._readingClinicalDataPDFRepository = readingClinicalDataPDFRepository;
@ -194,48 +192,35 @@ namespace IRaCIS.Application.Services
[HttpPost] [HttpPost]
public async Task<PageOutput<GetReadingClinicalDataListOutDto>> GetReadingClinicalDataList(GetReadingClinicalDataListIndto inDto) public async Task<PageOutput<GetReadingClinicalDataListOutDto>> GetReadingClinicalDataList(GetReadingClinicalDataListIndto inDto)
{ {
var isBaseLine = await _subjectVisitRepository.AnyAsync(x => x.Id == inDto.ReadingId && x.VisitNum == 0); var isBaseLine = await _subjectVisitRepository.AnyAsync(x => x.Id == inDto.ReadingId && x.IsBaseLine);
var result = await _readingClinicalDataViewRepository.Where(x=>x.SubjectId==inDto.SubjectId) var resultQuery = _readingClinicalDataRepository.Where(x => x.SubjectId == inDto.SubjectId)
.Where(x=>x.ReadingId==inDto.ReadingId||x.ReadingId==null) .Where(x => x.ReadingId == inDto.ReadingId)
.WhereIf(!isBaseLine,x=>x.IsCRCUpload==false).ProjectTo<GetReadingClinicalDataListOutDto>(_mapper.ConfigurationProvider).ToPagedListAsync(inDto.PageIndex, inDto.PageSize, inDto.SortField == null ? nameof(GetReadingClinicalDataListOutDto.ClinicalDataSetName) : inDto.SortField, .WhereIf(inDto.UploadRole == UploadRole.CRC, x => x.ClinicalDataTrialSet.UploadRole == UploadRole.CRC)
.WhereIf(inDto.UploadRole == UploadRole.PM && !isBaseLine, x => x.ClinicalDataTrialSet.UploadRole == UploadRole.PM)
.Select(x => new GetReadingClinicalDataListOutDto() {
ClinicalDataLevel = x.ClinicalDataTrialSet.ClinicalDataLevel,
SubjectId = x.SubjectId,
ClinicalDataSetName = x.ClinicalDataTrialSet.ClinicalDataSetName,
ClinicalDataTrialSetId = x.ClinicalDataTrialSetId,
IsSign = x.IsSign,
ClinicalUploadType = x.ClinicalDataTrialSet.ClinicalUploadType,
Id = x.Id,
UploadRole=x.ClinicalDataTrialSet.UploadRole,
IsCRCUpload = x.ClinicalDataTrialSet.UploadRole == UploadRole.CRC,
FileList = x.ReadingClinicalDataPDFList.Select(y => new GetFileDto()
{
Id = y.Id,
FileName = y.FileName,
Path = y.Path
}).ToList()
});
var result=await resultQuery.ToPagedListAsync(inDto.PageIndex, inDto.PageSize, inDto.SortField == null ? nameof(GetReadingClinicalDataListOutDto.ClinicalDataSetName) : inDto.SortField,
inDto.Asc); inDto.Asc);
foreach (var item in result.CurrentPageData)
{
item.ClinicalDataLevelName = item.ClinicalDataLevel.GetDisplayName();
item.ClinicalUploadTypeName = item.ClinicalUploadType.GetDisplayName();
if (item.IsCRCUpload)
{
item.FileList = await _previousPDFRepository.Where(x => x.SubjectId == inDto.SubjectId).Select(y => new GetFileDto()
{
Id = y.Id,
FileName = y.FileName,
Path = y.Path
}).ToListAsync();
}
else
{
if (item.ClinicalDataLevel != ClinicalLevel.Subject)
{
item.FileList = await _readingClinicalDataPDFRepository.Where(y => y.ReadingClinicalDataId == item.Id).Select(y => new GetFileDto()
{
Id = y.Id,
FileName = y.FileName,
Path = y.Path
}).ToListAsync();
}
else
{
item.FileList = await _readingClinicalDataPDFRepository.Where(y => y.SubjectId == item.SubjectId).Select(y => new GetFileDto()
{
Id = y.Id,
FileName = y.FileName,
Path = y.Path
}).ToListAsync();
}
}
}

13
IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
View File

@ -29,6 +29,7 @@ namespace IRaCIS.Application.Services
private readonly IRepository<NoneDicomStudy> _noneDicomStudyRepository; private readonly IRepository<NoneDicomStudy> _noneDicomStudyRepository;
private readonly IRepository<VisitTask> _visitTaskRepository; private readonly IRepository<VisitTask> _visitTaskRepository;
private readonly IRepository<Trial> _trialRepository;
private readonly IVisitTaskHelpeService _visitTaskHelpeService; private readonly IVisitTaskHelpeService _visitTaskHelpeService;
private readonly IRepository<SubjectVisit> _subjectVisitRepository; private readonly IRepository<SubjectVisit> _subjectVisitRepository;
private readonly IRepository<Subject> _subjectRepository; private readonly IRepository<Subject> _subjectRepository;
@ -42,6 +43,7 @@ namespace IRaCIS.Application.Services
IMapper mapper, IMapper mapper,
IRepository<NoneDicomStudy> noneDicomStudyRepository, IRepository<NoneDicomStudy> noneDicomStudyRepository,
IRepository<VisitTask> visitTaskRepository, IRepository<VisitTask> visitTaskRepository,
IRepository<Trial> TrialRepository,
IVisitTaskHelpeService visitTaskHelpeService, IVisitTaskHelpeService visitTaskHelpeService,
IRepository<SubjectVisit> subjectVisitRepository, IRepository<SubjectVisit> subjectVisitRepository,
IRepository<Subject> subjectRepository, IRepository<Subject> subjectRepository,
@ -54,6 +56,7 @@ namespace IRaCIS.Application.Services
base._mapper = mapper; base._mapper = mapper;
this._noneDicomStudyRepository = noneDicomStudyRepository; this._noneDicomStudyRepository = noneDicomStudyRepository;
this._visitTaskRepository = visitTaskRepository; this._visitTaskRepository = visitTaskRepository;
this._trialRepository = TrialRepository;
this._visitTaskHelpeService = visitTaskHelpeService; this._visitTaskHelpeService = visitTaskHelpeService;
this._subjectVisitRepository = subjectVisitRepository; this._subjectVisitRepository = subjectVisitRepository;
this._subjectRepository = subjectRepository; this._subjectRepository = subjectRepository;
@ -171,11 +174,19 @@ namespace IRaCIS.Application.Services
} }
List<NoneDicomStudyView> result=await _noneDicomStudyRepository.Where(t => visitIds.Contains(t.SubjectVisitId)) List<NoneDicomStudyView> result=await _noneDicomStudyRepository.Where(t => visitIds.Contains(t.SubjectVisitId))
.ProjectTo<NoneDicomStudyView>(_mapper.ConfigurationProvider, new { token = _userInfo.UserToken }).ToListAsync(); .ProjectTo<NoneDicomStudyView>(_mapper.ConfigurationProvider, new { token = _userInfo.UserToken }).ToListAsync();
var trialInfo = await _trialRepository.Where(x => x.Id == inDto.TrialId).Select(x => new
{
x.IsReadingShowPreviousResults,
x.IsReadingShowSubjectInfo,
}).FirstOrDefaultAsync();
return (result, new { return (result, new {
VisitTaskId= task.VisistTaskId, VisitTaskId= task.VisistTaskId,
SubjectId=task.SubjectId, SubjectId=task.SubjectId,
SubjectCode=task.SubjectCode, SubjectCode=task.SubjectCode,
ReadingCategory= task.ReadingCategory, ReadingCategory= task.ReadingCategory,
IsReadingShowPreviousResults= trialInfo.IsReadingShowPreviousResults,
IsReadingShowSubjectInfo=trialInfo.IsReadingShowSubjectInfo,
}); });
} }
@ -388,7 +399,7 @@ namespace IRaCIS.Application.Services
[HttpPost] [HttpPost]
public async Task<List<GetReadingPastResultListOutDto>> GetReadingPastResultList(GetReadingPastResultListInDto inDto) public async Task<List<GetReadingPastResultListOutDto>> GetReadingPastResultList(GetReadingPastResultListInDto inDto)
{ {
var readingPastResultList =await _visitTaskRepository.Where(x => x.TrialId == inDto.TrialId && x.DoctorUserId == _userInfo.Id) var readingPastResultList =await _visitTaskRepository.Where(x => x.TrialId == inDto.TrialId&&x.SubjectId==inDto.SubjectId && x.DoctorUserId == _userInfo.Id)
.ProjectTo<GetReadingPastResultListOutDto>(_mapper.ConfigurationProvider).ToListAsync(); .ProjectTo<GetReadingPastResultListOutDto>(_mapper.ConfigurationProvider).ToListAsync();
return readingPastResultList; return readingPastResultList;
} }

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

@ -20,7 +20,7 @@ namespace IRaCIS.Core.Application.Service
.ForMember(d => d.SiteCodes, u => u.MapFrom(s => s.ReadingPeriodSites.Select(x => x.TrialSite.TrialSiteCode))) .ForMember(d => d.SiteCodes, u => u.MapFrom(s => s.ReadingPeriodSites.Select(x => x.TrialSite.TrialSiteCode)))
.ForMember(d => d.PlanCount, u => u.MapFrom(s => s.ReadingPeriodPlanList.Count)); .ForMember(d => d.PlanCount, u => u.MapFrom(s => s.ReadingPeriodPlanList.Count));
CreateMap<ReadingClinicalDataView, GetReadingClinicalDataListOutDto>(); //CreateMap<ReadingClinicalDataView, GetReadingClinicalDataListOutDto>();
// CreateMap<ReadingClinicalData, GetReadingClinicalDataListOutDto>() // CreateMap<ReadingClinicalData, GetReadingClinicalDataListOutDto>()
//.ForMember(d => d.ClinicalDataLevel, u => u.MapFrom(s => s.ClinicalDataTrialSet.ClinicalDataLevel)) //.ForMember(d => d.ClinicalDataLevel, u => u.MapFrom(s => s.ClinicalDataTrialSet.ClinicalDataLevel))
//.ForMember(d => d.ClinicalDataLevelName, u => u.MapFrom(s => s.ClinicalDataTrialSet.ClinicalDataSetName)) //.ForMember(d => d.ClinicalDataLevelName, u => u.MapFrom(s => s.ClinicalDataTrialSet.ClinicalDataSetName))

73
IRaCIS.Core.Domain/Reading/View/ReadingClinicalDataView.cs
View File

@ -1,5 +1,4 @@
using IRaCIS.Core.Domain.Share; using IRaCIS.Core.Domain.Share;
using IRaCIS.Core.Domain.Share;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
@ -8,54 +7,54 @@ using System.Threading.Tasks;
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models
{ {
public class ReadingClinicalDataView : Entity //public class ReadingClinicalDataView : Entity
{ //{
/// <summary> // /// <summary>
/// 项目ID // /// 项目ID
/// </summary> // /// </summary>
public Guid TrialId { get; set; } // public Guid TrialId { get; set; }
/// <summary> // /// <summary>
/// 受试者ID // /// 受试者ID
/// </summary> // /// </summary>
public Guid SubjectId { get; set; } // public Guid SubjectId { get; set; }
/// <summary> // /// <summary>
/// 阅片 // /// 阅片
/// </summary> // /// </summary>
public Guid? ReadingId { get; set; } // public Guid? ReadingId { get; set; }
/// <summary> // /// <summary>
/// 项目配置临床类型ID // /// 项目配置临床类型ID
/// </summary> // /// </summary>
public Guid ClinicalDataTrialSetId { get; set; } // public Guid ClinicalDataTrialSetId { get; set; }
/// <summary> // /// <summary>
/// 项目配置临床类型Name // /// 项目配置临床类型Name
/// </summary> // /// </summary>
public string ClinicalDataSetName { get; set; } // public string ClinicalDataSetName { get; set; }
public ClinicalUploadType ClinicalUploadType { get; set; } // public ClinicalUploadType ClinicalUploadType { get; set; }
/// <summary> // /// <summary>
/// 临床数据级别 // /// 临床数据级别
/// </summary> // /// </summary>
public ClinicalLevel ClinicalDataLevel { get; set; } // public ClinicalLevel ClinicalDataLevel { get; set; }
/// <summary> // /// <summary>
/// 是否为CRC上传 // /// 是否为CRC上传
/// </summary> // /// </summary>
public bool IsCRCUpload { get; set; } // public bool IsCRCUpload { get; set; }
/// <summary> // /// <summary>
/// 是否签名 // /// 是否签名
/// </summary> // /// </summary>
public bool IsSign { get; set; } // public bool IsSign { get; set; }
} //}
} }

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

@ -194,7 +194,7 @@ namespace IRaCIS.Core.Infra.EFCore
public virtual DbSet<ReadingQuestionTrial> ReadingQuestionTrial { get; set; } public virtual DbSet<ReadingQuestionTrial> ReadingQuestionTrial { get; set; }
public virtual DbSet<ReadingClinicalDataView> ReadingClinicalDataView { get; set; } //public virtual DbSet<ReadingClinicalDataView> ReadingClinicalDataView { get; set; }
public virtual DbSet<ReadingClinicalDataPDF> ReadingClinicalDataPDF { get; set; } public virtual DbSet<ReadingClinicalDataPDF> ReadingClinicalDataPDF { get; set; }