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

复核稽查修改
continuous-integration/drone/push Build is passing Details

Uat_IRC_Net8
hang 2025-07-17 10:34:15 +08:00
parent 5bb99180b6
commit 9522461508
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -853,7 +853,7 @@ namespace IRaCIS.Core.Application
await _qcQuestionAnswerRepository.BatchDeleteNoTrackingAsync(t => t.SubjectVisit.TrialId == signConfirmDTO.TrialId && t.SubjectVisit.SecondReviewState != SecondReviewState.AuditPassed && t.CurrentQCEnum == CurrentQC.SecondReview); await _qcQuestionAnswerRepository.BatchDeleteNoTrackingAsync(t => t.SubjectVisit.TrialId == signConfirmDTO.TrialId && t.SubjectVisit.SecondReviewState != SecondReviewState.AuditPassed && t.CurrentQCEnum == CurrentQC.SecondReview);
//重复二次复核签名 //重复二次复核签名
await _subjectVisitRepository.BatchUpdateNoTrackingAsync(t => t.TrialId == signConfirmDTO.TrialId && t.AuditState == AuditStateEnum.QCPassed await _subjectVisitRepository.UpdatePartialFromQueryAsync(t => t.TrialId == signConfirmDTO.TrialId && t.AuditState == AuditStateEnum.QCPassed
&& !t.TrialQCQuestionAnswerList.Any(t => t.SecondReviewTime == trialConfirmTime), u => new SubjectVisit() { SecondReviewState = SecondReviewState.WaitAudit }); && !t.TrialQCQuestionAnswerList.Any(t => t.SecondReviewTime == trialConfirmTime), u => new SubjectVisit() { SecondReviewState = SecondReviewState.WaitAudit });

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

@ -92,7 +92,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
/// <param name="unitDataList">单位字典</param> /// <param name="unitDataList">单位字典</param>
/// <param name="answer">答案</param> /// <param name="answer">答案</param>
/// <returns></returns> /// <returns></returns>
public string Translationunit(string answerType, ValueUnit? unit, string customUnit, List<UnitData> unitDataList,string? answer) public string Translationunit(string answerType, ValueUnit? unit, string customUnit, List<UnitData> unitDataList, string? answer)
{ {
if (answerType == "upload") if (answerType == "upload")
{ {
@ -1978,7 +1978,15 @@ namespace IRaCIS.Core.Infra.EFCore.Common
//待处理？ //待处理？
case "qcoperation/qcpassedorfailed": case "qcoperation/qcpassedorfailed":
extraIdentification = "/" + (40 % (int)entity.AuditState).ToString(); if (entity.AuditState == AuditStateEnum.QCPassed && (entity.SecondReviewState == SecondReviewState.AuditPassed || entity.SecondReviewState == SecondReviewState.AuditFailed))
{
extraIdentification = "/SecondReviewFinished";
}
else
{
extraIdentification = "/" + (40 % (int)entity.AuditState).ToString();
}
break; break;
@ -3134,7 +3142,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
(t, u) => (t, u) =>
new new
{ {
Answer = Translationunit(u.AnswerType, u.Unit,u.CustomUnit, unitDataList, t.Answer), Answer = Translationunit(u.AnswerType, u.Unit, u.CustomUnit, unitDataList, t.Answer),
u.DictionaryCode, u.DictionaryCode,
u.QuestionName, u.QuestionName,
u.QuestionEnName, u.QuestionEnName,
@ -3242,12 +3250,12 @@ namespace IRaCIS.Core.Infra.EFCore.Common
string extraIdentification = string.Empty; string extraIdentification = string.Empty;
var readingQuestion = await _dbContext.ReadingQuestionTrial.Where(t => t.Id == entity.QuestionId).Include(x=>x.ReadingQuestionCriterionTrial).FirstNotNullAsync(); var readingQuestion = await _dbContext.ReadingQuestionTrial.Where(t => t.Id == entity.QuestionId).Include(x => x.ReadingQuestionCriterionTrial).FirstNotNullAsync();
if (readingQuestion.ReadingQuestionCriterionTrial.CriterionGroup == CriterionGroup.Nontumorous) if (readingQuestion.ReadingQuestionCriterionTrial.CriterionGroup == CriterionGroup.Nontumorous)
{ {
extraIdentification = "/Nontumorous"; extraIdentification = "/Nontumorous";
} }
await InsertInspection<ReadingTableAnswerRowInfo>(entity, type, x => new InspectionConvertDTO() await InsertInspection<ReadingTableAnswerRowInfo>(entity, type, x => new InspectionConvertDTO()
@ -3671,9 +3679,9 @@ namespace IRaCIS.Core.Infra.EFCore.Common
} }
} }
if(entity.TaskBlindName.Contains("Timepoint Ran")) if (entity.TaskBlindName.Contains("Timepoint Ran"))
{ {
if(_dbContext.VisitTask.Where(t => t.Id == entity.Id).Any(t => !t.TaskBlindName.Contains("Timepoint Ran"))) if (_dbContext.VisitTask.Where(t => t.Id == entity.Id).Any(t => !t.TaskBlindName.Contains("Timepoint Ran")))
{ {
isDistinctionInterface = false; isDistinctionInterface = false;
extraIdentification = "/TriggerSystemBlindingName"; extraIdentification = "/TriggerSystemBlindingName";