diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs index e9bd95bf0..9332c87d5 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs @@ -795,10 +795,14 @@ namespace IRaCIS.Application.Services foreach (var item in rowInfoList.Where(x => x.RowIndex % 1 == 0)) { - - dynamic measureData = JObject.Parse(item.MeasureData); - measureData.data.remark =item.ReadingQuestionTrial+((decimal)index).GetLesionMark(); - string measureDataStr = JsonConvert.SerializeObject(measureData); + string measureDataStr = string.Empty; + if (item.MeasureData != null && item.MeasureData != string.Empty) + { + dynamic measureData = JObject.Parse(item.MeasureData); + measureData.data.remark = item.ReadingQuestionTrial + ((decimal)index).GetLesionMark(); + measureDataStr = JsonConvert.SerializeObject(measureData); + } + await _readingTableQuestionAnswerRepository.BatchUpdateNoTrackingAsync(x => x.VisitTaskId == inDto.VisitTaskId && x.RowIndex == item.RowIndex && x.QuestionId == inDto.QuestionId, x => new ReadingTableQuestionAnswer() { @@ -813,11 +817,13 @@ namespace IRaCIS.Application.Services decimal spiltindex = 0.01M; foreach (var spiltitem in spiltList) { - - dynamic spiltmeasureData = JObject.Parse(spiltitem.MeasureData); - spiltmeasureData.data.remark = item.ReadingQuestionTrial + ((decimal)index + spiltindex).GetLesionMark(); - string spiltmeasureDataStr = JsonConvert.SerializeObject(spiltmeasureData); - + string spiltmeasureDataStr = string.Empty; + if (spiltitem.MeasureData != null && spiltitem.MeasureData != string.Empty) + { + dynamic spiltmeasureData = JObject.Parse(spiltitem.MeasureData); + spiltmeasureData.data.remark = item.ReadingQuestionTrial + ((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() { RowIndex = index + spiltindex