From df13f27e9cae2d7b112ef0dda85cba456ecef32b Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 26 二月 2025 16:45:09 +0800
Subject: [PATCH] 远场和近场的数据解析的单位和指标需要重新对应+报告生成放在复核结束里面
---
inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java b/inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java
index c8b7080..5f1dd3c 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java
@@ -2611,7 +2611,8 @@
Long productCount1 = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery()
.eq(InsProduct::getInsSampleId, s.getId())
.eq(InsProduct::getInsResult, 3));
- productSize1.set(productSize1.get() + Integer.parseInt(productCount1 + ""));
+// productSize1.set(productSize1.get() + Integer.parseInt(productCount1 + ""));
+ productSize1.set(productSize1.get() + Integer.parseInt(0 + ""));
//涓嶅悎鏍�
Long productCount2 = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery()
.eq(InsProduct::getInsSampleId, s.getId())
@@ -2621,7 +2622,8 @@
Long productCount3 = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery()
.eq(InsProduct::getInsSampleId, s.getId())
.eq(InsProduct::getInsResult, 1));
- productSize3.set(productSize3.get() + Integer.parseInt(productCount3 + ""));
+// productSize3.set(productSize3.get() + Integer.parseInt(productCount3 + ""));
+ productSize3.set(productSize3.get() + Integer.parseInt(productCount3+productCount1 + ""));
//灏嗛」鐩寜鐓х珯鐐硅繘琛屽垎绫�
Map<String, List<InsProduct>> listMap = s.getInsProduct().stream().collect(Collectors.groupingBy(InsProduct::getSonLaboratory));
// 鍒涘缓涓�涓� Map 灏嗙珯鐐瑰拰椤圭洰ID鐨勬槧灏勫叧绯�
--
Gitblit v1.9.3