修改反馈bug

2023-06-19 18:01:03 +08:00
parent 8a006a3f11
commit b97ba40660
4 changed files with 21 additions and 4 deletions
@@ -409,8 +409,9 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc

            var result = new List<VerifyStudyUploadResult>();

-            var visitList = _repository.Where<SubjectVisit>(t => t.SubjectId == verifyInfo.SubjectId).Select(t => new { t.VisitNum, t.EarliestScanDate, t.LatestScanDate, t.Id }).ToList();
+            var visitList = _repository.Where<SubjectVisit>(t => t.SubjectId == verifyInfo.SubjectId).Select(t => new { t.VisitNum, t.Subject.VisitOverTime, t.EarliestScanDate, t.LatestScanDate, t.Id }).ToList();

+            var visitOverTime = visitList.Select(t=>t.VisitOverTime).FirstOrDefault();

            verifyInfo.StudyInstanceUidList.ForEach(waitUploadItem =>
            {
@@ -418,6 +419,12 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                if (trialInfo.IsVerifyVisitImageDate)
                {

+                    if(visitOverTime!= null && waitUploadItem.StudyDate != null && waitUploadItem.StudyDate> visitOverTime)
+                    {
+                        result.Add(new VerifyStudyUploadResult() { ErrorMesseage = $"当前检查批次检查时间{waitUploadItem.StudyDate?.ToString("yyyy-MM-dd")}不能晚于患者访视检查结束日期{visitOverTime?.ToString("yyyy-MM-dd")}，请核对检查数据是否有误", StudyInstanceUid = waitUploadItem.StudyInstanceUid });
+                        return;
+                    }
+
                    //小于当前检查批次 最近的最晚拍片
                    var before = visitList.Where(u => u.VisitNum < verifyInfo.VisitNum).Max(k => k.LatestScanDate);

@@ -435,6 +442,9 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                        result.Add(new VerifyStudyUploadResult() { ErrorMesseage = $"当前检查批次检查时间{waitUploadItem.StudyDate?.ToString("yyyy-MM-dd")}不能晚于该检查批次之后的检查时间{after?.ToString("yyyy-MM-dd")}，请核对检查数据是否有误", StudyInstanceUid = waitUploadItem.StudyInstanceUid });
                        return;
                    }
+
+
+                    
                }

                var temp = VerifyStudyUpload(waitUploadItem.StudyInstanceUid, verifyInfo.TrialId, verifyInfo.SubjectVisitId, verifyInfo.SubjectId);