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

修改一版

Uat_Study
he 2022-05-16 15:50:59 +08:00
parent 052c849270
commit e1d4402b85
7 changed files with 102 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -111,17 +111,19 @@ namespace IRaCIS.Core.API.Controllers
{ {
await _inspectionService.RecordSing(opt.SignInfo); await _inspectionService.RecordSing(opt.SignInfo);
var data = await _trialConfigService.ConfigTrialBasicInfo(opt.Data); opt.Data.IsTrialBasicLogicConfirmed = true;
if (!data.IsSuccess) return await _trialConfigService.ConfigTrialBasicInfo(opt.Data);
{ //if (!data.IsSuccess)
return ResponseOutput.NotOk(data.ErrorMessage); //{
} // return ResponseOutput.NotOk(data.ErrorMessage);
//}
return await _trialConfigService.TrialConfigSignatureConfirm(new SignConfirmDTO() //return ResponseOutput.Ok();
{ //return await _trialConfigService.TrialConfigSignatureConfirm(new SignConfirmDTO()
TrialId = opt.Data.TrialId, //{
SignCode = opt.SignInfo.SignCode // TrialId = opt.Data.TrialId,
}); // SignCode = opt.SignInfo.SignCode
//});
} }
@ -152,17 +154,20 @@ namespace IRaCIS.Core.API.Controllers
public async Task<IResponseOutput> ConfigTrialProcessInfoConfirm(DataInspectionDto<TrialProcessConfig> opt) public async Task<IResponseOutput> ConfigTrialProcessInfoConfirm(DataInspectionDto<TrialProcessConfig> opt)
{ {
await _inspectionService.RecordSing(opt.SignInfo); await _inspectionService.RecordSing(opt.SignInfo);
var data = await _trialConfigService.ConfigTrialProcessInfo(opt.Data); opt.Data.IsTrialProcessConfirmed = true;
if (!data.IsSuccess) return await _trialConfigService.ConfigTrialProcessInfo(opt.Data);
{ //if (!data.IsSuccess)
return ResponseOutput.NotOk(data.ErrorMessage); //{
} // return ResponseOutput.NotOk(data.ErrorMessage);
return await _trialConfigService.TrialConfigSignatureConfirm(new SignConfirmDTO() //}
{
TrialId = opt.Data.TrialId, //return ResponseOutput.Ok();
SignCode = opt.SignInfo.SignCode //return await _trialConfigService.TrialConfigSignatureConfirm(new SignConfirmDTO()
}); //{
// TrialId = opt.Data.TrialId,
// SignCode = opt.SignInfo.SignCode
//});
} }
@ -180,17 +185,17 @@ namespace IRaCIS.Core.API.Controllers
{ {
await _inspectionService.RecordSing(opt.SignInfo); await _inspectionService.RecordSing(opt.SignInfo);
opt.Data.IsTrialUrgentConfirmed = true;
var data = await _trialConfigService.ConfigTrialUrgentInfo(opt.Data); return await _trialConfigService.ConfigTrialUrgentInfo(opt.Data);
if (!data.IsSuccess) //if (!data.IsSuccess)
{ //{
return ResponseOutput.NotOk(data.ErrorMessage); // return ResponseOutput.NotOk(data.ErrorMessage);
} //}
return await _trialConfigService.TrialConfigSignatureConfirm(new SignConfirmDTO() //return await _trialConfigService.TrialConfigSignatureConfirm(new SignConfirmDTO()
{ //{
TrialId = opt.Data.TrialId, // TrialId = opt.Data.TrialId,
SignCode = opt.SignInfo.SignCode // SignCode = opt.SignInfo.SignCode
}); //});
} }

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

