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

修改
continuous-integration/drone/push Build is passing Details

IRC_NewDev
he 2024-09-24 15:09:09 +08:00
parent a79aebe772
commit 0bc0421ee3
1 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -603,7 +603,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
Guid visitTaskId = Guid.Parse(request.Form["VisitTaskId"]); Guid visitTaskId = Guid.Parse(request.Form["VisitTaskId"]);
var dataTable =await _generalCalculateService.GetDataTableFromUpload(file); var dataTable =await _generalCalculateService.GetDataTableFromUpload(file);
var taskinfo = await _visitTaskRepository.Where(x => x.Id == visitTaskId).Include(x => x.Subject).FirstNotNullAsync(); var taskinfo = await _visitTaskRepository.Where(x => x.Id == visitTaskId).Include(x => x.Subject).Include(x=>x.TrialReadingCriterion).FirstNotNullAsync();
var values = new var values = new
{ {
@ -663,10 +663,34 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
RowMark = questionInfo.OrderMark + decimal.Parse(maxnum.ToString()).GetLesionMark() RowMark = questionInfo.OrderMark + decimal.Parse(maxnum.ToString()).GetLesionMark()
}); });
// 编号
tableAnswers.Add(new ReadingTableQuestionAnswer()
{
Answer = item.PlaqueNum.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.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)
{
var digitPlaces= taskinfo.TrialReadingCriterion.DigitPlaces??0;
emm = decimal.Round(decimal.Parse(emm ?? "0"), digitPlaces).ToString("F" + digitPlaces.ToString());
lumen = decimal.Round(decimal.Parse(lumen ?? "0"), digitPlaces).ToString("F" + digitPlaces.ToString());
emmSubtractionLumen = decimal.Round(decimal.Parse(emmSubtractionLumen ?? "0"), digitPlaces).ToString("F" + digitPlaces.ToString());
}
// EMM // EMM
tableAnswers.Add(new ReadingTableQuestionAnswer() tableAnswers.Add(new ReadingTableQuestionAnswer()
{ {
Answer = item.Emm.ToString(), Answer = emm,
QuestionId = questionInfo.Id, QuestionId = questionInfo.Id,
TrialId = taskinfo.TrialId, TrialId = taskinfo.TrialId,
VisitTaskId = taskinfo.Id, VisitTaskId = taskinfo.Id,
@ -677,7 +701,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
tableAnswers.Add(new ReadingTableQuestionAnswer() tableAnswers.Add(new ReadingTableQuestionAnswer()
{ {
Answer = item.Lumen.ToString(), Answer = lumen,
QuestionId = questionInfo.Id, QuestionId = questionInfo.Id,
TrialId = taskinfo.TrialId, TrialId = taskinfo.TrialId,
VisitTaskId = taskinfo.Id, VisitTaskId = taskinfo.Id,
@ -688,7 +712,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
tableAnswers.Add(new ReadingTableQuestionAnswer() tableAnswers.Add(new ReadingTableQuestionAnswer()
{ {
Answer = item.EmmSubtractionLumen.ToString(), Answer = emmSubtractionLumen,
QuestionId = questionInfo.Id, QuestionId = questionInfo.Id,
TrialId = taskinfo.TrialId, TrialId = taskinfo.TrialId,
VisitTaskId = taskinfo.Id, VisitTaskId = taskinfo.Id,
@ -799,8 +823,6 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
emm = decimal.Round(decimal.Parse(emm ?? "0"), inDto.DigitPlaces).ToString("F" + inDto.DigitPlaces.ToString()); emm = decimal.Round(decimal.Parse(emm ?? "0"), inDto.DigitPlaces).ToString("F" + inDto.DigitPlaces.ToString());
EEMLumen = decimal.Round(decimal.Parse(EEMLumen ?? "0"), inDto.DigitPlaces).ToString("F" + inDto.DigitPlaces.ToString()); EEMLumen = decimal.Round(decimal.Parse(EEMLumen ?? "0"), inDto.DigitPlaces).ToString("F" + inDto.DigitPlaces.ToString());
pav = decimal.Round(decimal.Parse(pav ?? "0"), inDto.DigitPlaces).ToString("F" + inDto.DigitPlaces.ToString()); pav = decimal.Round(decimal.Parse(pav ?? "0"), inDto.DigitPlaces).ToString("F" + inDto.DigitPlaces.ToString());
} }
#endregion #endregion