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

修改阅片标准提交

Uat_Study
hang 2022-10-09 17:19:45 +08:00
parent b9e0c3369d
commit 369d3238d2
5 changed files with 34 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -220,7 +220,7 @@
<param name="command"></param> <param name="command"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:IRaCIS.Core.Application.Service.Allocation.VisitTaskService.GetDoctorSubjectStat(System.Guid)"> <member name="M:IRaCIS.Core.Application.Service.Allocation.VisitTaskService.GetDoctorSubjectStat(System.Guid,System.Guid)">
<summary> <summary>
阅片人维度 Subject统计表 阅片人维度 Subject统计表
</summary> </summary>
@ -275,13 +275,6 @@
<param name="assignConfirmCommand"></param> <param name="assignConfirmCommand"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:IRaCIS.Core.Application.Service.Allocation.VisitTaskService.AutoSubjectAssignDoctor(IRaCIS.Core.Application.ViewModel.AutoSubjectAssignCommand)">
<summary>
自动一次性分配所有未分配的 Subject 给医生
</summary>
<param name="autoSubjectAssignCommand"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Service.Allocation.VisitTaskService.GetVisitTaskList(IRaCIS.Core.Application.ViewModel.VisitTaskQuery,IRaCIS.Core.Application.Service.IVisitTaskHelpeService)"> <member name="M:IRaCIS.Core.Application.Service.Allocation.VisitTaskService.GetVisitTaskList(IRaCIS.Core.Application.ViewModel.VisitTaskQuery,IRaCIS.Core.Application.Service.IVisitTaskHelpeService)">
<summary> <summary>
访视任务 访视任务
@ -4026,6 +4019,13 @@
<param name="visitTaskId"></param> <param name="visitTaskId"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:IRaCIS.Core.Application.Service.ReadingCalculateService.GetReportIsExistDisease(System.Guid)">
<summary>
获取报告是否存在疾病
</summary>
<param name="visitTaskId"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Service.ReadingCalculateService.VerifyVisitTaskQuestions(IRaCIS.Core.Application.Service.Reading.Dto.VerifyVisitTaskQuestionsInDto)"> <member name="M:IRaCIS.Core.Application.Service.ReadingCalculateService.VerifyVisitTaskQuestions(IRaCIS.Core.Application.Service.Reading.Dto.VerifyVisitTaskQuestionsInDto)">
<summary> <summary>
验证访视提交 验证访视提交
@ -4173,6 +4173,13 @@
<param name="inDto"></param> <param name="inDto"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:IRaCIS.Core.Application.Service.ReadingCalculateService.GetLowSODVisit(IRaCIS.Core.Application.Service.Reading.Dto.ReadingCalculateDto)">
<summary>
获取最低方式
</summary>
<param name="inDto"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Service.ReadingCalculateService.GetVisitTaskAnswerList(IRaCIS.Core.Application.Service.Reading.Dto.ReadingCalculateDto)"> <member name="M:IRaCIS.Core.Application.Service.ReadingCalculateService.GetVisitTaskAnswerList(IRaCIS.Core.Application.Service.Reading.Dto.ReadingCalculateDto)">
<summary> <summary>
获取访视任务信息 获取访视任务信息
@ -6048,42 +6055,42 @@
修约小数点 修约小数点
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Contracts.SetTrialReadingInfoInDto.TrialId"> <member name="P:IRaCIS.Core.Application.Contracts.SetCriterionReadingInfoInDto.TrialCriterionId">
<summary> <summary>
项目ID 项目标准ID
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Contracts.SetTrialReadingInfoInDto.ReadingTool"> <member name="P:IRaCIS.Core.Application.Contracts.SetCriterionReadingInfoInDto.ReadingTool">
<summary> <summary>
阅片工具 阅片工具
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Contracts.SetTrialReadingInfoInDto.ImagePlatform"> <member name="P:IRaCIS.Core.Application.Contracts.SetCriterionReadingInfoInDto.ImagePlatform">
<summary> <summary>
阅片平台 阅片平台
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Contracts.SetTrialReadingInfoInDto.ReadingTaskViewEnum"> <member name="P:IRaCIS.Core.Application.Contracts.SetCriterionReadingInfoInDto.ReadingTaskViewEnum">
<summary> <summary>
任务组织级别 任务组织级别
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Contracts.SetTrialReadingInfoInDto.IsImageIabeled"> <member name="P:IRaCIS.Core.Application.Contracts.SetCriterionReadingInfoInDto.IsImageIabeled">
<summary> <summary>
影像是否有标注 影像是否有标注
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Contracts.SetTrialReadingInfoInDto.IsReadingShowSubjectInfo"> <member name="P:IRaCIS.Core.Application.Contracts.SetCriterionReadingInfoInDto.IsReadingShowSubjectInfo">
<summary> <summary>
IR阅片是否显示受试者信息 IR阅片是否显示受试者信息
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Contracts.SetTrialReadingInfoInDto.IsReadingShowPreviousResults"> <member name="P:IRaCIS.Core.Application.Contracts.SetCriterionReadingInfoInDto.IsReadingShowPreviousResults">
<summary> <summary>
IR阅片是否显示既往结果 IR阅片是否显示既往结果
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Contracts.SetTrialReadingInfoInDto.ArbitrationRule"> <member name="P:IRaCIS.Core.Application.Contracts.SetCriterionReadingInfoInDto.ArbitrationRule">
<summary> <summary>
仲裁规则/对象 仲裁规则/对象
</summary> </summary>
@ -6732,7 +6739,7 @@
</summary> </summary>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:IRaCIS.Core.Application.TrialConfigService.SetTrialReadingInfo(IRaCIS.Core.Application.Contracts.SetTrialReadingInfoInDto)"> <member name="M:IRaCIS.Core.Application.TrialConfigService.SetCriterionReadingInfo(IRaCIS.Core.Application.Contracts.SetCriterionReadingInfoInDto)">
<summary> <summary>
设置项目阅片信息 设置项目阅片信息
</summary> </summary>