@ -1067,6 +1067,11 @@
影像一致性核查 影像一致性核查
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Contracts.TrialProcessConfig.IsTrialProcessConfirmed">
<summary>
流程是否确认
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Contracts.TrialProcessConfig.ImagePlatform"> <member name="P:IRaCIS.Core.Application.Contracts.TrialProcessConfig.ImagePlatform">
<summary> <summary>
1 Mint、2 PACS 1 Mint、2 PACS
@ -1077,6 +1082,11 @@
是否有 入组评估确认 是否有 入组评估确认
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Contracts.TrialUrgentConfig.IsTrialUrgentConfirmed">
<summary>
流程配置是否确认
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Contracts.TrialConfigDTO.QCProcessEnum"> <member name="P:IRaCIS.Core.Application.Contracts.TrialConfigDTO.QCProcessEnum">
<summary> <summary>
QC流程 0 不审，1 单审，2双审 QC流程 0 不审，1 单审，2双审

1
IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs
View File

@ -140,6 +140,7 @@ namespace IRaCIS.Core.Application.Service
var list = await _frontAuditConfigRepository.Where(x => x.ParentId == fully.DataFromItem).ToListAsync(); var list = await _frontAuditConfigRepository.Where(x => x.ParentId == fully.DataFromItem).ToListAsync();
list.ForEach(x => list.ForEach(x =>
{ {
x.Id = NewId.NextGuid();
x.ParentId = fully.ThisTiem; x.ParentId = fully.ThisTiem;
}); });
await _frontAuditConfigRepository.AddRangeAsync(list); await _frontAuditConfigRepository.AddRangeAsync(list);

14
IRaCIS.Core.Application/Service/Common/SystemBasicDataService.cs
View File

@ -66,9 +66,14 @@ namespace IRaCIS.Core.Application.Services
} }
else else
{ {
var entity = await _systemBasicDataRepository.Where(t => t.Id == addOrEditSystemBasicData.Id).FirstOrDefaultAsync();
var entity =await _systemBasicDataRepository.Where(t => t.Id == addOrEditSystemBasicData.Id,true).FirstOrDefaultAsync();
_mapper.Map(addOrEditSystemBasicData, entity); _mapper.Map(addOrEditSystemBasicData, entity);
var success = await _repository.SaveChangesAsync(); await _systemBasicDataRepository.SaveChangesAsync();
//var entity = _mapper.Map<SystemBasicData>(addOrEditSystemBasicData);
//await _systemBasicDataRepository.UpdateFromDTOAsync(entity);
//await _systemBasicDataRepository.SaveChangesAsync();
} }
return ResponseOutput.Ok(true); return ResponseOutput.Ok(true);
} }
@ -79,8 +84,9 @@ namespace IRaCIS.Core.Application.Services
[HttpDelete("{systemBasicDataId:guid}")] [HttpDelete("{systemBasicDataId:guid}")]
public async Task<IResponseOutput> DeleteSystemBasicData(Guid systemBasicDataId) public async Task<IResponseOutput> DeleteSystemBasicData(Guid systemBasicDataId)
{ {
var success = await _repository.BatchDeleteAsync<SystemBasicData>(t => t.Id == systemBasicDataId); var success = await _systemBasicDataRepository.DeleteFromQueryAsync(x=>x.Id== systemBasicDataId);
return ResponseOutput.Result(success); await _systemBasicDataRepository.SaveChangesAsync();
return ResponseOutput.Result(true);
} }

12
IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
View File

@ -38,6 +38,8 @@ namespace IRaCIS.Core.Application.Contracts
/// </summary> /// </summary>
public bool IsHaveSubjectAge { get; set; } = false; public bool IsHaveSubjectAge { get; set; } = false;
public bool IsTrialBasicLogicConfirmed { get; set; } = false;
/// <summary> /// <summary>
/// 出组后计划外访视名称 /// 出组后计划外访视名称
@ -87,6 +89,11 @@ namespace IRaCIS.Core.Application.Contracts
/// </summary> /// </summary>
public bool IsImageConsistencyVerification { get; set; } = false; public bool IsImageConsistencyVerification { get; set; } = false;
/// <summary>
/// 流程是否确认
/// </summary>
public bool IsTrialProcessConfirmed { get; set; } = false;
/// <summary> /// <summary>
/// 1 Mint、2 PACS /// 1 Mint、2 PACS
/// </summary> /// </summary>
@ -125,6 +132,11 @@ namespace IRaCIS.Core.Application.Contracts
/// </summary> /// </summary>
public bool IsEnrollementQualificationConfirm { get; set; } = false; public bool IsEnrollementQualificationConfirm { get; set; } = false;
/// <summary>
/// 流程配置是否确认
/// </summary>
public bool IsTrialUrgentConfirmed { get; set; } = false;
public bool IsUrgent { get; set; } public bool IsUrgent { get; set; }
public bool IsPDProgressView { get; set; } public bool IsPDProgressView { get; set; }

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

