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

Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8

IRC_NewDev
he 2024-05-10 13:19:25 +08:00
parent 01e047f639 4050d7e4a3
commit 51cfadbc77
3 changed files with 28 additions and 2 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

@ -14527,6 +14527,11 @@
标准类型 标准类型
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Application.Contracts.UserBasicInfo.LastChangePassWordTime">
<summary>
上一次修改密码的时间
</summary>
</member>
<member name="T:IRaCIS.Application.Contracts.UserAddedReturnDTO"> <member name="T:IRaCIS.Application.Contracts.UserAddedReturnDTO">
<summary> <summary>
添加用户是的返回模型 添加用户是的返回模型

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

@ -485,7 +485,17 @@ namespace IRaCIS.Application.Services
{ {
Expression<Func<VisitTask, bool>> visitTaskLambda = x => x.TrialId == trialId && x.SubjectId == subjectId && x.TrialReadingCriterionId == trialReadingCritrialId && x.ArmEnum != Arm.TumorArm; Expression<Func<VisitTask, bool>> visitTaskLambda = x => x.TrialId == trialId && x.SubjectId == subjectId && x.TrialReadingCriterionId == trialReadingCritrialId;
if (isVisit)
{
//访视类型的任务 不影响肿瘤学任务的临床数据状态
visitTaskLambda = visitTaskLambda.And(x => x.ArmEnum != Arm.TumorArm);
}
else
{
visitTaskLambda = visitTaskLambda.And(x => x.ArmEnum == Arm.TumorArm);
}
//维护 IsFrontTaskNeedSignButNotSign 在添加任务哪里用触发器也维护了 //维护 IsFrontTaskNeedSignButNotSign 在添加任务哪里用触发器也维护了

13
IRaCIS.Core.Application/Triggers/VisitTaskIsFrontTaskNeedSignButNotSignTrigger.cs
View File

@ -48,9 +48,20 @@ namespace IRaCIS.Core.Application.Triggers
var visitTask = context.Entity; var visitTask = context.Entity;
Expression<Func<VisitTask, bool>> visitTaskLambda = x => x.TrialId == visitTask.TrialId && x.SubjectId == visitTask.SubjectId && x.TrialReadingCriterionId == visitTask.TrialReadingCriterionId&&x.ArmEnum!=Arm.TumorArm;
if (context.ChangeType == ChangeType.Added) if (context.ChangeType == ChangeType.Added)
{ {
Expression<Func<VisitTask, bool>> visitTaskLambda = x => x.TrialId == visitTask.TrialId && x.SubjectId == visitTask.SubjectId && x.TrialReadingCriterionId == visitTask.TrialReadingCriterionId ;
if (visitTask.ArmEnum == Arm.TumorArm)
{
visitTaskLambda = visitTaskLambda.And(x => x.ArmEnum == Arm.TumorArm);
}
else
{
//访视类型的任务 不影响肿瘤学任务的临床数据状态
visitTaskLambda = visitTaskLambda.And(x => x.ArmEnum != Arm.TumorArm);
}
//判断是否需要临床数据签名 不需要 就不用维护 //判断是否需要临床数据签名 不需要 就不用维护
if (visitTask.IsNeedClinicalDataSign) if (visitTask.IsNeedClinicalDataSign)