diff --git a/IRaCIS.Core.API/Controllers/FinancialChangeController.cs b/IRaCIS.Core.API/Controllers/FinancialChangeController.cs
index a0f2b1069..ae7646260 100644
--- a/IRaCIS.Core.API/Controllers/FinancialChangeController.cs
+++ b/IRaCIS.Core.API/Controllers/FinancialChangeController.cs
@@ -37,7 +37,6 @@ namespace IRaCIS.Core.API.Controllers.Special
//[TrialAudit(AuditType.TrialAudit, AuditOptType.AddOrUpdateTrial)]
/// 添加实验项目-返回新增Id[AUTH]
- ///
/// 新记录Id
[HttpPost, Route("Inspection/trial/addOrUpdateTrial")]
[UnitOfWork]
diff --git a/IRaCIS.Core.API/Controllers/InspectionController.cs b/IRaCIS.Core.API/Controllers/InspectionController.cs
index d6a227a8f..470076026 100644
--- a/IRaCIS.Core.API/Controllers/InspectionController.cs
+++ b/IRaCIS.Core.API/Controllers/InspectionController.cs
@@ -419,6 +419,7 @@ namespace IRaCIS.Core.API.Controllers
///
/// 一致性核查 excel上传 支持三种格式
///
+ ///
///
///
[HttpPost, Route("Inspection/QCOperation/UploadVisitCheckExcel")]
@@ -799,7 +800,6 @@ namespace IRaCIS.Core.API.Controllers
///
/// 签名确认
///
- /// 签名确认
///
[HttpPost, Route("Inspection/configTrialBasicInfo/TrialConfigSignatureConfirm")]
[UnitOfWork]
diff --git a/IRaCIS.Core.API/IRaCIS.Core.API.xml b/IRaCIS.Core.API/IRaCIS.Core.API.xml
index 8fb8d91cb..055c10ee9 100644
--- a/IRaCIS.Core.API/IRaCIS.Core.API.xml
+++ b/IRaCIS.Core.API/IRaCIS.Core.API.xml
@@ -6,7 +6,6 @@
添加实验项目-返回新增Id[AUTH]
-
新记录Id
@@ -335,7 +334,6 @@
签名确认
- 签名确认
diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 19b163f56..1d1e2a6bc 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -1272,6 +1272,7 @@
Site用户汇总表导出
+
@@ -1541,6 +1542,7 @@
一致性核查 excel上传 支持三种格式
+
@@ -1563,6 +1565,7 @@
type 1 :study 2: series 3:非dicom QC修改检查部位和 拍片类型
+
@@ -1707,10 +1710,8 @@
更新项目状态
-
-
@@ -1725,7 +1726,6 @@
废除项目
-
diff --git a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs
index de8bf0fc3..6a0cca547 100644
--- a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs
+++ b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs
@@ -489,6 +489,7 @@ namespace IRaCIS.Core.Application.Image.QA
/// 一致性核查 excel上传 支持三种格式
///
///
+ ///
///
[HttpPost("{trialId:guid}")]
[TypeFilter(typeof(TrialResourceFilter))]
@@ -827,6 +828,7 @@ namespace IRaCIS.Core.Application.Image.QA
///type 1 :study 2: series 3:非dicom QC修改检查部位和 拍片类型
///
///
+ ///
///
///
///
@@ -1076,15 +1078,15 @@ namespace IRaCIS.Core.Application.Image.QA
#endregion
- public void VerifyIsCanQC(SubjectVisit? subjectVisit, Guid? sujectVisitId = null)
+ public async void VerifyIsCanQC(SubjectVisit? subjectVisit, Guid? sujectVisitId = null)
{
if (sujectVisitId != null)
{
- subjectVisit = _subjectVisitRepository.FirstOrDefaultAsync(t => t.Id == sujectVisitId).Result.IfNullThrowException();
+ subjectVisit = await (_subjectVisitRepository.FirstOrDefaultAsync(t => t.Id == sujectVisitId)).IfNullThrowException();
}
- if (subjectVisit.CurrentActionUserId != _userInfo.Id)
+ if (subjectVisit!.CurrentActionUserId != _userInfo.Id)
{
throw new BusinessValidationFailedException("您不是该质控任务当前领取人,没有操作权限!");
}
diff --git a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs
index d1e1034fc..aa1623c2a 100644
--- a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs
+++ b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs
@@ -173,7 +173,7 @@ namespace IRaCIS.Core.Application.Contracts
else //验证码正确 并且 没有超时
{
- TrialSiteSurvey dbEntity = null;
+ TrialSiteSurvey? dbEntity = null;
//替换交接人
@@ -481,7 +481,7 @@ namespace IRaCIS.Core.Application.Contracts
survey.LatestBackReason = trialSiteSubmitBackCommand.LatestBackReason;
- User user = null;
+ User? user = null;
var messageToSend = new MimeMessage();
//发件地址
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
index 0d072fa0e..62fa49825 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
@@ -203,12 +203,10 @@ namespace IRaCIS.Core.Application
/// 更新项目状态
///
///
- ///
///
///
- ///
///
- [HttpPut("{trialId:guid}/{signId:guid}/{trialStatusStr}/{reason?}")]
+ [HttpPut("{trialId:guid}/{trialStatusStr}/{reason?}")]
[UnitOfWork]
public async Task UpdateTrialState(Guid trialId, string trialStatusStr, string? reason)
{
@@ -273,7 +271,6 @@ namespace IRaCIS.Core.Application
/// 废除项目
///
///
- ///
///
///
[HttpPut("{trialId:guid}/{isAbandon:bool}")]
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialExternalUserService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialExternalUserService.cs
index c8c0fd0a7..a34c84530 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialExternalUserService.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialExternalUserService.cs
@@ -157,30 +157,30 @@ namespace IRaCIS.Core.Application.Service
return ResponseOutput.NotOk("这里不允许编辑,删除后再添加");
- if (await _trialExternalUseRepository.AnyAsync(t =>
- t.Email == addOrEditTrialExternalUser.Email &&
- t.UserTypeId == addOrEditTrialExternalUser.UserTypeId && t.Id != addOrEditTrialExternalUser.Id && t.TrialId == addOrEditTrialExternalUser.TrialId))
- {
- return ResponseOutput.NotOk("该邮箱和用户类型,已存在该账户");
- }
-
- //if (addOrEditTrialExternalUser.IsSystemUser)
+ //if (await _trialExternalUseRepository.AnyAsync(t =>
+ // t.Email == addOrEditTrialExternalUser.Email &&
+ // t.UserTypeId == addOrEditTrialExternalUser.UserTypeId && t.Id != addOrEditTrialExternalUser.Id && t.TrialId == addOrEditTrialExternalUser.TrialId))
//{
- // return ResponseOutput.NotOk("系统账户不允许编辑");
+ // return ResponseOutput.NotOk("该邮箱和用户类型,已存在该账户");
//}
-
- var needUpdateEntity =
- await _trialExternalUseRepository.FirstOrDefaultAsync(t => t.Id == addOrEditTrialExternalUser.Id);
-
- //更改之前 先验证是否在系统账户中存在
-
- _mapper.Map(addOrEditTrialExternalUser, needUpdateEntity);
+ ////if (addOrEditTrialExternalUser.IsSystemUser)
+ ////{
+ //// return ResponseOutput.NotOk("系统账户不允许编辑");
+ ////}
- await _trialExternalUseRepository.SaveChangesAsync();
+ //var needUpdateEntity =
+ // await _trialExternalUseRepository.FirstOrDefaultAsync(t => t.Id == addOrEditTrialExternalUser.Id);
- return ResponseOutput.Ok(needUpdateEntity.Id.ToString());
+ ////更改之前 先验证是否在系统账户中存在
+
+ //_mapper.Map(addOrEditTrialExternalUser, needUpdateEntity);
+
+
+ //await _trialExternalUseRepository.SaveChangesAsync();
+
+ //return ResponseOutput.Ok(needUpdateEntity.Id.ToString());
}
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialSiteService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialSiteService.cs
index 67e6b247e..403ecd1f8 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialSiteService.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialSiteService.cs
@@ -68,6 +68,7 @@ namespace IRaCIS.Core.Application.Services
///
/// Site用户汇总表导出
///
+ ///
///
///
///
diff --git a/IRaCIS.Core.Domain/Common/NotDefault.cs b/IRaCIS.Core.Domain/Common/NotDefault.cs
index b67f35b5c..b38738133 100644
--- a/IRaCIS.Core.Domain/Common/NotDefault.cs
+++ b/IRaCIS.Core.Domain/Common/NotDefault.cs
@@ -8,7 +8,7 @@
public const string DefaultErrorMessage = "The {0} field must not be empty";
public GuidNotEmptyAttribute() : base(DefaultErrorMessage) { }
- public override bool IsValid(object? value)
+ public override bool IsValid(object value)
{
//NotEmpty doesn't necessarily mean required
if (value is null)
@@ -31,7 +31,7 @@
public const string DefaultErrorMessage = "The {0} field is is not passed or not set a valid value";
public NotDefaultAttribute() : base(DefaultErrorMessage) { }
- public override bool IsValid(object? value)
+ public override bool IsValid(object value)
{
//NotDefault doesn't necessarily mean required
if (value is null)
@@ -57,7 +57,7 @@
public const string DefaultErrorMessage = "The {0} field is is not a valid DateTime value";
public CanConvertToTimeAttribute() : base(DefaultErrorMessage) { }
- public override bool IsValid(object? value)
+ public override bool IsValid(object value)
{
if (value is null)
{
diff --git a/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs b/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs
index 113492e0a..4598080d1 100644
--- a/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs
+++ b/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs
@@ -379,8 +379,8 @@ namespace IRaCIS.Core.Infra.EFCore
///
/// 重写savechange方式 统一增加审计信息 CreateUserId CreateTime UpdateTime UpdateUserId 可用事件绑定的方式UpdateAuitUser
///
- private async Task UpdateAuditInfo()
- {
+ //private async Task UpdateAuditInfo()
+ //{
@@ -449,7 +449,7 @@ namespace IRaCIS.Core.Infra.EFCore
//}
- }
+ //}