@ -106,6 +106,11 @@ namespace IRaCIS.Core.Application
/// <returns></returns> /// <returns></returns>
public async Task<IResponseOutput> TrialConfigSignatureConfirm(SignConfirmDTO signConfirmDTO) public async Task<IResponseOutput> TrialConfigSignatureConfirm(SignConfirmDTO signConfirmDTO)
{ {
//var currentEntry = _trialRepository._dbContext.ChangeTracker.Entries().Where(x => x.Entity.GetType() == typeof(Trial)).ToList();
//currentEntry.ForEach(x =>
//{
// x.State = EntityState.Detached;
//});
if (!await _trialRepository.AnyAsync(t => t.Id == signConfirmDTO.TrialId && (t.TrialStatusStr == StaticData.TrialInitializing|| t.TrialStatusStr == StaticData.TrialOngoing))) if (!await _trialRepository.AnyAsync(t => t.Id == signConfirmDTO.TrialId && (t.TrialStatusStr == StaticData.TrialInitializing|| t.TrialStatusStr == StaticData.TrialOngoing)))
{ {
@ -114,15 +119,15 @@ namespace IRaCIS.Core.Application
if (signConfirmDTO.SignCode == ((int)SignEnum.TrialLogicConfim).ToString()) if (signConfirmDTO.SignCode == ((int)SignEnum.TrialLogicConfim).ToString())
{ {
await _trialRepository.BatchUpdateNoTrackingAsync(t => t.Id == signConfirmDTO.TrialId, u => new Trial() { IsTrialBasicLogicConfirmed = true }); await _trialRepository.UpdatePartialFromQueryAsync(t => t.Id == signConfirmDTO.TrialId, u => new Trial() { IsTrialBasicLogicConfirmed = true });
} }
else if (signConfirmDTO.SignCode == ((int)SignEnum.TrialProcessConfim).ToString()) else if (signConfirmDTO.SignCode == ((int)SignEnum.TrialProcessConfim).ToString())
{ {
await _trialRepository.BatchUpdateNoTrackingAsync(t => t.Id == signConfirmDTO.TrialId, u => new Trial() { IsTrialProcessConfirmed = true }); await _trialRepository.UpdatePartialFromQueryAsync(t => t.Id == signConfirmDTO.TrialId, u => new Trial() { IsTrialProcessConfirmed = true });
} }
else if (signConfirmDTO.SignCode == ((int)SignEnum.TrialUrgentConfim).ToString()) else if (signConfirmDTO.SignCode == ((int)SignEnum.TrialUrgentConfim).ToString())
{ {
await _trialRepository.BatchUpdateNoTrackingAsync(t => t.Id == signConfirmDTO.TrialId, u => new Trial() { IsTrialUrgentConfirmed = true }); await _trialRepository.UpdatePartialFromQueryAsync(t => t.Id == signConfirmDTO.TrialId, u => new Trial() { IsTrialUrgentConfirmed = true });
} }
else if (signConfirmDTO.SignCode == ((int)SignEnum.TrialQCQuestionConfirm).ToString()) else if (signConfirmDTO.SignCode == ((int)SignEnum.TrialQCQuestionConfirm).ToString())
@ -158,7 +163,7 @@ namespace IRaCIS.Core.Application
throw new BusinessValidationFailedException("父问题的序号要比子问题序号小，请确认"); throw new BusinessValidationFailedException("父问题的序号要比子问题序号小，请确认");
} }
await _trialRepository.BatchUpdateNoTrackingAsync(t => t.Id == signConfirmDTO.TrialId, u => new Trial() { QCQuestionConfirmedTime = DateTime.Now, QCQuestionConfirmedUserId = _userInfo.Id, IsQCQuestionConfirmed = true }); await _trialRepository.UpdatePartialFromQueryAsync(t => t.Id == signConfirmDTO.TrialId, u => new Trial() { QCQuestionConfirmedTime = DateTime.Now, QCQuestionConfirmedUserId = _userInfo.Id, IsQCQuestionConfirmed = true });
} }
@ -184,8 +189,9 @@ namespace IRaCIS.Core.Application
var trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == trialConfig.TrialId); var trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == trialConfig.TrialId);
if (trialInfo == null) return Null404NotFound(trialInfo); if (trialInfo == null) return Null404NotFound(trialInfo);
_mapper.Map(trialConfig, trialInfo); _mapper.Map(trialConfig, trialInfo);
trialInfo.UpdateTime = DateTime.Now;
return ResponseOutput.Ok(await _repository.SaveChangesAsync()); return ResponseOutput.Ok(await _repository.SaveChangesAsync());
} }
@ -328,7 +334,7 @@ namespace IRaCIS.Core.Application
if (trialInfo == null) return Null404NotFound(trialInfo); if (trialInfo == null) return Null404NotFound(trialInfo);
_mapper.Map(trialConfig, trialInfo); _mapper.Map(trialConfig, trialInfo);
trialInfo.UpdateTime = DateTime.Now;
return ResponseOutput.Ok(await _repository.SaveChangesAsync()); return ResponseOutput.Ok(await _repository.SaveChangesAsync());
@ -368,6 +374,8 @@ namespace IRaCIS.Core.Application
_mapper.Map(trialConfig, trialInfo); _mapper.Map(trialConfig, trialInfo);
trialInfo.UpdateTime = DateTime.Now;
return ResponseOutput.Ok(await _repository.SaveChangesAsync()); return ResponseOutput.Ok(await _repository.SaveChangesAsync());
} }

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

