From 87054d98234d4c37fc3ba9595efe63bcfdc30b07 Mon Sep 17 00:00:00 2001
From: song.jun <lion0756@qq.com>
Date: 星期三, 20 五月 2026 11:43:46 +0800
Subject: [PATCH] 修复 EQAS 报告 PDF 直抗扣分未汇总等 6 处遗漏（QCService.ExportPDF）
---
sbcLabSystem/Models/Backstage/QCDistributionRegisterInfoViewModel.cs | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/sbcLabSystem/Models/Backstage/QCDistributionRegisterInfoViewModel.cs b/sbcLabSystem/Models/Backstage/QCDistributionRegisterInfoViewModel.cs
index 4d3a50d..8c70dd9 100644
--- a/sbcLabSystem/Models/Backstage/QCDistributionRegisterInfoViewModel.cs
+++ b/sbcLabSystem/Models/Backstage/QCDistributionRegisterInfoViewModel.cs
@@ -69,8 +69,14 @@
{
return null;
}
- QCDistributionRegisterInfo entity = PalGainEngine.Instance.Resolve<QCService>().GetQcDistributionRegisters()
- .FirstOrDefault(p => p.QCDistributionId == regInfoivewModel.QCDistributionId && p.LabId == labId);
+ var query = PalGainEngine.Instance.Resolve<QCService>().GetQcDistributionRegisters()
+ .Where(p => p.QCDistributionId == regInfoivewModel.QCDistributionId
+ && p.LabId == labId);
+ if (regInfoivewModel.ProjectId > 0)
+ {
+ query = query.Where(p => p.ProjectId == regInfoivewModel.ProjectId);
+ }
+ QCDistributionRegisterInfo entity = query.FirstOrDefault();
if (entity != null)
{
return entity;
@@ -604,8 +610,14 @@
}
public static QCDistributionRegisterInfo ToEntity(QCDistributionRegisterInfoViewModel viewModel)
{
- QCDistributionRegisterInfo entity = PalGainEngine.Instance.Resolve<QCService>()
+ QCDistributionRegisterInfo existing = PalGainEngine.Instance.Resolve<QCService>()
.GetQcDistributionRegisters().FirstOrDefault(p => p.Id == viewModel.Id);
+ return ToEntity(viewModel, existing);
+ }
+
+ public static QCDistributionRegisterInfo ToEntity(QCDistributionRegisterInfoViewModel viewModel, QCDistributionRegisterInfo preloadedExisting)
+ {
+ QCDistributionRegisterInfo entity = preloadedExisting;
if (entity == null)
{
entity = new QCDistributionRegisterInfo();
@@ -793,7 +805,7 @@
}
else if (value.Trim().ToLower() == "cb7_right222")
{
- ret = "阴性";
+ ret = "阴性";
}
else if (value.Trim().ToLower() == "cb7_right225")
{
--
Gitblit v1.8.0