Merge branch 'Test_IRC_Net8' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test_IRC_Net8

2024-01-22 16:16:06 +08:00
parent 4c17101e27 0c1b3b0175
commit de72cdb61a
32 changed files with 143 additions and 67 deletions
@@ -163,7 +163,8 @@ namespace IRaCIS.Core.Application.Helper
                    var putObjectArgs = new PutObjectArgs()
                           .WithBucket(minIOConfig.bucketName)
                           .WithObject(ossRelativePath)
-                           .WithStreamData(memoryStream);
+                           .WithStreamData(memoryStream)
+                           .WithObjectSize(memoryStream.Length);

                    await minioClient.PutObjectAsync(putObjectArgs);
                }
@@ -179,7 +180,8 @@ namespace IRaCIS.Core.Application.Helper
                    var putObjectArgs = new PutObjectArgs()
                           .WithBucket(minIOConfig.bucketName)
                           .WithObject(ossRelativePath)
-                           .WithStreamData(memoryStream);
+                           .WithStreamData(memoryStream)
+                           .WithObjectSize(memoryStream.Length);

                    await minioClient.PutObjectAsync(putObjectArgs);
                }
@@ -12057,6 +12057,27 @@
              因为可能先一致性核查通过，生成其他标准的任务了，新签名的标准也需要产生任务
            </summary>
        </member>
+        <member name="M:IRaCIS.Core.Application.Triggers.VisitTaskIbeforeTrigger.AfterSave(EntityFrameworkCore.Triggered.ITriggerContext{IRaCIS.Core.Domain.Models.VisitTask},System.Threading.CancellationToken)">
+            <summary>
+            因为维护状态先后顺序导致  裁判任务关联的 任务上的JudgeVisitTaskId==nulll  在这里需要重新设置下
+            
+            比如： 申请裁判任务重阅，事务里面本来设置了任务上的裁判id,但是因为下面的逻辑，导致设置的值又被清理了，只能重新设置下  
+            </summary>
+            <param name="context"></param>
+            <param name="cancellationToken"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Triggers.VisitTaskIbeforeTrigger.BeforeSave(EntityFrameworkCore.Triggered.ITriggerContext{IRaCIS.Core.Domain.Models.VisitTask},System.Threading.CancellationToken)">
+            <summary>
+            比如  两个任务产生了裁判，然后其中一个人申请了重阅，影响了裁判，需要清理之前任务的上裁判id
+            
+            
+            因为申请重阅，退回，里面分有序，无序，情况太多，所以不在那块逻辑修改，不然得加多个地方处理，在这里统一处理
+            </summary>
+            <param name="context"></param>
+            <param name="cancellationToken"></param>
+            <returns></returns>
+        </member>
        <member name="T:IRaCIS.Core.Application.Triggers.VisitTaskIsFrontTaskNeedSignButNotSignTrigger">
            <summary>
             维护 IsFrontTaskNeedSignButNotSign 字段   另外附加评估结果
@@ -79,7 +79,7 @@ namespace IRaCIS.Application.Services
                    return ResponseOutput.NotOk(_localizer["Doctor_DupEmail"], new DoctorBasicInfoCommand());
                }

-                doctor.Code = (await _doctorRepository.MaxAsync(t => t.Code)) + 1;
+                doctor.Code = await _doctorRepository.Select(t => t.Code).DefaultIfEmpty().MaxAsync() + 1;

                doctor.ReviewerCode = AppSettings.GetCodeStr(doctor.Code, nameof(Doctor));

@@ -181,6 +181,8 @@ namespace IRaCIS.Core.Application.Contracts
 		public string? Uploader { get; set; }

 		public bool? IsSuccess { get; set; }
+
+        public string? StudyCode { get; set; }
 	}


@@ -245,6 +245,8 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc

                    var study = await _dicomstudyRepository.FirstOrDefaultAsync(t => t.Id == studyId);

+                    //重传的时候也要赋值检查Id
+                    studyMonitor.StudyId = study.Id;

                    //特殊处理逻辑
                    study.Modalities = string.Join("、", incommand.Study.SeriesList.Select(t => t.Modality).Union(study.Modalities.Split("、", StringSplitOptions.RemoveEmptyEntries)).Distinct());
