Compare commits

..

No commits in common. "a73a79b627cd75bf5b29e722d0e1a3c14236b6dc" and "ca9a2dad181cbb5dcfe761c2502409958f990c2c" have entirely different histories.

3 changed files with 11 additions and 24 deletions

View File

@ -61,10 +61,9 @@ namespace IRaCIS.Core.Application.Contracts
//---已锁定,不允许操作
return ResponseOutput.NotOk(_localizer["TrialSiteEquipment_Locked"]);
}
await _trialSiteEquipmentSurveyRepository.DeleteFromQueryAsync(t => t.Id == trialSiteEquipmentSurveyId);
var success = await _trialSiteEquipmentSurveyRepository.SaveChangesAsync();
var success = await _trialSiteEquipmentSurveyRepository.BatchDeleteNoTrackingAsync(t => t.Id == trialSiteEquipmentSurveyId);
return ResponseOutput.Result(success);
return ResponseOutput.Result(success);
}

View File

@ -142,10 +142,9 @@ namespace IRaCIS.Core.Application.Contracts
return ResponseOutput.NotOk(_localizer["TrialSiteUser_Locked"]);
}
await _trialSiteUserSurveyRepository.DeleteFromQueryAsync(t => t.Id == trialSiteUserSurveyId);
var success = await _trialSiteUserSurveyRepository.SaveChangesAsync();
var success = await _trialSiteUserSurveyRepository.BatchDeleteNoTrackingAsync(t => t.Id == trialSiteUserSurveyId);
return ResponseOutput.Result(success);
return ResponseOutput.Result(success);
}

View File

@ -1504,17 +1504,12 @@ namespace IRaCIS.Core.Infra.EFCore.Common
foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(TrialSiteUserSurvey)))
{
var type = GetEntityAuditOpt(item);
var entity = item.Entity as TrialSiteUserSurvey;
var trialid = await _dbContext.TrialSiteSurvey.Where(x => x.Id == entity.TrialSiteSurveyId).Select(x=>x.TrialId).FirstOrDefaultAsync();
var entity = item.Entity as TrialSiteUserSurvey;
await InsertInspection<TrialSiteUserSurvey>(entity, type, x => new InspectionConvertDTO()
{
TrialId= trialid,
IsDistinctionInterface = false
IsDistinctionInterface = false
});
}
@ -1523,12 +1518,10 @@ namespace IRaCIS.Core.Infra.EFCore.Common
var type = GetEntityAuditOpt(item);
var entity = item.Entity as TrialSiteEquipmentSurvey;
var trialid = await _dbContext.TrialSiteSurvey.Where(x => x.Id == entity.TrialSiteSurveyId).Select(x => x.TrialId).FirstOrDefaultAsync();
await InsertInspection<TrialSiteEquipmentSurvey>(entity, type, x => new InspectionConvertDTO()
await InsertInspection<TrialSiteEquipmentSurvey>(entity, type, x => new InspectionConvertDTO()
{
TrialId = trialid,
IsDistinctionInterface = false
IsDistinctionInterface = false
});
}
@ -2534,8 +2527,6 @@ namespace IRaCIS.Core.Infra.EFCore.Common
var entity = item.Entity as TaskAllocationRule;
var userRealName =await _dbContext.User.Where(x => x.Id == entity.DoctorUserId).Select(x => x.FullName).FirstOrDefaultAsync();
await InsertInspection<TaskAllocationRule>(entity, type, x => new InspectionConvertDTO()
{
IsDistinctionInterface = false,
@ -2544,9 +2535,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
ObjectRelationParentId2 = entity.DoctorUserId
}, new {
UserRealName= userRealName
});
});
}
// suject 医生绑定关系
@ -3126,8 +3115,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common
var type = GetEntityAuditOpt(item);
var entity = item.Entity as VisitTask;
var userRealName = await _dbContext.User.Where(x => x.Id == entity.DoctorUserId).Select(x => x.FullName).FirstOrDefaultAsync();
var obj = new { UserRealName= userRealName };
var obj = new object() { };
#region 标识区分