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

修复一些警告

Uat_Study
hang 2022-05-05 14:37:57 +08:00
parent b2984125c5
commit ad7e430784
11 changed files with 37 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
IRaCIS.Core.API/Controllers/FinancialChangeController.cs
View File

@ -37,7 +37,6 @@ namespace IRaCIS.Core.API.Controllers.Special
//[TrialAudit(AuditType.TrialAudit, AuditOptType.AddOrUpdateTrial)] //[TrialAudit(AuditType.TrialAudit, AuditOptType.AddOrUpdateTrial)]
/// <summary> 添加实验项目-返回新增Id[AUTH]</summary> /// <summary> 添加实验项目-返回新增Id[AUTH]</summary>
/// <param name="param"></param>
/// <returns>新记录Id</returns> /// <returns>新记录Id</returns>
[HttpPost, Route("Inspection/trial/addOrUpdateTrial")] [HttpPost, Route("Inspection/trial/addOrUpdateTrial")]
[UnitOfWork] [UnitOfWork]

2
IRaCIS.Core.API/Controllers/InspectionController.cs
View File

@ -419,6 +419,7 @@ namespace IRaCIS.Core.API.Controllers
/// <summary> /// <summary>
/// 一致性核查 excel上传 支持三种格式 /// 一致性核查 excel上传 支持三种格式
/// </summary> /// </summary>
/// <param name="file"></param>
/// <param name="opt"></param> /// <param name="opt"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost, Route("Inspection/QCOperation/UploadVisitCheckExcel")] [HttpPost, Route("Inspection/QCOperation/UploadVisitCheckExcel")]
@ -799,7 +800,6 @@ namespace IRaCIS.Core.API.Controllers
/// <summary> /// <summary>
/// 签名确认 /// 签名确认
/// </summary> /// </summary>
/// <param name="signConfirmDTO">签名确认</param>
/// <returns></returns> /// <returns></returns>
[HttpPost, Route("Inspection/configTrialBasicInfo/TrialConfigSignatureConfirm")] [HttpPost, Route("Inspection/configTrialBasicInfo/TrialConfigSignatureConfirm")]
[UnitOfWork] [UnitOfWork]

2
IRaCIS.Core.API/IRaCIS.Core.API.xml
View File

@ -6,7 +6,6 @@
<members> <members>
<member name="M:IRaCIS.Core.API.Controllers.Special.FinancialChangeController.AddOrUpdateTrialInspection(IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionDto{IRaCIS.Application.Contracts.TrialCommand})"> <member name="M:IRaCIS.Core.API.Controllers.Special.FinancialChangeController.AddOrUpdateTrialInspection(IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionDto{IRaCIS.Application.Contracts.TrialCommand})">
<summary> 添加实验项目-返回新增Id[AUTH]</summary> <summary> 添加实验项目-返回新增Id[AUTH]</summary>
<param name="param"></param>
<returns>新记录Id</returns> <returns>新记录Id</returns>
</member> </member>
<member name="M:IRaCIS.Core.API.Controllers.Special.FinancialChangeController.AddOrUpdateTrial(IRaCIS.Application.Contracts.TrialCommand)"> <member name="M:IRaCIS.Core.API.Controllers.Special.FinancialChangeController.AddOrUpdateTrial(IRaCIS.Application.Contracts.TrialCommand)">
@ -335,7 +334,6 @@
<summary> <summary>
签名确认 签名确认
</summary> </summary>
<param name="signConfirmDTO">签名确认</param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:IRaCIS.Core.API.Controllers.InspectionController.ConfigTrialBasicInfoConfirm(IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionDto{IRaCIS.Core.Application.Contracts.BasicTrialConfig})"> <member name="M:IRaCIS.Core.API.Controllers.InspectionController.ConfigTrialBasicInfoConfirm(IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionDto{IRaCIS.Core.Application.Contracts.BasicTrialConfig})">

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

