XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改

Uat_Study
he 2022-11-09 15:15:07 +08:00
parent 8bbc1d21e3
commit 57d7e4c9c6
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
View File

@ -799,7 +799,7 @@ namespace IRaCIS.Application.Services
if (item.MeasureData != null && item.MeasureData != string.Empty) if (item.MeasureData != null && item.MeasureData != string.Empty)
{ {
dynamic measureData = JObject.Parse(item.MeasureData); 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); measureDataStr = JsonConvert.SerializeObject(measureData);
} }
@ -821,7 +821,7 @@ namespace IRaCIS.Application.Services
if (spiltitem.MeasureData != null && spiltitem.MeasureData != string.Empty) if (spiltitem.MeasureData != null && spiltitem.MeasureData != string.Empty)
{ {
dynamic spiltmeasureData = JObject.Parse(spiltitem.MeasureData); 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); spiltmeasureDataStr = JsonConvert.SerializeObject(spiltmeasureData);
} }
await _readingTableQuestionAnswerRepository.BatchUpdateNoTrackingAsync(x => x.VisitTaskId == inDto.VisitTaskId && x.RowIndex == spiltitem.RowIndex && x.QuestionId == inDto.QuestionId, x => new ReadingTableQuestionAnswer() await _readingTableQuestionAnswerRepository.BatchUpdateNoTrackingAsync(x => x.VisitTaskId == inDto.VisitTaskId && x.RowIndex == spiltitem.RowIndex && x.QuestionId == inDto.QuestionId, x => new ReadingTableQuestionAnswer()

8
IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs
View File

@ -230,11 +230,10 @@ namespace IRaCIS.Core.Application.Services
/// </summary> /// </summary>
/// <param name="trialId"></param> /// <param name="trialId"></param>
/// <param name="sujectVisitId"></param> /// <param name="sujectVisitId"></param>
/// <param name="isReading"></param>
/// <returns></returns> /// <returns></returns>
[HttpGet, Route("{trialId:guid}/{sujectVisitId:guid}/{isReading}")] [HttpGet, Route("{trialId:guid}/{sujectVisitId:guid}")]
[AllowAnonymous] [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() 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) foreach (var t in studyList)
{ {
t.SeriesList = await _repository.Where<DicomSeries>(s => s.StudyId == t.StudyId) t.SeriesList = await _repository.Where<DicomSeries>(s => s.StudyId == t.StudyId&&s.IsReading).OrderBy(s => s.SeriesNumber).
.WhereIf(isReading == 1, s => s.IsReading).OrderBy(s => s.SeriesNumber).
ThenBy(s => s.SeriesTime) ThenBy(s => s.SeriesTime)
.ProjectTo<DicomSeriesDTO>(_mapper.ConfigurationProvider).ToListAsync(); .ProjectTo<DicomSeriesDTO>(_mapper.ConfigurationProvider).ToListAsync();