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

@@ -729,12 +729,11 @@ 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);
-                subjectCode=visitTask.BlindSubjectCode.IsNullOrEmpty() ? visitTask.Subject.Code : visitTask.BlindSubjectCode;
+             
-                   readingNameOrTaskBlindName = visitTask.TaskBlindName;
+                readingNameOrTaskBlindName = visitTask.TaskBlindName;
             }
             inDto.SelectIsSign = false;
             var result = await GetClinicalDataList(inDto);
@@ -777,7 +776,7 @@ namespace IRaCIS.Application.Services
 
             return (result, new
             {
-                SubjectCode = subjectCode,
+                SubjectCode = await _subjectRepository.Where(x => x.Id == inDto.SubjectId).Select(x => x.Code).FirstOrDefaultAsync(),
                 ReadingNameOrTaskBlindName = readingNameOrTaskBlindName,
             });
         }