XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

IRC_NewDev
hang 2024-09-30 10:21:36 +08:00
parent 8768fe0437 cb7098830c
commit 8829723c19
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingCriterionService.cs
View File

@ -674,6 +674,8 @@ namespace IRaCIS.Core.Application.Service.RC
criterion.IsReadingPeriod = false; criterion.IsReadingPeriod = false;
criterion.IsImageFilter = false; criterion.IsImageFilter = false;
criterion.IsGlobalReading = false; criterion.IsGlobalReading = false;
criterion.IsArbitrationReading = true;
criterion.ArbitrationRule = ArbitrationRule.Visit;
criterion.IsReadingTaskViewInOrder = ReadingOrder.SubjectRandom; criterion.IsReadingTaskViewInOrder = ReadingOrder.SubjectRandom;
criterion.ImageDownloadEnum = ReadingImageDownload.Subejct; criterion.ImageDownloadEnum = ReadingImageDownload.Subejct;
criterion.ImageUploadEnum = ReadingImageUpload.IRReadingSubejctEnable; criterion.ImageUploadEnum = ReadingImageUpload.IRReadingSubejctEnable;
@ -682,6 +684,8 @@ namespace IRaCIS.Core.Application.Service.RC
criterion.IsImageFilter = false; criterion.IsImageFilter = false;
criterion.IsReadingPeriod = false; criterion.IsReadingPeriod = false;
criterion.IsGlobalReading = false; criterion.IsGlobalReading = false;
criterion.IsArbitrationReading = true;
criterion.ArbitrationRule = ArbitrationRule.Visit;
criterion.IsReadingTaskViewInOrder = ReadingOrder.SubjectRandom; criterion.IsReadingTaskViewInOrder = ReadingOrder.SubjectRandom;
criterion.ImageDownloadEnum = ReadingImageDownload.Subejct; criterion.ImageDownloadEnum = ReadingImageDownload.Subejct;
criterion.ImageUploadEnum = ReadingImageUpload.IRReadingSubejctEnable; criterion.ImageUploadEnum = ReadingImageUpload.IRReadingSubejctEnable;

4
IRaCIS.Core.Application/Service/ReadingCalculate/IVUSCalculateService.cs
View File

@ -835,8 +835,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
if (emm != null && EEMLumen != null) if (emm != null && EEMLumen != null)
{ {
var emmNum = decimal.Round(decimal.Parse(emm ?? "0")); var emmNum =decimal.Parse(emm ?? "0");
var EEMLumenNum = decimal.Round(decimal.Parse(EEMLumen ?? "0")); var EEMLumenNum =decimal.Parse(EEMLumen ?? "0");
if (emmNum != 0) if (emmNum != 0)
{ {
pav = (EEMLumenNum * 100 / emmNum).ToString(); pav = (EEMLumenNum * 100 / emmNum).ToString();