修改统计数字
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
parent
07f1511bb9
commit
7b7723426b
|
@ -1178,7 +1178,7 @@ namespace IRaCIS.Core.Application
|
||||||
|
|
||||||
var record = new UserToBeDoneRecord()
|
var record = new UserToBeDoneRecord()
|
||||||
{
|
{
|
||||||
IsFirstSysDocNeedSign= isfirstSysDocNeedSign,
|
IsFirstSysDocNeedSign = isfirstSysDocNeedSign,
|
||||||
IsHaveSysDocNeedNeedSign = needSignSysDocCont > 0,
|
IsHaveSysDocNeedNeedSign = needSignSysDocCont > 0,
|
||||||
//TrialNeedSignList= trialNeedSignList,
|
//TrialNeedSignList= trialNeedSignList,
|
||||||
|
|
||||||
|
@ -1406,7 +1406,7 @@ namespace IRaCIS.Core.Application
|
||||||
Sponsor = _userInfo.IsEn_Us ? t.Sponsor.SponsorName : t.Sponsor.SponsorNameCN,
|
Sponsor = _userInfo.IsEn_Us ? t.Sponsor.SponsorName : t.Sponsor.SponsorNameCN,
|
||||||
TrialStatusStr = t.TrialStatusStr,
|
TrialStatusStr = t.TrialStatusStr,
|
||||||
|
|
||||||
ExpetiedTaskCount = isPM ? t.VisitTaskList.Where(t => t.IsUrgent).Count() : 0,
|
ExpetiedTaskCount = isPM ? t.VisitTaskList.Where(t => t.IsUrgent && t.IsAnalysisCreate==false && (t.TaskState == TaskState.Effect || t.TaskState == TaskState.Freeze)).Count() : 0,
|
||||||
|
|
||||||
ReReadingApprovalCount = isPM ? t.VisitTaskReReadingList.Where(t => t.OriginalReReadingTask.ReReadingApplyState == ReReadingApplyState.DocotorHaveApplyed).Count() : 0,
|
ReReadingApprovalCount = isPM ? t.VisitTaskReReadingList.Where(t => t.OriginalReReadingTask.ReReadingApplyState == ReReadingApplyState.DocotorHaveApplyed).Count() : 0,
|
||||||
|
|
||||||
|
|
|
@ -30,7 +30,7 @@ namespace IRaCIS.Core.Application.Triggers
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
//访视类型的任务 不影响肿瘤学任务的临床数据状态
|
//访视类型、全局的任务 不影响肿瘤学任务的临床数据状态
|
||||||
visitTaskLambda = visitTaskLambda.And(x => x.ArmEnum != Arm.TumorArm);
|
visitTaskLambda = visitTaskLambda.And(x => x.ArmEnum != Arm.TumorArm);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -193,7 +193,11 @@ public class VisitTask : BaseFullAuditEntity
|
||||||
|
|
||||||
[Comment("在裁判任务上记录 裁判结果的任务ID(访视或者全局)")]
|
[Comment("在裁判任务上记录 裁判结果的任务ID(访视或者全局)")]
|
||||||
public Guid? JudgeResultTaskId { get; set; }
|
public Guid? JudgeResultTaskId { get; set; }
|
||||||
[Comment("随访任务号 取访视的号 计划外是 访视+0.1 裁判任务在访视任务上+0.002 全局任务在截止访视号上+0.03 肿瘤待定")]
|
|
||||||
|
|
||||||
|
[Comment("随访任务号 取访视的号 计划外是 访视+0.1 裁判任务在访视任务上+0.02 全局任务在截止访视号上+0.03 肿瘤0.06")]
|
||||||
|
|
||||||
|
[DecimalPrecision(18,2)]
|
||||||
public decimal VisitTaskNum { get; set; }
|
public decimal VisitTaskNum { get; set; }
|
||||||
[Comment("首次阅片时间")]
|
[Comment("首次阅片时间")]
|
||||||
public DateTime? FirstReadingTime { get; set; }
|
public DateTime? FirstReadingTime { get; set; }
|
||||||
|
|
Loading…
Reference in New Issue