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

修改一版

Uat_Study
he 2022-06-30 14:50:54 +08:00
parent 2c76edd5e9
commit c462260990
4 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2189,11 +2189,11 @@
<param name="inDto"></param> <param name="inDto"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:IRaCIS.Core.Application.Service.ReadingMedicineQuestionService.DeleteReadingMedicineTrialQuestion(System.Guid)"> <member name="M:IRaCIS.Core.Application.Service.ReadingMedicineQuestionService.DeleteReadingMedicineTrialQuestion(IRaCIS.Core.Application.ViewModel.DeleteReadingMedicineTrialQuestion)">
<summary> <summary>
删除项目的医学审核问题 删除项目的医学审核问题
</summary> </summary>
<param name="id"></param> <param name="inDto"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:IRaCIS.Core.Application.Service.ReadingMedicineQuestionService.ConfirmReadingMedicineQuestion(IRaCIS.Core.Application.ViewModel.ConfirmReadingMedicineQuestionInDto)"> <member name="M:IRaCIS.Core.Application.Service.ReadingMedicineQuestionService.ConfirmReadingMedicineQuestion(IRaCIS.Core.Application.ViewModel.ConfirmReadingMedicineQuestionInDto)">

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

@ -157,7 +157,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// <summary> /// <summary>
/// 获取访视列表 /// 获取访视列表
/// </summary> /// </summary>
public class GetReadingClinicalDataListIndto :PageInput public class GetReadingClinicalDataListIndto
{ {
[Required(ErrorMessage = "SubjectId为null")] [Required(ErrorMessage = "SubjectId为null")]
public Guid SubjectId { get; set; } public Guid SubjectId { get; set; }

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

@ -138,10 +138,8 @@ namespace IRaCIS.Application.Services
Path=x.ClinicalDataTrialSet.Path, Path=x.ClinicalDataTrialSet.Path,
}).ToListAsync() ; }).ToListAsync() ;
PageOutput<GetReadingClinicalDataListOutDto> clinicalData = (await this.GetReadingClinicalDataList(new GetReadingClinicalDataListIndto() List<GetReadingClinicalDataListOutDto> clinicalData = (await this.GetReadingClinicalDataList(new GetReadingClinicalDataListIndto()
{ {
PageIndex = 1,
PageSize = 9999,
SubjectId = inDto.SubjectId, SubjectId = inDto.SubjectId,
ReadingId = inDto.SubjectVisitId, ReadingId = inDto.SubjectVisitId,
TrialId=inDto.TrialId, TrialId=inDto.TrialId,
@ -153,7 +151,7 @@ namespace IRaCIS.Application.Services
foreach (var item in cRCClinicalDataList) foreach (var item in cRCClinicalDataList)
{ {
item.PDFFileList = clinicalData.CurrentPageData.Where(y => y.ClinicalDataTrialSetId == item.ClinicalDataTrialSetId).SelectMany(x=>x.FileList).ToList(); item.PDFFileList = clinicalData.Where(y => y.ClinicalDataTrialSetId == item.ClinicalDataTrialSetId).SelectMany(x=>x.FileList).ToList();
item.ClinicalTableData = new ClinicalDataTable() item.ClinicalTableData = new ClinicalDataTable()
{ {
PreviousHistoryList = previousHistoryList.Where(x => x.ClinicalDataTrialSetId == item.ClinicalDataTrialSetId).ToList(), PreviousHistoryList = previousHistoryList.Where(x => x.ClinicalDataTrialSetId == item.ClinicalDataTrialSetId).ToList(),
@ -285,7 +283,7 @@ namespace IRaCIS.Application.Services
/// <param name="inDto"></param> /// <param name="inDto"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public async Task<(PageOutput<GetReadingClinicalDataListOutDto>,object)> GetReadingClinicalDataList(GetReadingClinicalDataListIndto inDto) public async Task<(List<GetReadingClinicalDataListOutDto>,object)> GetReadingClinicalDataList(GetReadingClinicalDataListIndto inDto)
{ {
GetTrialClinicalDataSelectIndto getTrialClinicalDataSelectIndto = new GetTrialClinicalDataSelectIndto() GetTrialClinicalDataSelectIndto getTrialClinicalDataSelectIndto = new GetTrialClinicalDataSelectIndto()
{ {
@ -306,8 +304,6 @@ namespace IRaCIS.Application.Services
var resultQuery = _readingClinicalDataRepository.Where(x => x.SubjectId == inDto.SubjectId) var resultQuery = _readingClinicalDataRepository.Where(x => x.SubjectId == inDto.SubjectId)
.Where(x => x.ReadingId == inDto.ReadingId) .Where(x => x.ReadingId == inDto.ReadingId)
.WhereIf(inDto.UploadRole == UploadRole.CRC, x => x.ClinicalDataTrialSet.UploadRole == UploadRole.CRC) .WhereIf(inDto.UploadRole == UploadRole.CRC, x => x.ClinicalDataTrialSet.UploadRole == UploadRole.CRC)
.Where(x => x.ClinicalDataTrialSet.UploadRole != UploadRole.CRC&&x.ClinicalDataTrialSet.ClinicalUploadType!=ClinicalUploadType.PDF&&x.ReadingClinicalDataPDFList.Count()!=0)
//.WhereIf(inDto.UploadRole == UploadRole.PM && !isBaseLine, x => x.ClinicalDataTrialSet.UploadRole == UploadRole.PM)
.Select(x => new GetReadingClinicalDataListOutDto() .Select(x => new GetReadingClinicalDataListOutDto()
{ {
ClinicalDataLevel = x.ClinicalDataTrialSet.ClinicalDataLevel, ClinicalDataLevel = x.ClinicalDataTrialSet.ClinicalDataLevel,
@ -328,12 +324,13 @@ namespace IRaCIS.Application.Services
}).ToList() }).ToList()
}); });
var result=await resultQuery.ToPagedListAsync(inDto.PageIndex, inDto.PageSize, inDto.SortField == null ? nameof(GetReadingClinicalDataListOutDto.ClinicalDataSetName) : inDto.SortField, var result = await resultQuery.ToListAsync();
inDto.Asc); result = result.Where(x => !(x.UploadRole == UploadRole.CRC && x.ClinicalUploadType == ClinicalUploadType.PDF && x.FileList.Count() == 0)).ToList();
var previousHistoryList = await _previousHistoryRepository.Where(x => x.SubjectVisitId == inDto.ReadingId).ProjectTo<PreviousHistoryView>(_mapper.ConfigurationProvider).ToListAsync(); var previousHistoryList = await _previousHistoryRepository.Where(x => x.SubjectVisitId == inDto.ReadingId).ProjectTo<PreviousHistoryView>(_mapper.ConfigurationProvider).ToListAsync();
var previousOtherList = await _previousOtherRepository.Where(x => x.SubjectVisitId == inDto.ReadingId).ProjectTo<PreviousOtherView>(_mapper.ConfigurationProvider).ToListAsync(); var previousOtherList = await _previousOtherRepository.Where(x => x.SubjectVisitId == inDto.ReadingId).ProjectTo<PreviousOtherView>(_mapper.ConfigurationProvider).ToListAsync();
var previousSurgeryList = await _previousSurgeryRepository.Where(x => x.SubjectVisitId == inDto.ReadingId).ProjectTo<PreviousSurgeryView>(_mapper.ConfigurationProvider).ToListAsync(); var previousSurgeryList = await _previousSurgeryRepository.Where(x => x.SubjectVisitId == inDto.ReadingId).ProjectTo<PreviousSurgeryView>(_mapper.ConfigurationProvider).ToListAsync();
foreach (var item in result.CurrentPageData) foreach (var item in result)
{ {
item.ClinicalTableData = new ClinicalDataTable() item.ClinicalTableData = new ClinicalDataTable()
{ {

14
IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
View File

@ -120,17 +120,17 @@ namespace IRaCIS.Core.Domain.Share
/// </summary> /// </summary>
public enum ClinicalUploadType public enum ClinicalUploadType
{ {
/// <summary>
/// PDF
/// </summary>
[Display(Name = "PDF")]
PDF = 0,
/// <summary> /// <summary>
/// 表格 /// 表格
/// </summary> /// </summary>
[Display(Name = "表格")] [Display(Name = "表格")]
Table = 1, Table = 0,
/// <summary>
/// PDF
/// </summary>
[Display(Name = "PDF")]
PDF = 1,
} }