From 73a1236a5f0b01b303f002714729003e75f9615e Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Fri, 1 Aug 2025 15:46:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E8=87=B4=E6=80=A7=E5=88=86=E6=9E=90?= =?UTF-8?q?=E5=A4=9A=E6=A0=87=E5=87=86=E6=8F=92=E5=85=A5=E4=B8=B4=E5=BA=8A?= =?UTF-8?q?=E6=95=B0=E6=8D=AEbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Allocation/VisitTaskHelpeService.cs | 56 ++++++++++--------- 1 file changed, 30 insertions(+), 26 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs index d327c712f..6d7e499b6 100644 --- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs @@ -870,7 +870,7 @@ namespace IRaCIS.Core.Application.Service //有可能仅仅只分配了一个Subject 未分配 那么 if (assignConfigList.Any(t => t.ArmEnum == Arm.DoubleReadingArm1) && task1 != null) - { + { arm1.TaskAllocationState = TaskAllocationState.Allocated; arm1.AllocateTime = DateTime.Now; arm1.DoctorUserId = task1.DoctorUserId; @@ -903,7 +903,7 @@ namespace IRaCIS.Core.Application.Service BlindTrialSiteCode = latestTask.BlindTrialSiteCode, IsAnalysisCreate = latestTask.IsAnalysisCreate, IsSelfAnalysis = latestTask.IsSelfAnalysis, - + TrialReadingCriterionId = latestTask.TrialReadingCriterionId, IsNeedClinicalDataSign = latestTask.IsNeedClinicalDataSign, IsClinicalDataSign = latestTask.IsClinicalDataSign @@ -913,10 +913,10 @@ namespace IRaCIS.Core.Application.Service { taskOne.TaskAllocationState = TaskAllocationState.Allocated; taskOne.AllocateTime = DateTime.Now; - taskOne. DoctorUserId = task1!.DoctorUserId; - taskOne. SuggesteFinishedTime = GetSuggessFinishTime(true, UrgentType.NotUrget); + taskOne.DoctorUserId = task1!.DoctorUserId; + taskOne.SuggesteFinishedTime = GetSuggessFinishTime(true, UrgentType.NotUrget); } - + currentMaxCodeInt = currentMaxCodeInt + 1; @@ -976,7 +976,7 @@ namespace IRaCIS.Core.Application.Service BlindTrialSiteCode = latestTask.BlindTrialSiteCode, IsAnalysisCreate = latestTask.IsAnalysisCreate, IsSelfAnalysis = latestTask.IsSelfAnalysis, - + TrialReadingCriterionId = latestTask.TrialReadingCriterionId, IsNeedClinicalDataSign = latestTask.IsNeedClinicalDataSign, IsClinicalDataSign = latestTask.IsClinicalDataSign @@ -1409,31 +1409,35 @@ namespace IRaCIS.Core.Application.Service .Where(x => x.ClinicalDataTrialSet.UploadRole == UploadRole.PM || x.FileCount > 0) .Include(t => t.ReadingClinicalDataPDFList).Include(t => t.ClinicalDataTrialSet).ToList(); - - foreach (var clinicalData in clinicalDataList) + //防止多标准重复插入 + if (!_readingConsistentClinicalDataRepository.Any(t => t.SubjectId == subjectId)) { - var consistnentClinicalData = _mapper.Map(clinicalData); - var id = NewId.NextSequentialGuid(); - consistnentClinicalData.Id = id; - - if (consistnentClinicalData.ClinicalDataTrialSet.ClinicalUploadType == ClinicalUploadType.PDF) + foreach (var clinicalData in clinicalDataList) { - consistnentClinicalData.IsSign = false; - consistnentClinicalData.IsBlind = false; - consistnentClinicalData.IsComplete = true; - consistnentClinicalData.ReadingClinicalDataState = ReadingClinicalDataStatus.HaveUploaded; - consistnentClinicalData.ClinicalDataTrialSet = null; + var consistnentClinicalData = _mapper.Map(clinicalData); + var id = NewId.NextSequentialGuid(); + consistnentClinicalData.Id = id; + + if (consistnentClinicalData.ClinicalDataTrialSet.ClinicalUploadType == ClinicalUploadType.PDF) + { + consistnentClinicalData.IsSign = false; + consistnentClinicalData.IsBlind = false; + consistnentClinicalData.IsComplete = true; + consistnentClinicalData.ReadingClinicalDataState = ReadingClinicalDataStatus.HaveUploaded; + consistnentClinicalData.ClinicalDataTrialSet = null; + } + + var consistanClinicalDataPdfList = _mapper.Map>(clinicalData.ReadingClinicalDataPDFList); + + consistanClinicalDataPdfList.ForEach(t => { t.ReadingConsistentClinicalDataId = id; t.Id = Guid.Empty; }); + + consistnentClinicalData.ReadingClinicalDataPDFList = consistanClinicalDataPdfList; + + await _readingConsistentClinicalDataRepository.AddAsync(consistnentClinicalData); } - - var consistanClinicalDataPdfList = _mapper.Map>(clinicalData.ReadingClinicalDataPDFList); - - consistanClinicalDataPdfList.ForEach(t => { t.ReadingConsistentClinicalDataId = id; t.Id = Guid.Empty; }); - - consistnentClinicalData.ReadingClinicalDataPDFList = consistanClinicalDataPdfList; - - await _readingConsistentClinicalDataRepository.AddAsync(consistnentClinicalData); } + foreach (var task in generateTaskCommand.GenerataConsistentTaskList) {