Merge branch 'Test.IRC' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test.IRC

IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalQuestionService.cs

@@ -121,9 +121,23 @@ namespace IRaCIS.Core.Application.Service
             var questions = await _systemClinicalQuestionRepository.Where(x => x.SystemClinicalId == inDto.SystemClinicalId)
                 .ProjectTo<ClinicalQuestionPreviewDto>(_mapper.ConfigurationProvider).OrderBy(x => x.ShowOrder).ToListAsync();
 
+            if (_userInfo.IsEn_Us)
+            {
+                questions.ForEach(x => {
+                    x.GroupName = x.GroupEnName;
+                    x.QuestionName = x.QuestionEnName;
+                });
+            }
             var tableQuestions= await _systemClinicalTableQuestionRepository.Where(x => x.SystemClinicalId == inDto.SystemClinicalId)
                 .ProjectTo<ClinicalTablePreviewDto>(_mapper.ConfigurationProvider).OrderBy(x => x.ShowOrder).ToListAsync();
 
+
+            if (_userInfo.IsEn_Us)
+            {
+                tableQuestions.ForEach(x => {
+                    x.QuestionName = x.QuestionEnName;
+                });
+            }
             questions.ForEach(x => x.CreateTime = null);
             var result = questions.Where(x => x.ClinicalQuestionType == ReadingQestionType.Group).ToList();
 
@@ -147,9 +161,25 @@ namespace IRaCIS.Core.Application.Service
             var questions = await _trialClinicalQuestionRepository.Where(x => x.TrialClinicalId == inDto.TrialClinicalId)
                 .ProjectTo<ClinicalQuestionPreviewDto>(_mapper.ConfigurationProvider).OrderBy(x=>x.ShowOrder).ToListAsync();
           
+            if (_userInfo.IsEn_Us)
+            {
+                questions.ForEach(x => {
+                    x.GroupName = x.GroupEnName;
+                    x.QuestionName = x.QuestionEnName;
+                });
+            }
+
+
             var tableQuestions = await _trialClinicalTableQuestionRepository.Where(x => x.TrialClinicalId == inDto.TrialClinicalId)
                 .ProjectTo<ClinicalTablePreviewDto>(_mapper.ConfigurationProvider).OrderBy(x => x.ShowOrder).ToListAsync();
 
+            if (_userInfo.IsEn_Us)
+            {
+                tableQuestions.ForEach(x => {
+                    x.QuestionName = x.QuestionEnName;
+                });
+            }
+
             questions.ForEach(x => x.CreateTime = null);
             var result = questions.Where(x => x.ClinicalQuestionType == ReadingQestionType.Group).OrderBy(x => x.ShowOrder).ToList();
 

IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingOncologyTaskService.cs

@@ -78,8 +78,10 @@ namespace IRaCIS.Application.Services
               x.TaskState == TaskState.Effect &&
               x.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId &&
               x.ReadingCategory == ReadingCategory.Global &&
+              x.IsAnalysisCreate == taskInfo.IsAnalysisCreate &&
+              x.IsSelfAnalysis == taskInfo.IsSelfAnalysis &&
               x.VisitTaskNum < taskInfo.VisitTaskNum
-              ).OrderByDescending(x => x.VisitTaskNum)
+              ).OrderBy(x => x.ArmEnum)
               .FirstNotNullAsync();
             }
 

IRaCIS.Core.Application/Service/Reading/_MapConfig.cs

@@ -50,7 +50,9 @@ namespace IRaCIS.Core.Application.Service
 
             // 预览
             CreateMap<TrialClinicalQuestion, ClinicalQuestionPreviewDto>();
+
             CreateMap<SystemClinicalQuestion, ClinicalQuestionPreviewDto>();
+                
             CreateMap<SystemClinicalTableQuestion, ClinicalTablePreviewDto>();
             CreateMap<TrialClinicalTableQuestion, ClinicalTablePreviewDto>();
             #endregion

IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs

@@ -711,7 +711,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
                                 if (valueOfTypes.Contains(item.ValueType))
                                 {
-                                    item.Answer = decimal.Round(decimal.Parse(item.Answer ?? "0"), inDto.DigitPlaces).ToString();
+                                    item.Answer = decimal.Round(decimal.Parse(item.Answer ?? "0"), inDto.DigitPlaces).ToString("F" + inDto.DigitPlaces.ToString());
                                 }
                             }
                             catch (Exception)

IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs

@@ -671,7 +671,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
                                 if (valueOfTypes.Contains(item.ValueType))
                                 {
-                                    item.Answer = decimal.Round(decimal.Parse(item.Answer ?? "0"), inDto.DigitPlaces).ToString();
+                                    item.Answer = decimal.Round(decimal.Parse(item.Answer ?? "0"), inDto.DigitPlaces).ToString("F"+ inDto.DigitPlaces.ToString());
                                 }
                             }
                             catch (Exception)
@@ -1725,6 +1725,11 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
             var taskinfo = await _visitTaskRepository.Where(x => x.Id == visitTaskId).FirstNotNullAsync();
             ReadingCalculateDto inDto = await _generalCalculateService.GetReadingCalculateDto(visitTaskId);
 
+            if (spleenLength == 0)
+            {
+                return SpleenAssessment.NotEvaluable.GetEnumInt();
+            }
+
             if (inDto.IsBaseLine)
             {
                 if (spleenLength <= 130)
@@ -1737,10 +1742,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 }
             
             }
-            if (spleenLength == 0)
+           
-            {
-                return SpleenAssessment.NotEvaluable.GetEnumInt();
-            }
 
             #region 最低
             var visitTaskIds = await _visitTaskRepository.Where(x => x.ReadingCategory == ReadingCategory.Visit &&
@@ -1974,7 +1976,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
             //无需标记，自主选择
             else
             {
-                result = PET5PSScore.One;
+                return string.Empty;
             }
             return result.GetEnumInt();
         }

IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs

@@ -649,7 +649,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
                             if (valueOfTypes.Contains(item.ValueType))
                             {
-                                item.Answer = decimal.Round(decimal.Parse(item.Answer.IsNullOrEmpty() ? "0": item.Answer), inDto.DigitPlaces).ToString();
+                                item.Answer = decimal.Round(decimal.Parse(item.Answer.IsNullOrEmpty() ? "0": item.Answer), inDto.DigitPlaces).ToString("F" + inDto.DigitPlaces.ToString());
                             }
                         }
                         catch (Exception)

IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs

@@ -549,7 +549,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
                                 if (valueOfTypes.Contains(item.ValueType))
                                 {
-                                    item.Answer = decimal.Round(decimal.Parse(item.Answer ?? "0"), inDto.DigitPlaces).ToString();
+                                    item.Answer = decimal.Round(decimal.Parse(item.Answer ?? "0"), inDto.DigitPlaces).ToString("F" + inDto.DigitPlaces.ToString());
                                 }
                             }
                             catch (Exception)

IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs

@@ -545,7 +545,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
                                 if (valueOfTypes.Contains(item.ValueType))
                                 {
-                                    item.Answer = decimal.Round(decimal.Parse(item.Answer ?? "0"), inDto.DigitPlaces).ToString();
+                                    item.Answer = decimal.Round(decimal.Parse(item.Answer ?? "0"), inDto.DigitPlaces).ToString("F" + inDto.DigitPlaces.ToString());
                                 }
                             }
                             catch (Exception)