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

列表返回标准配置

Uat_Study
hang 2022-10-12 12:02:14 +08:00
parent e0c495cadb
commit bbd7a1381d
2 changed files with 56 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -233,6 +233,7 @@
获取Subject 分配医生情况 获取Subject 分配医生情况
</summary> </summary>
<param name="subjectId"></param> <param name="subjectId"></param>
<param name="trialReadingCriterionId"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:IRaCIS.Core.Application.Service.Allocation.VisitTaskService.CancelSubjectAssignedDoctor(IRaCIS.Core.Application.ViewModel.CancelSubjectDoctorCommand)"> <member name="M:IRaCIS.Core.Application.Service.Allocation.VisitTaskService.CancelSubjectAssignedDoctor(IRaCIS.Core.Application.ViewModel.CancelSubjectDoctorCommand)">
@ -4821,6 +4822,21 @@
器官类型 器官类型
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.ViewModel.OrganInfoView.PartEN">
<summary>
部位 英文
</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.OrganInfoView.TULOCEN">
<summary>
TULOC 英文
</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.OrganInfoView.TULATEN">
<summary>
位置 英文
</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.GetTrialOrganListInDto.LesionType"> <member name="P:IRaCIS.Core.Application.ViewModel.GetTrialOrganListInDto.LesionType">
<summary> <summary>
病灶类型 病灶类型
@ -4846,6 +4862,21 @@
是否是淋巴结 是否是淋巴结
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.ViewModel.GetTrialOrganListOutDto.PartEN">
<summary>
部位 英文
</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.GetTrialOrganListOutDto.TULOCEN">
<summary>
TULOC 英文
</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.GetTrialOrganListOutDto.TULATEN">
<summary>
位置 英文
</summary>
</member>
<member name="T:IRaCIS.Core.Application.ViewModel.OrganInfoQuery"> <member name="T:IRaCIS.Core.Application.ViewModel.OrganInfoQuery">
<summary>OrganInfoQuery 列表查询参数模型</summary> <summary>OrganInfoQuery 列表查询参数模型</summary>
</member> </member>
@ -4887,6 +4918,21 @@
标准 病灶类型 标准 病灶类型
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.ViewModel.OrganInfoAddOrEdit.PartEN">
<summary>
部位 英文
</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.OrganInfoAddOrEdit.TULOCEN">
<summary>
TULOC 英文
</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.OrganInfoAddOrEdit.TULATEN">
<summary>
位置 英文
</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.ReadingMedicineSystemQuestionView.Type"> <member name="P:IRaCIS.Core.Application.ViewModel.ReadingMedicineSystemQuestionView.Type">
<summary> <summary>
类型 类型

16
IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
View File

@ -80,7 +80,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public async Task<PageOutput<SubjectAssignStat>/*, object?)*/> GetSubjectAssignAndTaskStatList(SubjectAssignStatQuery querySubjectAssign) public async Task<(PageOutput<SubjectAssignStat>, object?)> GetSubjectAssignAndTaskStatList(SubjectAssignStatQuery querySubjectAssign)
{ {
var subjectQuery = _subjectRepository.Where(t => t.TrialId == querySubjectAssign.TrialId && t.SubjectVisitTaskList.Any()) var subjectQuery = _subjectRepository.Where(t => t.TrialId == querySubjectAssign.TrialId && t.SubjectVisitTaskList.Any())
.WhereIf(querySubjectAssign.SiteId != null, t => t.SiteId == querySubjectAssign.SiteId) .WhereIf(querySubjectAssign.SiteId != null, t => t.SiteId == querySubjectAssign.SiteId)
@ -92,9 +92,11 @@ namespace IRaCIS.Core.Application.Service.Allocation
var pageList = await subjectQuery.ToPagedListAsync(querySubjectAssign.PageIndex, querySubjectAssign.PageSize, string.IsNullOrWhiteSpace(querySubjectAssign.SortField) ? nameof(querySubjectAssign.SubjectId) : querySubjectAssign.SortField, querySubjectAssign.Asc); var pageList = await subjectQuery.ToPagedListAsync(querySubjectAssign.PageIndex, querySubjectAssign.PageSize, string.IsNullOrWhiteSpace(querySubjectAssign.SortField) ? nameof(querySubjectAssign.SubjectId) : querySubjectAssign.SortField, querySubjectAssign.Asc);
//var trialTaskConfig = _trialReadingCriterionRepository.Where(t => t.Id == querySubjectAssign.TrialId && t.Id==querySubjectAssign.TrialReadingCriterionId).ProjectTo<TrialTaskConfigView>(_mapper.ConfigurationProvider).FirstOrDefault();
return pageList;
var criterionConfig = (await _trialReadingCriterionRepository.Where(x => x.Id == querySubjectAssign.TrialReadingCriterionId).Select(x => new { x.ReadingTool, x.IsReadingTaskViewInOrder, x.ReadingType }).FirstOrDefaultAsync()).IfNullThrowException();
return (pageList, criterionConfig);
} }
/// <summary> /// <summary>
@ -186,13 +188,15 @@ namespace IRaCIS.Core.Application.Service.Allocation
/// 获取Subject 分配医生情况 /// 获取Subject 分配医生情况
/// </summary> /// </summary>
/// <param name="subjectId"></param> /// <param name="subjectId"></param>
/// <param name="trialReadingCriterionId"></param>
/// <returns></returns> /// <returns></returns>
public async Task<List<SubjectUserDTO>> GetSubjectAssignedDoctorList(Guid subjectId, Guid trialReadingCriterionId) public async Task<(List<SubjectUserDTO>,object)> GetSubjectAssignedDoctorList(Guid subjectId, Guid trialReadingCriterionId)
{ {
var list = await _subjectUserRepository.Where(t => t.SubjectId == subjectId && t.OrignalSubjectUserId == null && t.IsConfirmed && t.TrialReadingCriterionId==trialReadingCriterionId).ProjectTo<SubjectUserDTO>(_mapper.ConfigurationProvider).ToListAsync(); var list = await _subjectUserRepository.Where(t => t.SubjectId == subjectId && t.OrignalSubjectUserId == null && t.IsConfirmed && t.TrialReadingCriterionId==trialReadingCriterionId).ProjectTo<SubjectUserDTO>(_mapper.ConfigurationProvider).ToListAsync();
return list; var criterionConfig = (await _trialReadingCriterionRepository.Where(x => x.Id == trialReadingCriterionId).Select(x => new { x.ReadingTool, x.IsReadingTaskViewInOrder, x.ReadingType }).FirstOrDefaultAsync()).IfNullThrowException();
return (list, criterionConfig);
} }