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

修改

Uat_Study
he 2022-12-21 10:50:05 +08:00 committed by {872297557@qq.com}
parent 0611bcb8d3
commit 5944db5e89
4 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2050,6 +2050,11 @@
是否完整 是否完整
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadingClinicalDataListOutDto.ReadingId">
<summary>
访视Id 或者模块Id
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadingClinicalDataListOutDto.ClinicalDataSetName"> <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadingClinicalDataListOutDto.ClinicalDataSetName">
<summary> <summary>
项目配置临床类型Name 项目配置临床类型Name

10
IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
View File

@ -447,6 +447,7 @@ namespace IRaCIS.Application.Services
{ {
ClinicalDataLevel = x.ClinicalDataTrialSet.ClinicalDataLevel, ClinicalDataLevel = x.ClinicalDataTrialSet.ClinicalDataLevel,
SubjectId = x.SubjectId, SubjectId = x.SubjectId,
ReadingId= x.ReadingId,
ClinicalDataSetName = x.ClinicalDataTrialSet.ClinicalDataSetName, ClinicalDataSetName = x.ClinicalDataTrialSet.ClinicalDataSetName,
ClinicalDataTrialSetId = x.ClinicalDataTrialSetId, ClinicalDataTrialSetId = x.ClinicalDataTrialSetId,
IsSign = x.IsSign, IsSign = x.IsSign,
@ -477,9 +478,12 @@ namespace IRaCIS.Application.Services
result = result.Where(x => !(x.ClinicalUploadType == ClinicalUploadType.PDF && x.FileList.Count() == 0)).ToList(); result = result.Where(x => !(x.ClinicalUploadType == ClinicalUploadType.PDF && x.FileList.Count() == 0)).ToList();
// 需要排除表格为空的数据 // 需要排除表格为空的数据
var tablecount = (await _previousHistoryRepository.Where(x => x.SubjectVisitId == inDto.ReadingId).CountAsync()) +
(await _previousOtherRepository.Where(x => x.SubjectVisitId == inDto.ReadingId).CountAsync()) + var readingIds = result.Select(x => x.ReadingId).ToList();
(await _previousSurgeryRepository.Where(x => x.SubjectVisitId == inDto.ReadingId).CountAsync());
var tablecount = (await _previousHistoryRepository.Where(x => readingIds.Contains(x.SubjectVisitId)).CountAsync()) +
(await _previousOtherRepository.Where(x => readingIds.Contains(x.SubjectVisitId)).CountAsync()) +
(await _previousSurgeryRepository.Where(x => readingIds.Contains(x.SubjectVisitId)).CountAsync());
if (tablecount == 0) if (tablecount == 0)
{ {

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

@ -298,6 +298,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public Guid Id { get; set; } public Guid Id { get; set; }
/// <summary>
/// 访视Id 或者模块Id
/// </summary>
public Guid ReadingId { get; set; }
/// <summary> /// <summary>
/// 项目配置临床类型Name /// 项目配置临床类型Name
/// </summary> /// </summary>

2
IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicineQuestionService.cs
View File

@ -137,7 +137,7 @@ namespace IRaCIS.Core.Application.Service
#endregion #endregion
#region 项目 #region 项目
/// 获取项目的医学审核问题 /// 获取项目的医学审核问题
/// </summary> /// </summary>