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

修改稽查

Uat_Study
{872297557@qq.com} 2022-12-29 16:53:06 +08:00
parent ab4630ab24
commit 8cf077d9f1
6 changed files with 80 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
IRaCIS.Core.API/IRaCIS.Core.API.csproj
View File

@ -21,10 +21,7 @@
</PropertyGroup>
<ItemGroup>
<Compile Remove="UploadFile\**" />
<Compile Remove="wwwroot\**" />
<Content Remove="UploadFile\**" />
<EmbeddedResource Remove="UploadFile\**" />
<EmbeddedResource Remove="wwwroot\**" />

2
IRaCIS.Core.API/wwwroot/EmailTemplate/TrialDoctorExistJoin.html
View File

@ -11,7 +11,7 @@
尊敬的 {0} ,您好：
</div>
<div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
展影医疗作为 [{1} (实验方案号：{2 })] 项目的IRC供应商，诚邀您参加该项目IRC阅片相关工作，欢迎您提供指导和建议，非常感谢！
展影医疗作为 [{1} (试验方案号：{2 })] 项目的IRC供应商，诚邀您参加该项目IRC阅片相关工作，欢迎您提供指导和建议，非常感谢！
</div>
<div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
该项目采用电子化工作流，系统及您的账号信息如下：

2
IRaCIS.Core.API/wwwroot/EmailTemplate/TrialDoctorFirstJoin.html
View File

@ -11,7 +11,7 @@
尊敬的 {0} ,您好：
</div>
<div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
展影医疗作为 [{1} (实验方案号：{2 })] 项目的IRC供应商，诚邀您参加该项目IRC阅片相关工作，欢迎您提供指导和建议，非常感谢！
展影医疗作为 [{1} (试验方案号：{2 })] 项目的IRC供应商，诚邀您参加该项目IRC阅片相关工作，欢迎您提供指导和建议，非常感谢！
</div>
<div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
该项目采用电子化工作流，系统及您的账号信息如下：

2
IRaCIS.Core.API/wwwroot/EmailTemplate/TrialUserExistJoin.html
View File

@ -11,7 +11,7 @@
尊敬的 {0} ,您好：
</div>
<div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
展影医疗作为 [{1} (实验方案号：{2 })] 项目的IRC供应商，诚邀您参加该项目IRC相关工作，欢迎您提供指导和建议，非常感谢！
展影医疗作为 [{1} (试验方案号：{2 })] 项目的IRC供应商，诚邀您参加该项目IRC相关工作，欢迎您提供指导和建议，非常感谢！
</div>
<div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
该项目采用电子化工作流，系统及您的账号信息如下：

2
IRaCIS.Core.API/wwwroot/EmailTemplate/TrialUserFirstJoin.html
View File

@ -11,7 +11,7 @@
尊敬的 {0} ,您好：
</div>
<div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
展影医疗作为 [{1} (实验方案号：{2 })] 项目的IRC供应商，诚邀您参加该项目IRC相关工作，欢迎您提供指导和建议，非常感谢！
展影医疗作为 [{1} (试验方案号：{2 })] 项目的IRC供应商，诚邀您参加该项目IRC相关工作，欢迎您提供指导和建议，非常感谢！
</div>
<div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
该项目采用电子化工作流，系统及您的账号信息如下：

90
IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
View File

