From 57d7e4c9c61413cc1cb50e4149d4accd27340e4d Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Wed, 9 Nov 2022 15:15:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Reading/ReadingImageTask/ReadingImageTaskService.cs   | 4 ++--
 .../Service/Visit/SubjectVisitService.cs                  | 8 +++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
index 9332c87d5..42502dcf7 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
@@ -799,7 +799,7 @@ namespace IRaCIS.Application.Services
                 if (item.MeasureData != null && item.MeasureData != string.Empty)
                 {
                     dynamic measureData = JObject.Parse(item.MeasureData);
-                    measureData.data.remark = item.ReadingQuestionTrial + ((decimal)index).GetLesionMark();
+                    measureData.data.remark = item.ReadingQuestionTrial.OrderMark + ((decimal)index).GetLesionMark();
                     measureDataStr = JsonConvert.SerializeObject(measureData);
                 }
                
@@ -821,7 +821,7 @@ namespace IRaCIS.Application.Services
                     if (spiltitem.MeasureData != null && spiltitem.MeasureData != string.Empty)
                     {
                         dynamic spiltmeasureData = JObject.Parse(spiltitem.MeasureData);
-                        spiltmeasureData.data.remark = item.ReadingQuestionTrial + ((decimal)index + spiltindex).GetLesionMark();
+                        spiltmeasureData.data.remark = item.ReadingQuestionTrial.OrderMark + ((decimal)index + spiltindex).GetLesionMark();
                          spiltmeasureDataStr = JsonConvert.SerializeObject(spiltmeasureData);
                     }
                     await _readingTableQuestionAnswerRepository.BatchUpdateNoTrackingAsync(x => x.VisitTaskId == inDto.VisitTaskId && x.RowIndex == spiltitem.RowIndex && x.QuestionId == inDto.QuestionId, x => new ReadingTableQuestionAnswer()
diff --git a/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs b/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs
index bdff22e97..a86a52bb8 100644
--- a/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs
+++ b/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs
@@ -230,11 +230,10 @@ namespace IRaCIS.Core.Application.Services
         /// </summary>
         /// <param name="trialId"></param>
         /// <param name="sujectVisitId"></param>
-        /// <param name="isReading"></param>
         /// <returns></returns>
-        [HttpGet, Route("{trialId:guid}/{sujectVisitId:guid}/{isReading}")]
+        [HttpGet, Route("{trialId:guid}/{sujectVisitId:guid}")]
         [AllowAnonymous]
-        public async Task<List<VisitStudyDTO>> GetReadingVisitStudyList(Guid trialId, Guid sujectVisitId, int isReading)
+        public async Task<List<VisitStudyDTO>> GetReadingVisitStudyList(Guid trialId, Guid sujectVisitId)
         {
             var studyList = await _repository.Where<DicomStudy>(t => t.TrialId == trialId && t.SubjectVisitId == sujectVisitId).Select(k => new VisitStudyDTO()
             {
@@ -252,8 +251,7 @@ namespace IRaCIS.Core.Application.Services
 
             foreach (var t in studyList)
             {
-                t.SeriesList = await _repository.Where<DicomSeries>(s => s.StudyId == t.StudyId)
-               .WhereIf(isReading == 1, s => s.IsReading).OrderBy(s => s.SeriesNumber).
+                t.SeriesList = await _repository.Where<DicomSeries>(s => s.StudyId == t.StudyId&&s.IsReading).OrderBy(s => s.SeriesNumber).
                ThenBy(s => s.SeriesTime)
                .ProjectTo<DicomSeriesDTO>(_mapper.ConfigurationProvider).ToListAsync();