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
continuous-integration/drone/push Build is passing
Details
commit
8829723c19
|
@ -674,6 +674,8 @@ namespace IRaCIS.Core.Application.Service.RC
|
|||
criterion.IsReadingPeriod = false;
|
||||
criterion.IsImageFilter = false;
|
||||
criterion.IsGlobalReading = false;
|
||||
criterion.IsArbitrationReading = true;
|
||||
criterion.ArbitrationRule = ArbitrationRule.Visit;
|
||||
criterion.IsReadingTaskViewInOrder = ReadingOrder.SubjectRandom;
|
||||
criterion.ImageDownloadEnum = ReadingImageDownload.Subejct;
|
||||
criterion.ImageUploadEnum = ReadingImageUpload.IRReadingSubejctEnable;
|
||||
|
@ -682,6 +684,8 @@ namespace IRaCIS.Core.Application.Service.RC
|
|||
criterion.IsImageFilter = false;
|
||||
criterion.IsReadingPeriod = false;
|
||||
criterion.IsGlobalReading = false;
|
||||
criterion.IsArbitrationReading = true;
|
||||
criterion.ArbitrationRule = ArbitrationRule.Visit;
|
||||
criterion.IsReadingTaskViewInOrder = ReadingOrder.SubjectRandom;
|
||||
criterion.ImageDownloadEnum = ReadingImageDownload.Subejct;
|
||||
criterion.ImageUploadEnum = ReadingImageUpload.IRReadingSubejctEnable;
|
||||
|
|
|
@ -835,8 +835,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
|||
|
||||
if (emm != null && EEMLumen != null)
|
||||
{
|
||||
var emmNum = decimal.Round(decimal.Parse(emm ?? "0"));
|
||||
var EEMLumenNum = decimal.Round(decimal.Parse(EEMLumen ?? "0"));
|
||||
var emmNum =decimal.Parse(emm ?? "0");
|
||||
var EEMLumenNum =decimal.Parse(EEMLumen ?? "0");
|
||||
if (emmNum != 0)
|
||||
{
|
||||
pav = (EEMLumenNum * 100 / emmNum).ToString();
|
||||
|
|
Loading…
Reference in New Issue