@ -183,19 +183,29 @@ namespace IRaCIS.Core.Infra.EFCore.Common
var isDistinctionInterface = false;
//设置项目配置 肿瘤学配置 和阅片标准配置
if (_userInfo.RequestUrl == "TrialConfig/setOncologySet" || _userInfo.RequestUrl == "TrialConfig/setTrialReadingCriterion")
if (_userInfo.RequestUrl == "TrialConfig/setOncologySet" || _userInfo.RequestUrl == "TrialConfig/setTrialReadingCriterion"|| _userInfo.RequestUrl== "configTrialBasicInfo/ConfigTrialProcessInfoConfirm")
{
isDistinctionInterface = true;
}
//同步的数据 后面加"/Auto" 因为同步的地方可能会改 所以取反
var extraIdentification = string.Empty;
if (_userInfo.RequestUrl!= "ReadingQuestion/addOrUpdateReadingQuestionCriterionTrial" && type==AuditOpt.Add)
{
extraIdentification = "/Auto";
}
await InsertInspection<ReadingQuestionCriterionTrial>(entity, type, x => new InspectionConvertDTO()
{
IsDistinctionInterface = isDistinctionInterface,
TrialReadingCriterionId = entity.Id,
ObjectRelationParentId = x.TrialId
ObjectRelationParentId = x.TrialId,
ExtraIndentification=extraIdentification
});
}
@ -207,6 +217,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
var entity = item.Entity as ReadingQuestionSystem;
int? parentQuestionShowOrder = null;
int? relavantQuestionShowOrder = null;
@ -244,6 +255,15 @@ namespace IRaCIS.Core.Infra.EFCore.Common
}
//同步的数据 后面加"/Auto" 因为同步的地方可能会改 所以取反
var extraIdentification = string.Empty;
if (_userInfo.RequestUrl != "ReadingQuestion/addOrUpdateReadingQuestionTrial" && type == AuditOpt.Add)
{
extraIdentification = "/Auto";
}
int? parentQuestionShowOrder = null;
int? relavantQuestionShowOrder = null;
@ -265,7 +285,9 @@ namespace IRaCIS.Core.Infra.EFCore.Common
TrialReadingCriterionId = entity.ReadingQuestionCriterionTrialId,
ObjectRelationParentId = x.TrialId
ObjectRelationParentId = x.TrialId,
ExtraIndentification=extraIdentification
}, new { ParentQuestionShowOrder = parentQuestionShowOrder, RelavantQuestionShowOrder = relavantQuestionShowOrder });
}
@ -312,6 +334,14 @@ namespace IRaCIS.Core.Infra.EFCore.Common
var entity = item.Entity as ReadingTableQuestionTrial;
//同步的数据 后面加"/Auto" 因为同步的地方可能会改 所以取反
var extraIdentification = string.Empty;
if (_userInfo.RequestUrl != "/ReadingQuestion/addOrUpdateReadingTableQuestionTrial" && type == AuditOpt.Add)
{
extraIdentification = "/Auto";
}
int? dependQuestionShowOrder = null;
int? parentQuestionShowOrder = null;
int? relavantQuestionShowOrder = null;
@ -337,7 +367,9 @@ namespace IRaCIS.Core.Infra.EFCore.Common
TrialReadingCriterionId = entity.TrialCriterionId,
ObjectRelationParentId = x.TrialId
ObjectRelationParentId = x.TrialId,
ExtraIndentification=extraIdentification
}, new { ParentQuestionShowOrder = parentQuestionShowOrder, RelavantQuestionShowOrder = relavantQuestionShowOrder, DependQuestionShowOrder = dependQuestionShowOrder });
}
@ -368,13 +400,21 @@ namespace IRaCIS.Core.Infra.EFCore.Common
var entity = item.Entity as OrganTrialInfo;
var extraIdentification = string.Empty;
if (_userInfo.RequestUrl != "OrganInfo/batchAddTrialOrgan" && type == AuditOpt.Add)
{
extraIdentification = "/Auto";
}
await InsertInspection<OrganTrialInfo>(entity, type, x => new InspectionConvertDTO()
{
IsDistinctionInterface = false,
TrialReadingCriterionId = entity.TrialCriterionId,
ObjectRelationParentId = entity.TrialCriterionId
ObjectRelationParentId = entity.TrialCriterionId,
ExtraIndentification=extraIdentification
});
}
@ -388,15 +428,30 @@ namespace IRaCIS.Core.Infra.EFCore.Common
var entity = item.Entity as CriterionNidus;
var extraIdentification = string.Empty;
if (entity.IsSystemCriterion == false)
{
extraIdentification = "/IsTrial";
if(_userInfo.RequestUrl!= "OrganInfo/addOrUpdateCriterionNidus" && type==AuditOpt.Add)
{
extraIdentification = "/IsTrial/Auto";
}
}
await InsertInspection<CriterionNidus>(entity, type, x => new InspectionConvertDTO()
{
IsDistinctionInterface = false,
ObjectRelationParentId = entity.CriterionId,
TrialReadingCriterionId = entity.IsSystemCriterion == false ? entity.CriterionId : null
TrialReadingCriterionId = entity.IsSystemCriterion == false ? entity.CriterionId : null,
ExtraIndentification=extraIdentification
});
}
@ -1428,10 +1483,17 @@ namespace IRaCIS.Core.Infra.EFCore.Common
var entity = item.Entity as ClinicalDataTrialSet;
var extraIdentification = string.Empty;
if (_userInfo.RequestUrl == "configTrialBasicInfo/ConfigTrialProcessInfoConfirm")
{
extraIdentification = "/ConfirmSelect";
}
await InsertInspection<ClinicalDataTrialSet>(entity, type, x => new InspectionConvertDTO()
{
IsDistinctionInterface = false,
ObjectRelationParentId = entity.TrialId,
ExtraIndentification=extraIdentification,
});
}
@ -2567,17 +2629,17 @@ namespace IRaCIS.Core.Infra.EFCore.Common
#endregion
//标准 器官病灶表
case nameof(CriterionNidus):
////标准 器官病灶表
//case nameof(CriterionNidus):
var criterionNidus = entityObj as CriterionNidus;
// var criterionNidus = entityObj as CriterionNidus;
if (criterionNidus.IsSystemCriterion == false)
{
type = type + "/IsTrial";
}
// if (criterionNidus.IsSystemCriterion == false)
// {
// type = type + "/IsTrial";
// }
break;
// break;
////系统 项目公用
//case nameof(ReadingCriterionDictionary):