@ -109,17 +109,31 @@ namespace IRaCIS.Core.Infra.EFCore.Common
// 签名模板 // 签名模板
foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(SystemBasicData))) foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(SystemBasicData)))
{ {
var entity = item.Entity as SystemBasicData;
type = type + (entity.ParentId == null ? "/parent" : string.Empty);
await InsertInspection<SystemBasicData>(item, type, x => new DataInspection() await InsertInspection<SystemBasicData>(item, type, x => new DataInspection()
{ {
VisitStageId = x.Id, VisitStageId = x.Id,
}); });
} }
// 项目 // 项目
foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(Trial))) foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(Trial)))
{ {
var originalValues = item.OriginalValues.ToObject() as Trial;
switch (GetRequestUrl().ToLower())
{
case "configtrialbasicinfo/configtrialbasicinfoconfirm":
type = type + "/" + originalValues.IsTrialBasicLogicConfirmed.ToString();
break;
case "configtrialbasicinfo/configtrialprocessinfoconfirm":
type = type + "/" + originalValues.IsTrialProcessConfirmed.ToString();
break;
case "configtrialbasicinfo/configtrialurgentinfoconfirm":
type = type + "/" + originalValues.IsTrialUrgentConfirmed.ToString();
break;
}
var entity = item.Entity as Trial; var entity = item.Entity as Trial;
await InsertInspection<Trial>(item, type, x => new DataInspection() await InsertInspection<Trial>(item, type, x => new DataInspection()
{ {
@ -127,6 +141,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common
TrialName = x.ExperimentName, TrialName = x.ExperimentName,
ResearchProgramNo=x.ResearchProgramNo, ResearchProgramNo=x.ResearchProgramNo,
GeneralId = x.Id, GeneralId = x.Id,
},new {
TrialDicList= string.Join(",",entity.TrialDicList.Select(x => x.KeyName).ToList())
}); });
} }