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

x

Uat_Study
hang 2022-07-14 09:41:23 +08:00
parent 8307e06841
commit 8b30a64bcf
2 changed files with 48 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3869,77 +3869,42 @@
仲裁规则/对象 仲裁规则/对象
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.ReadingInfoSignTime"> <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.ReadingType">
<summary> <summary>
阅片信息签名时间 阅片模式
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Contracts.ReadingCriterionPageDto.Id"> <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.IsArbitrationReading">
<summary> <summary>
pageId 仲裁阅片
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Contracts.ReadingCriterionPageDto.TrialId"> <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.IsClinicalReading">
<summary> <summary>
项目ID 肿瘤学阅片
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Contracts.ReadingCriterionPageDto.PageName"> <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.IsReadingTaskViewInOrder">
<summary> <summary>
分页名称 读片任务显示是否顺序
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Contracts.ReadingCriterionPageDto.IsEnable"> <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.ReadingTaskViewEnum">
<summary> <summary>
是否启用 任务组织级别
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Contracts.ReadingCriterionPageDto.IsPublicPage"> <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.IsImageStandard">
<summary> <summary>
是否公共分页 图像是否有标注
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Contracts.ReadingCriterionPageDto.CreateTime"> <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.IsReadingShowSubjectInfo">
<summary> <summary>
创建时间 阅片是否显示受试者信息
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Contracts.ReadingCriterionPageDto.CreateUserId"> <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.IsReadingShowPreviousResults">
<summary>
创建用户ID
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Contracts.TrialReadQuestion.ShowOrder">
<summary>
排序
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Contracts.TrialReadQuestion.PageName">
<summary>
分页名称
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Contracts.TrialReadQuestion.QuestionName">
<summary>
问题名称
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Contracts.TrialReadQuestion.Type">
<summary>
类型
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Contracts.TrialReadQuestion.ParentTriggerValue">
<summary>
父问题触发
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Contracts.TrialReadQuestion.ParentQuestionName">
<summary>
父问题名称
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Contracts.TrialReadQuestion.IsRequired">
<summary> <summary>
是否是必须 是否是必须
</summary> </summary>
@ -3999,22 +3964,7 @@
答案组合 答案组合
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Contracts.TrialJudgeQuestion.JudgeType"> <member name="P:IRaCIS.Core.Application.Contracts.SetTrialReadingInfoInDto.TrialId">
<summary>
裁判类型
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Contracts.TrialReadingCriterion.CriterionName">
<summary>
标准
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingCriterionInfoOutDto.ReadingInfoSignTime">
<summary>
阅片信息签名时间
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingCriterionInfoOutDto.DigitPlaces">
<summary> <summary>
修约小数点 修约小数点
</summary> </summary>

62
IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs
View File

@ -191,31 +191,6 @@ namespace IRaCIS.Core.Application.Service
} }
#region 重阅/退回的时候，需要将之前取消分配的访视类型的 任务重新分配
var arm1DoctorUserId = assignConfigList.FirstOrDefault(t => t.ArmEnum == Arm.DoubleReadingArm1).DoctorUserId;
var arm2DoctorUserId = assignConfigList.FirstOrDefault(t => t.ArmEnum == Arm.DoubleReadingArm2).DoctorUserId;
await _visitTaskRepository.UpdatePartialFromQueryAsync(t => t.TrialId == trialId && t.SubjectId == subjectVisit.SubjectId && t.TaskState == TaskState.Effect && t.DoctorUserId == null
&& t.VisitTaskNum > subjectVisit.VisitNum && t.ReadingCategory == ReadingCategory.Visit && t.ArmEnum == Arm.DoubleReadingArm1, u => new VisitTask()
{
TaskAllocationState=TaskAllocationState.Allocated,
DoctorUserId= arm1DoctorUserId,
AllocateTime=DateTime.Now,
});
await _visitTaskRepository.UpdatePartialFromQueryAsync(t => t.TrialId == trialId && t.SubjectId == subjectVisit.SubjectId && t.TaskState == TaskState.Effect && t.DoctorUserId == null && t.VisitTaskNum > subjectVisit.VisitNum && t.ReadingCategory == ReadingCategory.Visit && t.ArmEnum == Arm.DoubleReadingArm2, u => new VisitTask()
{
TaskAllocationState = TaskAllocationState.Allocated,
DoctorUserId = arm2DoctorUserId,
AllocateTime = DateTime.Now,
});
#endregion
} }
else else
// 当前任务没有分配医生，初次分配 // 当前任务没有分配医生，初次分配
@ -227,10 +202,37 @@ namespace IRaCIS.Core.Application.Service
} }
#endregion #endregion
if (assignConfigList.Count>0)
{
#region 重阅/退回的时候，需要将之前取消分配的访视类型的 任务重新分配
var arm1DoctorUserId = assignConfigList.FirstOrDefault(t => t.ArmEnum == Arm.DoubleReadingArm1).DoctorUserId;
var arm2DoctorUserId = assignConfigList.FirstOrDefault(t => t.ArmEnum == Arm.DoubleReadingArm2).DoctorUserId;
await _visitTaskRepository.UpdatePartialFromQueryAsync(t => t.TrialId == trialId && t.SubjectId == subjectVisit.SubjectId && t.TaskState == TaskState.Effect && t.DoctorUserId == null
&& t.VisitTaskNum > subjectVisit.VisitNum && t.ReadingCategory == ReadingCategory.Visit && t.ArmEnum == Arm.DoubleReadingArm1, u => new VisitTask()
{
TaskAllocationState = TaskAllocationState.Allocated,
DoctorUserId = arm1DoctorUserId,
AllocateTime = DateTime.Now,
});
await _visitTaskRepository.UpdatePartialFromQueryAsync(t => t.TrialId == trialId && t.SubjectId == subjectVisit.SubjectId && t.TaskState == TaskState.Effect && t.DoctorUserId == null && t.VisitTaskNum > subjectVisit.VisitNum && t.ReadingCategory == ReadingCategory.Visit && t.ArmEnum == Arm.DoubleReadingArm2, u => new VisitTask()
{
TaskAllocationState = TaskAllocationState.Allocated,
DoctorUserId = arm2DoctorUserId,
AllocateTime = DateTime.Now,
});
#endregion
}
} }
else if (trialConfig.ReadingType == ReadingMethod.Single) else if (trialConfig.ReadingType == ReadingMethod.Single)
{ {
@ -357,9 +359,9 @@ namespace IRaCIS.Core.Application.Service
TaskCode = AppSettings.GetCodeStr(currentMaxCodeInt + 1, nameof(VisitTask)), TaskCode = AppSettings.GetCodeStr(currentMaxCodeInt + 1, nameof(VisitTask)),
IsAnalysisCreate = reReadingVisitTask.IsAnalysisCreate, IsAnalysisCreate = reReadingVisitTask.IsAnalysisCreate,
IsSelfAnalysis =reReadingVisitTask.IsSelfAnalysis, IsSelfAnalysis = reReadingVisitTask.IsSelfAnalysis,
BlindSubjectCode=reReadingVisitTask.BlindSubjectCode, BlindSubjectCode = reReadingVisitTask.BlindSubjectCode,
BlindTrialSiteCode=reReadingVisitTask.BlindTrialSiteCode BlindTrialSiteCode = reReadingVisitTask.BlindTrialSiteCode
// TaskAllocationState = reReadingVisitTask.TaskAllocationState, // TaskAllocationState = reReadingVisitTask.TaskAllocationState,
// AllocateTime = DateTime.Now, // AllocateTime = DateTime.Now,