ivus oct 全量一致性核查过滤空检查

IRaCIS.Core.Application/MassTransit/Consumer/ConsistencyCheckConsumer.cs

@@ -320,7 +320,7 @@ namespace IRaCIS.Core.Application.MassTransit.Consumer
                              join study in _studyRepository.AsQueryable() on sv.Id equals study.SubjectVisitId
                              select new CheckDBModel()
                              {
-                                 SubjectStatus = sv.Subject.Status,
+                                  SubjectStatus = sv.Subject.Status,
                                  SubjectVisitId = sv.Id,
                                  SiteCode = sv.TrialSite.TrialSiteCode,
                                  StudyDate = study.StudyTime == null ? string.Empty : ((DateTime)study.StudyTime).ToString("yyyy-MM-dd"),
@@ -332,7 +332,7 @@ namespace IRaCIS.Core.Application.MassTransit.Consumer
 
             var noneDicomQuey = from sv in _subjectVisitRepository.Where(subjectVisitLambda)
                                 join subject in _subjectRepository.AsQueryable() on sv.SubjectId equals subject.Id
-                                join noneDicomStudy in _noneDicomStudyRepository.AsQueryable() on sv.Id equals noneDicomStudy.SubjectVisitId
+                                join noneDicomStudy in _noneDicomStudyRepository.Where(t => t.FileCount > 0) on sv.Id equals noneDicomStudy.SubjectVisitId
                                 select new CheckDBModel()
                                 {
                                     SubjectStatus = sv.Subject.Status,

IRaCIS.Core.Application/Service/Common/Export/IVUS_OCTExportService.cs

@@ -147,6 +147,8 @@ public class IvusExportDto : IVUS_OCTBaseDto
 
     /// <summary>PAV (如无可不填)</summary>
     public string PAV { get; set; }
+
+    public string DOST { get; set; }
 }
 
 /// <summary>
@@ -154,6 +156,11 @@ public class IvusExportDto : IVUS_OCTBaseDto
 /// </summary>
 public class OctExportDto : IVUS_OCTBaseDto
 {
+    /// <summary>
+    /// 斑块到血管开口的距离
+    /// </summary>
+    public string DOST { get; set; }
+
     /// <summary>靶段</summary>
     public string TARGETV { get; set; }
 
@@ -444,6 +451,11 @@ public class IVUS_OCTExportService(IRepository<ReadingQuestionCriterionTrial> _r
 
                     ivus.PAV = findPAVLession?.LessionAnswerList.Where(t => t.QuestionMark == QuestionMark.PAV).FirstOrDefault()?.QuestionValue ?? string.Empty;
 
+
+                    ivus.DOST = findPAVLession?.LessionAnswerList.Where(t => t.QuestionMark == QuestionMark.PlaqueToOstiumDistance).FirstOrDefault()?.QuestionValue ?? string.Empty;
+
+                    
+
                     ivusList.Add(ivus);
 
                 }
@@ -785,6 +797,8 @@ public class IVUS_OCTExportService(IRepository<ReadingQuestionCriterionTrial> _r
         }
 
 
+        //    斑块到血管开口的距离 
+        oct.DOST = findLession?.LessionAnswerList.Where(t => t.QuestionMark == QuestionMark.PlaqueToOstiumDistance).FirstOrDefault()?.QuestionValue ?? string.Empty;
 
         //     匹配动脉段最小FCT 
         oct.MINFCT = findLession?.LessionAnswerList.Where(t => t.QuestionMark == QuestionMark.MiniMumFCT).FirstOrDefault()?.QuestionValue ?? string.Empty;

IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs

@@ -937,7 +937,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                 //存在ivus 和oct 这两种的项目
                 if (_readingQuestionCriterionTrialRepository.Where(t => t.TrialId == info.TrialId &&
                 (t.CriterionType == CriterionType.IVUS || t.CriterionType == CriterionType.OCT)).Distinct().Count() == 2
-                && !_noneDicomStudyReposiotry.Any(t => t.SubjectId == inQuery.SubjectId && t.Modality != "IVUS"))
+                && !_noneDicomStudyReposiotry.Any(t => t.SubjectId == inQuery.SubjectId && t.Modality == "IVUS"))
                 {
                     #region ivus 自动创建非dicom检查
 

IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs

@@ -2453,8 +2453,10 @@ namespace IRaCIS.Core.Domain.Share
         /// </summary>
         LumenAreaMeasurement = 1030,
 
-
+        /// <summary>
-
+        /// 斑块到血管开口的距离
+        /// </summary>
+        PlaqueToOstiumDistance=1031,
 
         /// <summary>
         /// 第一次测量