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

Merge branch 'Test_IRC_Net8' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test_IRC_Net8
continuous-integration/drone/push Build is passing Details

IRC_NewDev
hang 2024-09-26 14:22:05 +08:00
parent 033c47435f ea48967492
commit 45c74694f2
6 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
View File

@ -618,22 +618,24 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
{ {
if (dicomStudyId == null) if (dicomStudyId == null)
{ {
await _taskStudyRepository.BatchDeleteNoTrackingAsync(t => t.VisitTaskId == visitTaskId); await _taskStudyRepository.DeleteFromQueryAsync(t => t.VisitTaskId == visitTaskId);
await _taskSeriesRepository.BatchDeleteNoTrackingAsync(t => t.VisitTaskId == visitTaskId); await _taskSeriesRepository.BatchDeleteNoTrackingAsync(t => t.VisitTaskId == visitTaskId);
await _taskInstanceRepository.BatchDeleteNoTrackingAsync(t => t.VisitTaskId == visitTaskId); await _taskInstanceRepository.BatchDeleteNoTrackingAsync(t => t.VisitTaskId == visitTaskId);
} }
else else
{ {
await _taskStudyRepository.BatchDeleteNoTrackingAsync(t => t.VisitTaskId == visitTaskId && t.Id == dicomStudyId); await _taskStudyRepository.DeleteFromQueryAsync(t => t.VisitTaskId == visitTaskId && t.Id == dicomStudyId);
await _taskSeriesRepository.BatchDeleteNoTrackingAsync(t => t.VisitTaskId == visitTaskId && t.Id == dicomStudyId); await _taskSeriesRepository.BatchDeleteNoTrackingAsync(t => t.VisitTaskId == visitTaskId && t.Id == dicomStudyId);
await _taskInstanceRepository.BatchDeleteNoTrackingAsync(t => t.VisitTaskId == visitTaskId && t.Id == dicomStudyId); await _taskInstanceRepository.BatchDeleteNoTrackingAsync(t => t.VisitTaskId == visitTaskId && t.Id == dicomStudyId);
} }
} }
else else
{ {
await _noneDicomStudyFileReposiotry.BatchDeleteNoTrackingAsync(t => t.VisitTaskId == visitTaskId && t.OriginNoneDicomStudyId == noneDicomStudyId); await _noneDicomStudyFileReposiotry.DeleteFromQueryAsync(t => t.VisitTaskId == visitTaskId && t.OriginNoneDicomStudyId == noneDicomStudyId);
} }
await _noneDicomStudyFileReposiotry.SaveChangesAsync();
return ResponseOutput.Ok(); return ResponseOutput.Ok();
} }

6
IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
View File

@ -1621,6 +1621,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary> /// </summary>
public string FileType { get; set; } = string.Empty; public string FileType { get; set; } = string.Empty;
public ValueUnit? Unit { get; set; }
/// <summary> /// <summary>
/// 字典code /// 字典code
/// </summary> /// </summary>
@ -2084,6 +2086,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public dynamic Answer { get; set; } public dynamic Answer { get; set; }
public string Type { get; set; } = string.Empty;
public ValueUnit? Unit { get; set; }
public JudgeReadingQuestionType QuestionType { get; set; } = JudgeReadingQuestionType.Question; public JudgeReadingQuestionType QuestionType { get; set; } = JudgeReadingQuestionType.Question;
} }

1
IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingCriterionService.cs
View File