2
IRaCIS.Core.Application/Service/Allocation/DTO/TaskAllocationRuleViewModel.cs
View File

@ -173,7 +173,7 @@ namespace IRaCIS.Core.Application.ViewModel
{ {
public Guid TrialId { get; set; } public Guid TrialId { get; set; }
public ReadingMethod ReadingType { get; set; } //public ReadingMethod ReadingType { get; set; }
public Guid? DoctorUserId { get; set; } public Guid? DoctorUserId { get; set; }

4
IRaCIS.Core.Application/Service/Allocation/TaskAllocationRuleService.cs
View File

@ -163,7 +163,7 @@ namespace IRaCIS.Core.Application.Service
select new TrialDoctorUserSelectView() select new TrialDoctorUserSelectView()
{ {
TrialId = enroll.TrialId, TrialId = enroll.TrialId,
ReadingType = enroll.Trial.ReadingType, //ReadingType = enroll.Trial.ReadingType,
DoctorUserId = user.Id, DoctorUserId = user.Id,
FullName = user.FullName, FullName = user.FullName,
UserCode = user.UserCode, UserCode = user.UserCode,
@ -186,7 +186,7 @@ namespace IRaCIS.Core.Application.Service
select new TrialDoctorUserSelectView() select new TrialDoctorUserSelectView()
{ {
TrialId = allocationRule.TrialId, TrialId = allocationRule.TrialId,
ReadingType = allocationRule.Trial.ReadingType, //ReadingType = allocationRule.Trial.ReadingType,
DoctorUserId = user.Id, DoctorUserId = user.Id,
FullName = user.FullName, FullName = user.FullName,
UserCode = user.UserCode, UserCode = user.UserCode,

2
IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs
View File

@ -500,7 +500,7 @@ namespace IRaCIS.Core.Application.Service
var trialId = filterObj.TrialId; var trialId = filterObj.TrialId;
var trialReadingCriterionId = filterObj.TrialReadingCriterionId; var trialReadingCriterionId = filterObj.TrialReadingCriterionId;
var trialConfig = (await _repository.Where<Trial>(t => t.Id == trialId).Select(t => new { TrialId = t.Id, t.ReadingType, t.IsReadingTaskViewInOrder }).FirstOrDefaultAsync()).IfNullThrowException(); //var trialConfig = (await _repository.Where<Trial>(t => t.Id == trialId).Select(t => new { TrialId = t.Id, t.ReadingType, t.IsReadingTaskViewInOrder }).FirstOrDefaultAsync()).IfNullThrowException();

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

@ -162,12 +162,15 @@ namespace IRaCIS.Core.Application.Service.Allocation
/// 阅片人维度 Subject统计表 /// 阅片人维度 Subject统计表
/// </summary> /// </summary>
/// <param name="trialId"></param> /// <param name="trialId"></param>
/// <param name="trialReadingCriterionId"></param>
/// <returns></returns> /// <returns></returns>
public async Task<List<AssignDoctorStatView>> GetDoctorSubjectStat(Guid trialId) public async Task<(List<AssignDoctorStatView>,object)> GetDoctorSubjectStat(Guid trialId, Guid trialReadingCriterionId )
{ {
var list = await _taskAllocationRuleRepository.Where(t => t.TrialId == trialId).ProjectTo<AssignDoctorStatView>(_mapper.ConfigurationProvider).ToListAsync(); var list = await _taskAllocationRuleRepository.Where(t => t.TrialId == trialId).ProjectTo<AssignDoctorStatView>(_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);
} }