Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8

IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs

@@ -729,11 +729,12 @@ namespace IRaCIS.Application.Services
         public async Task<(List<GetReadingClinicalDataListOutDto>, object)> GetReadingOrTaskClinicalDataList(GetReadingOrTaskClinicalDataListInDto inDto)
         {
             var readingNameOrTaskBlindName = string.Empty;
+            var subjectCode = string.Empty;
             if (inDto.ReadingId == null)
             {
                 var visitTask = await _visitTaskRepository.FirstOrDefaultAsync(x => x.Id == inDto.VisitTaskId);
-             
-                readingNameOrTaskBlindName = visitTask.TaskBlindName;
+                subjectCode=visitTask.BlindSubjectCode.IsNullOrEmpty() ? visitTask.Subject.Code : visitTask.BlindSubjectCode;
+                   readingNameOrTaskBlindName = visitTask.TaskBlindName;
             }
             inDto.SelectIsSign = false;
             var result = await GetClinicalDataList(inDto);
@@ -776,7 +777,7 @@ namespace IRaCIS.Application.Services
 
             return (result, new
             {
-                SubjectCode = await _subjectRepository.Where(x => x.Id == inDto.SubjectId).Select(x => x.Code).FirstOrDefaultAsync(),
+                SubjectCode = subjectCode,
                 ReadingNameOrTaskBlindName = readingNameOrTaskBlindName,
             });
         }