@ -671,6 +671,7 @@ namespace IRaCIS.Core.Application.Service.RC
switch (criterion.CriterionType) switch (criterion.CriterionType)
{ {
case CriterionType.IVUS: case CriterionType.IVUS:
criterion.IsReadingPeriod = false;
criterion.IsImageFilter = false; criterion.IsImageFilter = false;
criterion.IsReadingTaskViewInOrder = ReadingOrder.SubjectRandom; criterion.IsReadingTaskViewInOrder = ReadingOrder.SubjectRandom;
criterion.ImageDownloadEnum = ReadingImageDownload.Subejct; criterion.ImageDownloadEnum = ReadingImageDownload.Subejct;

2
IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs
View File

@ -301,6 +301,7 @@ namespace IRaCIS.Core.Application.Service
LimitEdit = y.LimitEdit, LimitEdit = y.LimitEdit,
MaxAnswerLength = y.MaxAnswerLength, MaxAnswerLength = y.MaxAnswerLength,
FileType = y.FileType, FileType = y.FileType,
Unit=y.Unit,
QuestionGenre = y.QuestionGenre, QuestionGenre = y.QuestionGenre,
ShowOrder = y.ShowOrder, ShowOrder = y.ShowOrder,
DictionaryCode = y.DictionaryCode, DictionaryCode = y.DictionaryCode,
@ -390,6 +391,7 @@ namespace IRaCIS.Core.Application.Service
DictionaryCode = lr.question.DictionaryCode, DictionaryCode = lr.question.DictionaryCode,
GlobalReadingShowType = lr.question.GlobalReadingShowType, GlobalReadingShowType = lr.question.GlobalReadingShowType,
Type = lr.question.Type, Type = lr.question.Type,
Unit = lr.question.Unit,
GlobalAnswerType = GlobalAnswerType.Question, GlobalAnswerType = GlobalAnswerType.Question,
AnswerGroup = lr.question.AnswerGroup, AnswerGroup = lr.question.AnswerGroup,
AnswerCombination = lr.question.AnswerCombination, AnswerCombination = lr.question.AnswerCombination,

14
IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs
View File

@ -161,6 +161,8 @@ namespace IRaCIS.Core.Application.Service
.Select(x => new GlobalVisitJudgeQuestion() .Select(x => new GlobalVisitJudgeQuestion()
{ {
Answer = x.Answer, Answer = x.Answer,
Type= x.ReadingQuestionTrial.Type,
Unit= x.ReadingQuestionTrial.Unit,
ShowOrder = x.ReadingQuestionTrial.ShowOrder, ShowOrder = x.ReadingQuestionTrial.ShowOrder,
VisitTaskId = x.VisitTaskId, VisitTaskId = x.VisitTaskId,
QuestionId = x.ReadingQuestionTrial.Id, QuestionId = x.ReadingQuestionTrial.Id,
@ -174,6 +176,8 @@ namespace IRaCIS.Core.Application.Service
.Select(x => new GlobalVisitJudgeQuestion() .Select(x => new GlobalVisitJudgeQuestion()
{ {
Answer = x.Answer, Answer = x.Answer,
Type = x.ReadingQuestionTrial.Type,
Unit = x.ReadingQuestionTrial.Unit,
ShowOrder = x.ReadingQuestionTrial.ShowOrder, ShowOrder = x.ReadingQuestionTrial.ShowOrder,
VisitTaskId = x.VisitTaskId, VisitTaskId = x.VisitTaskId,
QuestionId = x.ReadingQuestionTrial.Id, QuestionId = x.ReadingQuestionTrial.Id,
@ -204,6 +208,8 @@ namespace IRaCIS.Core.Application.Service
.Select(x => new JudgeQuestion() .Select(x => new JudgeQuestion()
{ {
Answer = x.Answer, Answer = x.Answer,
Type = x.Type,
Unit = x.Unit,
QuestionId = x.QuestionId, QuestionId = x.QuestionId,
QuestionName = x.QuestionName, QuestionName = x.QuestionName,
QuestionGenre = x.QuestionGenre, QuestionGenre = x.QuestionGenre,
@ -223,6 +229,8 @@ namespace IRaCIS.Core.Application.Service
.Select(x => new JudgeQuestion() .Select(x => new JudgeQuestion()
{ {
Answer = x.Answer, Answer = x.Answer,
Type = x.Type,
Unit = x.Unit,
QuestionId = x.QuestionId, QuestionId = x.QuestionId,
QuestionName = x.QuestionName, QuestionName = x.QuestionName,
QuestionGenre = x.QuestionGenre, QuestionGenre = x.QuestionGenre,
@ -254,6 +262,8 @@ namespace IRaCIS.Core.Application.Service
.Select(x => new JudgeQuestion() .Select(x => new JudgeQuestion()
{ {
Answer = x.Answer, Answer = x.Answer,
Type = x.ReadingQuestionTrial.Type,
Unit = x.ReadingQuestionTrial.Unit,
QuestionId = x.ReadingQuestionTrial.Id, QuestionId = x.ReadingQuestionTrial.Id,
QuestionName = x.ReadingQuestionTrial.QuestionName.LanguageName(x.ReadingQuestionTrial.QuestionEnName, _userInfo.IsEn_Us), QuestionName = x.ReadingQuestionTrial.QuestionName.LanguageName(x.ReadingQuestionTrial.QuestionEnName, _userInfo.IsEn_Us),
QuestionGenre = x.ReadingQuestionTrial.QuestionGenre, QuestionGenre = x.ReadingQuestionTrial.QuestionGenre,
@ -302,6 +312,8 @@ namespace IRaCIS.Core.Application.Service
{ {
Answer = x.Answer, Answer = x.Answer,
Type = x.Type,
Unit = x.Unit,
QuestionId = x.QuestionId!.Value, QuestionId = x.QuestionId!.Value,
QuestionName = x.QuestionName, QuestionName = x.QuestionName,
QuestionGenre = x.QuestionGenre, QuestionGenre = x.QuestionGenre,
@ -342,6 +354,8 @@ namespace IRaCIS.Core.Application.Service
{ {
Answer = x.Answer, Answer = x.Answer,
Type = x.Type,
Unit = x.Unit,
QuestionId = x.QuestionId == null ? default(Guid) : x.QuestionId.Value, QuestionId = x.QuestionId == null ? default(Guid) : x.QuestionId.Value,
QuestionName = x.QuestionName, QuestionName = x.QuestionName,
QuestionGenre = x.QuestionGenre, QuestionGenre = x.QuestionGenre,

10
IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs
View File

@ -787,10 +787,6 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
// 斑块3-匹配动脉段最小FCT // 斑块3-匹配动脉段最小FCT
new ReadingCalculateData (){QuestionType=QuestionType.Plaque3MinFCT,GetDecimalNullFun=GetPlaque3MinFCT}, new ReadingCalculateData (){QuestionType=QuestionType.Plaque3MinFCT,GetDecimalNullFun=GetPlaque3MinFCT},
}; };
@ -985,7 +981,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
// 匹配动脉段最小FCT // 匹配动脉段最小FCT
tableAnswers.Add(new ReadingTableQuestionAnswer() tableAnswers.Add(new ReadingTableQuestionAnswer()
{ {
Answer = oCTFCTInfos.Count()==0? "0.00" : GetDigitPlacesData(oCTFCTInfos.Where(x => x.PlaqueNum == item).MinOrDefault(x => x.Data).ToString()), Answer = oCTFCTInfos.Where(x => x.PlaqueNum == item).Count()==0? "0.00" : GetDigitPlacesData(oCTFCTInfos.Where(x => x.PlaqueNum == item).MinOrDefault(x => x.Data).ToString()),
Id = NewId.NextGuid(), Id = NewId.NextGuid(),
QuestionId = patchDataStatisticsInfo.Id, QuestionId = patchDataStatisticsInfo.Id,
TrialId = inDto.TrialId, TrialId = inDto.TrialId,
@ -1011,7 +1007,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
// 脂质角度平均值 // 脂质角度平均值
tableAnswers.Add(new ReadingTableQuestionAnswer() tableAnswers.Add(new ReadingTableQuestionAnswer()
{ {
Answer = lipidAngleInfos.Count() == 0 ? "0.00" : GetDigitPlacesData(lipidAngleInfos.Where(x => x.PlaqueNum == item).Average(x => x.Data).ToString()), Answer = lipidAngleInfos.Where(x => x.PlaqueNum == item).Count() == 0 ? "0.00" : GetDigitPlacesData(lipidAngleInfos.Where(x => x.PlaqueNum == item).Average(x => x.Data).ToString()),
Id = NewId.NextGuid(), Id = NewId.NextGuid(),
QuestionId = patchDataStatisticsInfo.Id, QuestionId = patchDataStatisticsInfo.Id,
TrialId = inDto.TrialId, TrialId = inDto.TrialId,
@ -1024,7 +1020,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
// 脂质角度最大值 // 脂质角度最大值
tableAnswers.Add(new ReadingTableQuestionAnswer() tableAnswers.Add(new ReadingTableQuestionAnswer()
{ {
Answer = lipidAngleInfos.Count() == 0 ? "0.00" : GetDigitPlacesData(lipidAngleInfos.Where(x => x.PlaqueNum == item).MaxOrDefault(x => x.Data).ToString()), Answer = lipidAngleInfos.Where(x => x.PlaqueNum == item).Count() == 0 ? "0.00" : GetDigitPlacesData(lipidAngleInfos.Where(x => x.PlaqueNum == item).MaxOrDefault(x => x.Data).ToString()),
Id = NewId.NextGuid(), Id = NewId.NextGuid(),
QuestionId = patchDataStatisticsInfo.Id, QuestionId = patchDataStatisticsInfo.Id,
TrialId = inDto.TrialId, TrialId = inDto.TrialId,