@@ -461,10 +463,11 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                 .WhereIf(studyQuery.SubjectId != null, t => t.SubjectId == studyQuery.SubjectId)
                 .WhereIf(studyQuery.SubjectVisitId != null, t => t.SubjectId == studyQuery.SubjectVisitId)
                 .WhereIf(studyQuery.SiteId != null, t => t.SiteId == studyQuery.SiteId)
-					.WhereIf(studyQuery.IsDicom != null, t => t.IsDicom == studyQuery.IsDicom )
-					 .WhereIf(!string.IsNullOrWhiteSpace(studyQuery.Uploader), t => t.Uploader.UserName.Contains(studyQuery.Uploader))
-					 .WhereIf(studyQuery.IsSuccess != null, t => t.IsSuccess == studyQuery.IsSuccess)
-				 .Select(t => new UnionStudyMonitorModel()
+				 .WhereIf(studyQuery.IsDicom != null, t => t.IsDicom == studyQuery.IsDicom )
+				 .WhereIf(!string.IsNullOrWhiteSpace(studyQuery.Uploader), t => t.Uploader.UserName.Contains(studyQuery.Uploader))
+				 .WhereIf(studyQuery.IsSuccess != null, t => t.IsSuccess == studyQuery.IsSuccess)
+                 .WhereIf(!string.IsNullOrWhiteSpace(studyQuery.StudyCode), t => t.StudyCode.Contains(studyQuery.StudyCode))
+                 .Select(t => new UnionStudyMonitorModel()
                 {
                     TrialId = t.TrialId,
                     SiteId = t.SiteId,
@@ -62,6 +62,7 @@ namespace IRaCIS.Core.Application.Service
                .ForMember(o => o.UploadedTime, t => t.MapFrom(u => u.CreateTime))
                .ForMember(o => o.Uploader, t => t.MapFrom(u => u.Uploader.LastName + " / " + u.Uploader.FirstName))
                .ForMember(o => o.StudyId, t => t.MapFrom(u => u.Id))
+                 .ForMember(o => o.IsHaveUploadFailed, t => t.MapFrom(u => u.DicomStudyMonitorList.Any(t=>t.FailedFileCount>0)))
                .ForMember(o => o.Modalities, t => t.MapFrom(u => string.Join('、', u.SeriesList.Select(t => t.Modality).Distinct()) ));


@@ -67,7 +67,7 @@ namespace IRaCIS.Application.Services

                    siteCommand.Code = await _siteRepository.Select(t => t.Code).DefaultIfEmpty().MaxAsync() + 1;

-                    siteCommand.SiteCode = AppSettings.GetCodeStr(siteCommand.Code, nameof(User));
+                    siteCommand.SiteCode = AppSettings.GetCodeStr(siteCommand.Code, nameof(Site));
                }

                var site = await _siteRepository.InsertOrUpdateAsync(siteCommand, true, exp);
@@ -386,7 +386,7 @@ namespace IRaCIS.Core.Application.Contracts.DTO

        public string ModalityForEdit { get; set; } = string.Empty;

-
+        public bool IsHaveUploadFailed { get; set; }
    }

    public class QASeriesInfoDto
@@ -1095,6 +1095,8 @@ namespace IRaCIS.Core.Application.Contracts
        public int? Age { get; set; }
        public string Sex { get; set; } = string.Empty;

+        public bool IsHaveUploadFailed { get; set; }
+
    }


@@ -395,6 +395,8 @@ namespace IRaCIS.Core.Application.Service
                 || t.ReadingClinicalDataList.Any(x => x.ClinicalDataTrialSet.UploadRole == Domain.Share.UploadRole.CRC && x.ReadingClinicalDataPDFList.Count > 0)
                 || t.PreviousSurgeryList.Any()))

+                   .ForMember(d => d.IsHaveUploadFailed, u => u.MapFrom(t => t.StudyList.SelectMany(c=>c.DicomStudyMonitorList).Any(h => h.FailedFileCount>0) ))
+                 
                  //.ForMember(d => d.VisitName, u => u.MapFrom(t =>t.InPlan? t.VisitStage.VisitName : t.VisitName))
                  //.ForMember(d => d.VisitNum, u => u.MapFrom(t => t.InPlan ? t.VisitStage.VisitNum : t.VisitNum))
                  //.ForMember(d => d.VisitDay, u => u.MapFrom(t => t.InPlan ? t.VisitStage.VisitDay : t.VisitDay))