@ -1272,6 +1272,7 @@
<summary> <summary>
Site用户汇总表导出 Site用户汇总表导出
</summary> </summary>
<param name="queryParam"></param>
<param name="_commonDocumentRepository"></param> <param name="_commonDocumentRepository"></param>
<param name="_trialSiteSurveyRepository"></param> <param name="_trialSiteSurveyRepository"></param>
<param name="_trialSiteUserSurveyRepository"></param> <param name="_trialSiteUserSurveyRepository"></param>
@ -1541,6 +1542,7 @@
一致性核查 excel上传 支持三种格式 一致性核查 excel上传 支持三种格式
</summary> </summary>
<param name="file"></param> <param name="file"></param>
<param name="trialId"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:IRaCIS.Core.Application.Image.QA.QCOperationService.AddOrUpdateQCQuestionAnswerList(IRaCIS.Core.Application.Contracts.DTO.QCQuestionAnswerCommand[],System.Guid,System.Guid,IRaCIS.Core.Domain.Share.TrialQCProcess,IRaCIS.Core.Domain.Share.CurrentQC)"> <member name="M:IRaCIS.Core.Application.Image.QA.QCOperationService.AddOrUpdateQCQuestionAnswerList(IRaCIS.Core.Application.Contracts.DTO.QCQuestionAnswerCommand[],System.Guid,System.Guid,IRaCIS.Core.Domain.Share.TrialQCProcess,IRaCIS.Core.Domain.Share.CurrentQC)">
@ -1563,6 +1565,7 @@
type 1 :study 2: series 3:非dicom QC修改检查部位和 拍片类型 type 1 :study 2: series 3:非dicom QC修改检查部位和 拍片类型
</summary> </summary>
<param name="id"></param> <param name="id"></param>
<param name="subjectVisitId"></param>
<param name="type"></param> <param name="type"></param>
<param name="modality"></param> <param name="modality"></param>
<param name="bodyPart"></param> <param name="bodyPart"></param>
@ -1707,10 +1710,8 @@
更新项目状态 更新项目状态
</summary> </summary>
<param name="trialId"></param> <param name="trialId"></param>
<param name="signId"></param>
<param name="trialStatusStr"></param> <param name="trialStatusStr"></param>
<param name="reason"></param> <param name="reason"></param>
<param name="_provider"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:IRaCIS.Core.Application.TrialConfigService.GetTrialStateChangeList(System.Guid)"> <member name="M:IRaCIS.Core.Application.TrialConfigService.GetTrialStateChangeList(System.Guid)">
@ -1725,7 +1726,6 @@
废除项目 废除项目
</summary> </summary>
<param name="trialId"></param> <param name="trialId"></param>
<param name="signId"></param>
<param name="isAbandon"></param> <param name="isAbandon"></param>
<returns></returns> <returns></returns>
</member> </member>

8
IRaCIS.Core.Application/Service/QC/QCOperationService.cs
View File

