IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -8729,11 +8729,6 @@
             IVUS测量值导入
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.IVUSMeasuredValue.FrameNumber">
-            <summary>
-            帧数
-            </summary>
-        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.IVUSMeasuredValue.Emm">
             <summary>
             外弹力膜面积Emm
@@ -8749,11 +8744,6 @@
             外弹力膜面积- 管腔面积
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.OCTFCTUploadData.FrameNumber">
-            <summary>
-            帧数
-            </summary>
-        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.OCTFCTUploadData.FirstData">
             <summary>
             第一次

IRaCIS.Core.Application/Service/Reading/Dto/ReadingCalculateViewModel.cs

@@ -213,25 +213,20 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         ///// </summary>
         //public int PlaqueNum { get; set; }
 
-        /// <summary>
-        /// 帧数
-        /// </summary>
-        public string FrameNumber { get; set; }
-
         /// <summary>
         /// 外弹力膜面积Emm
         /// </summary>
-        public decimal? Emm { get; set; }
+        public decimal Emm { get; set; }
 
         /// <summary>
         /// 管腔面积Lumen
         /// </summary>
-        public decimal? Lumen { get; set; }
+        public decimal Lumen { get; set; }
 
         /// <summary>
         /// 外弹力膜面积- 管腔面积
         /// </summary>
