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
///
///
///
- ///
///
- [HttpGet, Route("{trialId:guid}/{sujectVisitId:guid}/{isReading}")]
+ [HttpGet, Route("{trialId:guid}/{sujectVisitId:guid}")]
[AllowAnonymous]
- public async Task> GetReadingVisitStudyList(Guid trialId, Guid sujectVisitId, int isReading)
+ public async Task> GetReadingVisitStudyList(Guid trialId, Guid sujectVisitId)
{
var studyList = await _repository.Where(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(s => s.StudyId == t.StudyId)
- .WhereIf(isReading == 1, s => s.IsReading).OrderBy(s => s.SeriesNumber).
+ t.SeriesList = await _repository.Where(s => s.StudyId == t.StudyId&&s.IsReading).OrderBy(s => s.SeriesNumber).
ThenBy(s => s.SeriesTime)
.ProjectTo(_mapper.ConfigurationProvider).ToListAsync();