@ -489,6 +489,7 @@ namespace IRaCIS.Core.Application.Image.QA
/// 一致性核查 excel上传 支持三种格式 /// 一致性核查 excel上传 支持三种格式
/// </summary> /// </summary>
/// <param name="file"></param> /// <param name="file"></param>
/// <param name="trialId"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("{trialId:guid}")] [HttpPost("{trialId:guid}")]
[TypeFilter(typeof(TrialResourceFilter))] [TypeFilter(typeof(TrialResourceFilter))]
@ -827,6 +828,7 @@ namespace IRaCIS.Core.Application.Image.QA
///type 1 :study 2: series 3:非dicom QC修改检查部位和 拍片类型 ///type 1 :study 2: series 3:非dicom QC修改检查部位和 拍片类型
/// </summary> /// </summary>
/// <param name="id"></param> /// <param name="id"></param>
/// <param name="subjectVisitId"></param>
/// <param name="type"></param> /// <param name="type"></param>
/// <param name="modality"></param> /// <param name="modality"></param>
/// <param name="bodyPart"></param> /// <param name="bodyPart"></param>
@ -1076,15 +1078,15 @@ namespace IRaCIS.Core.Application.Image.QA
#endregion #endregion
public void VerifyIsCanQC(SubjectVisit? subjectVisit, Guid? sujectVisitId = null) public async void VerifyIsCanQC(SubjectVisit? subjectVisit, Guid? sujectVisitId = null)
{ {
if (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("您不是该质控任务当前领取人，没有操作权限!"); throw new BusinessValidationFailedException("您不是该质控任务当前领取人，没有操作权限!");
} }

4
IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs
View File

@ -173,7 +173,7 @@ namespace IRaCIS.Core.Application.Contracts
else //验证码正确 并且 没有超时 else //验证码正确 并且 没有超时
{ {
TrialSiteSurvey dbEntity = null; TrialSiteSurvey? dbEntity = null;
//替换交接人 //替换交接人
@ -481,7 +481,7 @@ namespace IRaCIS.Core.Application.Contracts
survey.LatestBackReason = trialSiteSubmitBackCommand.LatestBackReason; survey.LatestBackReason = trialSiteSubmitBackCommand.LatestBackReason;
User user = null; User? user = null;
var messageToSend = new MimeMessage(); var messageToSend = new MimeMessage();
//发件地址 //发件地址

5
IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
View File

@ -203,12 +203,10 @@ namespace IRaCIS.Core.Application
/// 更新项目状态 /// 更新项目状态
/// </summary> /// </summary>
/// <param name="trialId"></param> /// <param name="trialId"></param>
/// <param name="signId"></param>
/// <param name="trialStatusStr"></param> /// <param name="trialStatusStr"></param>
/// <param name="reason"></param> /// <param name="reason"></param>
/// <param name="_provider"></param>
/// <returns></returns> /// <returns></returns>
[HttpPut("{trialId:guid}/{signId:guid}/{trialStatusStr}/{reason?}")] [HttpPut("{trialId:guid}/{trialStatusStr}/{reason?}")]
[UnitOfWork] [UnitOfWork]
public async Task<IResponseOutput> UpdateTrialState(Guid trialId, string trialStatusStr, string? reason) public async Task<IResponseOutput> UpdateTrialState(Guid trialId, string trialStatusStr, string? reason)
{ {
@ -273,7 +271,6 @@ namespace IRaCIS.Core.Application
/// 废除项目 /// 废除项目
/// </summary> /// </summary>
/// <param name="trialId"></param> /// <param name="trialId"></param>
/// <param name="signId"></param>
/// <param name="isAbandon"></param> /// <param name="isAbandon"></param>
/// <returns></returns> /// <returns></returns>
[HttpPut("{trialId:guid}/{isAbandon:bool}")] [HttpPut("{trialId:guid}/{isAbandon:bool}")]

36
IRaCIS.Core.Application/Service/TrialSiteUser/TrialExternalUserService.cs
View File

@ -157,30 +157,30 @@ namespace IRaCIS.Core.Application.Service
return ResponseOutput.NotOk("这里不允许编辑，删除后再添加"); return ResponseOutput.NotOk("这里不允许编辑，删除后再添加");
if (await _trialExternalUseRepository.AnyAsync(t => //if (await _trialExternalUseRepository.AnyAsync(t =>
t.Email == addOrEditTrialExternalUser.Email && // t.Email == addOrEditTrialExternalUser.Email &&
t.UserTypeId == addOrEditTrialExternalUser.UserTypeId && t.Id != addOrEditTrialExternalUser.Id && t.TrialId == addOrEditTrialExternalUser.TrialId)) // t.UserTypeId == addOrEditTrialExternalUser.UserTypeId && t.Id != addOrEditTrialExternalUser.Id && t.TrialId == addOrEditTrialExternalUser.TrialId))
{
return ResponseOutput.NotOk("该邮箱和用户类型，已存在该账户");
}
//if (addOrEditTrialExternalUser.IsSystemUser)
//{ //{
// return ResponseOutput.NotOk("系统账户不允许编辑"); // return ResponseOutput.NotOk("该邮箱和用户类型，已存在该账户");
//} //}
////if (addOrEditTrialExternalUser.IsSystemUser)
var needUpdateEntity = ////{
await _trialExternalUseRepository.FirstOrDefaultAsync(t => t.Id == addOrEditTrialExternalUser.Id); //// return ResponseOutput.NotOk("系统账户不允许编辑");
////}
//更改之前 先验证是否在系统账户中存在
_mapper.Map(addOrEditTrialExternalUser, needUpdateEntity);
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());
} }

1
IRaCIS.Core.Application/Service/TrialSiteUser/TrialSiteService.cs
View File

@ -68,6 +68,7 @@ namespace IRaCIS.Core.Application.Services
/// <summary> /// <summary>
/// Site用户汇总表导出 /// Site用户汇总表导出
/// </summary> /// </summary>
/// <param name="queryParam"></param>
/// <param name="_commonDocumentRepository"></param> /// <param name="_commonDocumentRepository"></param>
/// <param name="_trialSiteSurveyRepository"></param> /// <param name="_trialSiteSurveyRepository"></param>
/// <param name="_trialSiteUserSurveyRepository"></param> /// <param name="_trialSiteUserSurveyRepository"></param>

6
IRaCIS.Core.Domain/Common/NotDefault.cs
View File

@ -8,7 +8,7 @@
public const string DefaultErrorMessage = "The {0} field must not be empty"; public const string DefaultErrorMessage = "The {0} field must not be empty";
public GuidNotEmptyAttribute() : base(DefaultErrorMessage) { } public GuidNotEmptyAttribute() : base(DefaultErrorMessage) { }
public override bool IsValid(object? value) public override bool IsValid(object value)
{ {
//NotEmpty doesn't necessarily mean required //NotEmpty doesn't necessarily mean required
if (value is null) 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 const string DefaultErrorMessage = "The {0} field is is not passed or not set a valid value";
public NotDefaultAttribute() : base(DefaultErrorMessage) { } public NotDefaultAttribute() : base(DefaultErrorMessage) { }
public override bool IsValid(object? value) public override bool IsValid(object value)
{ {
//NotDefault doesn't necessarily mean required //NotDefault doesn't necessarily mean required
if (value is null) if (value is null)
@ -57,7 +57,7 @@
public const string DefaultErrorMessage = "The {0} field is is not a valid DateTime value"; public const string DefaultErrorMessage = "The {0} field is is not a valid DateTime value";
public CanConvertToTimeAttribute() : base(DefaultErrorMessage) { } public CanConvertToTimeAttribute() : base(DefaultErrorMessage) { }
public override bool IsValid(object? value) public override bool IsValid(object value)
{ {
if (value is null) if (value is null)
{ {

6
IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs
View File

@ -379,8 +379,8 @@ namespace IRaCIS.Core.Infra.EFCore
/// <summary> /// <summary>
/// 重写savechange方式 统一增加审计信息 CreateUserId CreateTime UpdateTime UpdateUserId 可用事件绑定的方式UpdateAuitUser /// 重写savechange方式 统一增加审计信息 CreateUserId CreateTime UpdateTime UpdateUserId 可用事件绑定的方式UpdateAuitUser
/// </summary> /// </summary>
private async Task UpdateAuditInfo() //private async Task UpdateAuditInfo()
{ //{
@ -449,7 +449,7 @@ namespace IRaCIS.Core.Infra.EFCore
//} //}
} //}