修改

2024-03-20 13:16:35 +08:00
parent 045e9346ad
commit 8f08746377
2 changed files with 41 additions and 3 deletions
@@ -612,7 +612,22 @@ namespace IRaCIS.Application.Services
                result = result.Where(x => x.VisitTaskId == inDto.VisitTaskId).ToList();
            }

-            foreach (var item in result)
+
+            var visitaskIds = result.Select(x => x.VisitTaskId).ToList();
+
+            var otherStudys = await _readingTableAnswerRowInfoRepository.Where(x => visitaskIds.Contains(x.VisitTaskId))
+                .Where(x=>x.CTSeriesId!=null&&x.PTSeriesId!=null)
+                .Select(x => new
+                {
+                    x.OtherStudyId,
+                    x.CTSeriesId,
+                    x.PTSeriesId,
+                    x.VisitTaskId,
+                    x.UpdateTime
+                }).ToListAsync();
+
+
+			foreach (var item in result)
            {
                var clinicalDataList = await _readingClinicalDataService.GetClinicalDataList(new GetReadingOrTaskClinicalDataListInDto()
                {
@@ -623,7 +638,15 @@ namespace IRaCIS.Application.Services
                });

                item.IsExistsClinicalData = clinicalDataList.Count > 0;
-            }
+                var otherStudy = otherStudys.Where(x => x.VisitTaskId == item.VisitTaskId).OrderByDescending(x => x.UpdateTime).FirstOrDefault();
+                if (otherStudy != null)
+                {
+                    item.PTSeriesId = otherStudy.PTSeriesId;
+                    item.CTSeriesId = otherStudy.CTSeriesId;
+                    item.OtherStudyId = otherStudy.OtherStudyId;
+                }
+
+			}