diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/IVUSCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/IVUSCalculateService.cs index 47e27da3d..81f401630 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/IVUSCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/IVUSCalculateService.cs @@ -518,6 +518,12 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate }; + Dictionary yesOrNo = new Dictionary() + { + { "是","1"}, + { "否","0"}, + }; + List measuredValueList = new List(); var errorRow = new List { }; @@ -527,7 +533,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate try { // 手动抛出异常进入catch - if (dataTable.Rows[i]["D"].ToString().IsNullOrEmpty()) + if (!yesOrNo.ContainsKey(dataTable.Rows[i]["D"].ToString())) { throw new InvalidOperationException("NullError"); } @@ -657,7 +663,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate // 斑块破裂 tableAnswers.Add(new ReadingTableQuestionAnswer() { - Answer = isPresent[item.PlaqueRupture.ToString()], + Answer = yesOrNo[item.PlaqueRupture.ToString()], QuestionId = questionInfo.Id, TrialId = taskinfo.TrialId, VisitTaskId = taskinfo.Id, diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs index 19e315933..b2174cced 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs @@ -336,6 +336,12 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate List measuredValueList = new List(); var errorRow = new List { }; + Dictionary yesOrNo = new Dictionary() + { + { "是","1"}, + { "否","0"}, + }; + string getNone(string value) { if (value == string.Empty || value == null) @@ -353,7 +359,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate { // 手动抛出异常进入catch - if (dataTable.Rows[i]["K"].ToString().IsNullOrEmpty()|| dataTable.Rows[i]["L"].ToString().IsNullOrEmpty()) + if (!yesOrNo.ContainsKey(dataTable.Rows[i]["K"].ToString())|| !yesOrNo.ContainsKey(dataTable.Rows[i]["L"].ToString())) { throw new InvalidOperationException("NullError"); } @@ -611,7 +617,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate // 斑块破裂 tableAnswers.Add(new ReadingTableQuestionAnswer() { - Answer = isPresent[item.PlaqueRupture.ToString()], + Answer = yesOrNo[item.PlaqueRupture.ToString()], QuestionId = questionInfo.Id, TrialId = taskinfo.TrialId, VisitTaskId = taskinfo.Id, @@ -623,7 +629,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate // 斑块愈合 tableAnswers.Add(new ReadingTableQuestionAnswer() { - Answer = isPresent[item.PlaqueHealing.ToString()], + Answer = yesOrNo[item.PlaqueHealing.ToString()], QuestionId = questionInfo.Id, TrialId = taskinfo.TrialId, VisitTaskId = taskinfo.Id,