-        public decimal? EmmSubtractionLumen
+        public decimal EmmSubtractionLumen
         {
             get
             {
@@ -249,25 +244,20 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
     public class OCTFCTUploadData
     {
-        /// <summary>
-        /// 帧数
-        /// </summary>
-        public string FrameNumber { get; set; }
-
         /// <summary>
         /// 第一次
         /// </summary>
-        public decimal? FirstData { get; set; }
+        public decimal FirstData { get; set; }
 
         /// <summary>
         /// 第二次
         /// </summary>
-        public decimal? SecondData { get; set; }
+        public decimal SecondData { get; set; }
 
         /// <summary>
         /// 第三次
         /// </summary>
-        public decimal? ThirdData { get; set; }
+        public decimal ThirdData { get; set; }
 
         /// <summary>
         /// 巨噬细胞浸润测量
@@ -301,7 +291,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         public decimal? LipidAngle { get; set; }
 
 
-        public decimal? Avg { get {
+        public decimal Avg { get {
 
                 return (  FirstData + SecondData  + ThirdData) / 3;
             } }

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

@@ -6,7 +6,6 @@ using IRaCIS.Core.Domain.Share;
 using IRaCIS.Core.Infra.EFCore.Common;
 using IRaCIS.Core.Infrastructure;
 using MassTransit;
-using MathNet.Numerics;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
@@ -474,33 +473,6 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 return decimal.Parse(decimal.Round(decimal.Parse(value ?? "0"), digitPlaces, MidpointRounding.AwayFromZero).ToString("F" + digitPlaces.ToString()));
             };
 
-
-            decimal? getdecimalEmptyData(string value)
-            {
-                if (value == string.Empty)
-                {
-                    return null;
-                }
-                return decimal.Parse(decimal.Round(decimal.Parse(value ?? "0"), digitPlaces, MidpointRounding.AwayFromZero).ToString("F" + digitPlaces.ToString()));
-            }
-
-            string getStringValue(decimal? value)
-            {
-                if (value == null)
-                {
-                    return string.Empty;
-                }
-                if (digitPlaces == -1)
-                {
-                    return value.Value.ToString();
-                }
-                else
-                {
-                  return  decimal.Round(value.Value, digitPlaces, MidpointRounding.AwayFromZero).ToString("F" + digitPlaces.ToString());
-                }
-             
-            }
-
             List<IVUSMeasuredValue> measuredValueList = new List<IVUSMeasuredValue>();
             var errorRow = new List<int> { };
 
@@ -512,9 +484,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                     iVUSMeasuredValue = new IVUSMeasuredValue()
                     {
                         //PlaqueNum = int.Parse(dataTable.Rows[i]["A"].ToString()),
-                        FrameNumber = dataTable.Rows[i]["A"].ToString()??string.Empty,
+                        Emm = getdecimalData(dataTable.Rows[i]["A"].ToString()),
-                        Emm = getdecimalEmptyData(dataTable.Rows[i]["B"].ToString()),
+                        Lumen = getdecimalData(dataTable.Rows[i]["B"].ToString()),
-                        Lumen = getdecimalEmptyData(dataTable.Rows[i]["C"].ToString()),
                     };
                 }
                 catch (Exception)
@@ -582,24 +553,22 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 //    TableQuestionId = tableQuestionList.Where(x => x.ReadingQuestionId == questionInfo.Id && x.QuestionMark == QuestionMark.PlaqueNumber).Select(x => x.Id).FirstOrDefault(),
                 //});
 
+                var emm = item.Emm.ToString();
+                var lumen=item.Lumen.ToString();
+                var emmSubtractionLumen = item.EmmSubtractionLumen.ToString();
 
+                if (taskinfo.TrialReadingCriterion.DigitPlaces != -1)
+                {
+                  
+                    emm = decimal.Round(decimal.Parse(emm ?? "0"), digitPlaces, MidpointRounding.AwayFromZero).ToString("F" + digitPlaces.ToString());
+                    lumen = decimal.Round(decimal.Parse(lumen ?? "0"), digitPlaces, MidpointRounding.AwayFromZero).ToString("F" + digitPlaces.ToString());
+                    emmSubtractionLumen = decimal.Round(decimal.Parse(emmSubtractionLumen ?? "0"), digitPlaces, MidpointRounding.AwayFromZero).ToString("F" + digitPlaces.ToString());
+                }
 
                 // EMM 
                 tableAnswers.Add(new ReadingTableQuestionAnswer()
                 {
-                    Answer = item.FrameNumber,
+                    Answer = emm,
-                    QuestionId = questionInfo.Id,
-                    TrialId = taskinfo.TrialId,
-                    VisitTaskId = taskinfo.Id,
-                    RowId = newRowId,
-                    RowIndex = maxnum,
-                    TableQuestionId = tableQuestionList.Where(x => x.ReadingQuestionId == questionInfo.Id && x.QuestionMark == QuestionMark.FrameNumber).Select(x => x.Id).FirstOrDefault(),
-                });
-
-                // EMM 
-                tableAnswers.Add(new ReadingTableQuestionAnswer()
-                {
-                    Answer = getStringValue(item.Emm),
                     QuestionId = questionInfo.Id,
                     TrialId = taskinfo.TrialId,
                     VisitTaskId = taskinfo.Id,
@@ -610,7 +579,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
                 tableAnswers.Add(new ReadingTableQuestionAnswer()
                 {
-                    Answer = getStringValue(item.Lumen),
+                    Answer = lumen,
                     QuestionId = questionInfo.Id,
                     TrialId = taskinfo.TrialId,
                     VisitTaskId = taskinfo.Id,
@@ -621,7 +590,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
                 tableAnswers.Add(new ReadingTableQuestionAnswer()
                 {
-                    Answer = getStringValue(item.EmmSubtractionLumen),
+                    Answer = emmSubtractionLumen,
                     QuestionId = questionInfo.Id,
                     TrialId = taskinfo.TrialId,
                     VisitTaskId = taskinfo.Id,

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

@@ -354,16 +354,15 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                     measuredValueList.Add(new OCTFCTUploadData()
                     {
                         //PlaqueNum = int.Parse(dataTable.Rows[i]["A"].ToString()),
-                        FrameNumber = dataTable.Rows[i]["A"].ToString() ?? string.Empty,
+                        FirstData = getdecimalData(dataTable.Rows[i]["A"].ToString()),
-                        FirstData = getdecimalEmptyData(dataTable.Rows[i]["B"].ToString()),
+                        SecondData = getdecimalData(dataTable.Rows[i]["B"].ToString()),
-                        SecondData = getdecimalEmptyData(dataTable.Rows[i]["C"].ToString()),
+                        ThirdData = getdecimalData(dataTable.Rows[i]["C"].ToString()),
-                        ThirdData = getdecimalEmptyData(dataTable.Rows[i]["D"].ToString()),
+                        MacrophageInfiltrationMeasurement = getNone(dataTable.Rows[i]["D"].ToString()),
-                        MacrophageInfiltrationMeasurement = getNone(dataTable.Rows[i]["E"].ToString()),
+                        MacrophageInfiltrationAngle = getdecimalEmptyData(dataTable.Rows[i]["E"].ToString() ?? string.Empty),
-                        MacrophageInfiltrationAngle = getdecimalEmptyData(dataTable.Rows[i]["F"].ToString() ?? string.Empty),
+                        MicrochannelMeasurement = getNone(dataTable.Rows[i]["F"].ToString()),
-                        MicrochannelMeasurement = getNone(dataTable.Rows[i]["G"].ToString()),
+                        CholesterolCrystalMeasurement = getNone(dataTable.Rows[i]["G"].ToString()),
-                        CholesterolCrystalMeasurement = getNone(dataTable.Rows[i]["H"].ToString()),
+                        LumenAreaMeasurement = getdecimalData(dataTable.Rows[i]["H"].ToString()),
-                        LumenAreaMeasurement = getdecimalEmptyData(dataTable.Rows[i]["I"].ToString()),
+                        LipidAngle = getdecimalEmptyData(dataTable.Rows[i]["I"].ToString() ?? string.Empty),
-                        LipidAngle = getdecimalEmptyData(dataTable.Rows[i]["J"].ToString() ?? string.Empty),
                     });
                 }
                 catch (Exception)
@@ -464,24 +463,19 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 //    TableQuestionId = tableQuestionList.Where(x => x.ReadingQuestionId == questionInfo.Id && x.QuestionMark == QuestionMark.PlaqueNumber).Select(x => x.Id).FirstOrDefault(),
                 //});
 
-                // 帧数
+                var avg = item.Avg.ToString();
-                tableAnswers.Add(new ReadingTableQuestionAnswer()
+              
+
+                if (taskinfo.TrialReadingCriterion.DigitPlaces != -1)
                 {
-                    Answer = item.FrameNumber,
+                    avg = decimal.Round(decimal.Parse(avg ?? "0"), digitPlaces, MidpointRounding.AwayFromZero).ToString("F" + digitPlaces.ToString());
-                    QuestionId = questionInfo.Id,
-                    TrialId = taskinfo.TrialId,
-                    VisitTaskId = taskinfo.Id,
-                    RowId = newRowId,
-                    RowIndex = maxnum,
-                    TableQuestionId = tableQuestionList.Where(x => x.ReadingQuestionId == questionInfo.Id && x.QuestionMark == QuestionMark.FrameNumber).Select(x => x.Id).FirstOrDefault(),
-                });
-
                 
+                }
 
                 // 第一次
                 tableAnswers.Add(new ReadingTableQuestionAnswer()
                 {
-                    Answer = item.FirstData.DecimalNullToString(digitPlaces),
+                    Answer = item.FirstData.ToString(),
                     QuestionId = questionInfo.Id,
                     TrialId = taskinfo.TrialId,
                     VisitTaskId = taskinfo.Id,
@@ -492,7 +486,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
                 tableAnswers.Add(new ReadingTableQuestionAnswer()
                 {
-                    Answer = item.SecondData.DecimalNullToString(digitPlaces),
+                    Answer = item.SecondData.ToString(),
                     QuestionId = questionInfo.Id,
                     TrialId = taskinfo.TrialId,
                     VisitTaskId = taskinfo.Id,
@@ -503,7 +497,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
                 tableAnswers.Add(new ReadingTableQuestionAnswer()
                 {
-                    Answer = item.ThirdData.DecimalNullToString(digitPlaces),
+                    Answer = item.ThirdData.ToString(),
                     QuestionId = questionInfo.Id,
                     TrialId = taskinfo.TrialId,
                     VisitTaskId = taskinfo.Id,
@@ -514,7 +508,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
                 tableAnswers.Add(new ReadingTableQuestionAnswer()
                 {
-                    Answer = item.Avg.DecimalNullToString(digitPlaces),
+                    Answer = avg,
                     QuestionId = questionInfo.Id,
                     TrialId = taskinfo.TrialId,
                     VisitTaskId = taskinfo.Id,

IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs

@@ -2468,11 +2468,6 @@ namespace IRaCIS.Core.Domain.Share
         /// </summary>
         PlaqueToOstiumDistance=1031,
 
-        /// <summary>
-        /// 帧数
-        /// </summary>
-        FrameNumber =1032,
-
         /// <summary>
         /// 第一次测量
         /// </summary>

IRaCIS.Core.Infra.EFCore/Common/ReadingCommon.cs

@@ -131,38 +131,6 @@ namespace IRaCIS.Core.Infra.EFCore.Common
             }
         }
 
-
-        public static string IntNullToString(this int? value)
-        {
-          
-            if (value == null)
-            {
-                return string.Empty;
-            }
-           
-            else
-            {
-                return value.Value.ToString();
-            }
-        }
-
-        public static string DecimalNullToString (this decimal? value,int ? digitPlaces)
-        {
-            digitPlaces = digitPlaces ?? 0;
-            if (value==null)
-            {
-               return string.Empty;
-            }
-            if (digitPlaces == -1)
-            {
-                return value.Value.ToString();
-            }
-            else
-            {
-                return decimal.Round(value.Value, digitPlaces.Value, MidpointRounding.AwayFromZero).ToString("F" + digitPlaces.ToString());
-            }
-        }
-
         public static Dictionary<ReadingCategory, decimal> TaskNumDic = new Dictionary<ReadingCategory, decimal>()
         {
             {ReadingCategory.Visit, 0  },