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

@@ -528,9 +528,6 @@ namespace IRaCIS.Core.Application.Service
 
             var clinicalDataLevelList = await _clinicalDataTrialSetRepository.Where(x => x.TrialId == inDto.TrialId && x.IsConfirm && x.UploadRole == UploadRole.CRC && x.ClinicalUploadType == ClinicalUploadType.Structuring).Select(x => x.ClinicalDataLevel).Distinct().ToListAsync();
 
-            var existsCRCStructuring = clinicalDataLevelList.Any(x=>x== ClinicalLevel.OncologyRead|| x == ClinicalLevel.ImageRead);
-
-
             ReadingSetType? readingSetType = null;
             if (clinicalDataLevelList.Contains(ClinicalLevel.ImageRead) && !clinicalDataLevelList.Contains(ClinicalLevel.OncologyRead))
             {
@@ -543,7 +540,6 @@ namespace IRaCIS.Core.Application.Service
 
 
             var query = _readModuleRepository.Where(x => x.TrialId == inDto.TrialId)
-                .Where(x=> existsCRCStructuring)
                 .WhereIf(inDto.ReadModuleId==null,x=>x.TrialReadingCriterion.IsConfirm)
                 .WhereIf(inDto.ReadModuleId != null, x => x.Id == inDto.ReadModuleId)
                 .WhereIf(inDto.IsCRCConfirm != null, x => x.IsCRCConfirm == inDto.IsCRCConfirm)

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("F" + inDto.DigitPlaces.ToString());
+                                    item.Answer = decimal.Round(decimal.Parse(item.Answer ?? "0"), inDto.DigitPlaces).ToString();
                                 }
                             }
                             catch (Exception)

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("F" + inDto.DigitPlaces.ToString());
+                                item.Answer = decimal.Round(decimal.Parse(item.Answer.IsNullOrEmpty() ? "0": item.Answer), 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("F" + inDto.DigitPlaces.ToString());
+                                    item.Answer = decimal.Round(decimal.Parse(item.Answer ?? "0"), 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("F" + inDto.DigitPlaces.ToString());
+                                    item.Answer = decimal.Round(decimal.Parse(item.Answer ?? "0"), inDto.DigitPlaces).ToString();
                                 }
                             }
                             catch (Exception)