From 032e88451cc03c781401e3feef14057f9cff6f94 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 27 二月 2025 13:43:13 +0800
Subject: [PATCH] 近场报告解析添加指标+平均值保留两位小数+检测依据不加9410
---
inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java | 26 +++++++++++---------------
1 files changed, 11 insertions(+), 15 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 5f1dd3c..5f4644d 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
@@ -845,8 +845,7 @@
cells.add(cellRenderData);
}
}
- }
- else {
+ } else {
//鐢佃皟鐗堟湰(澶嶆潅鐗�)
if (inspectionItemSubclass.contains("鐢靛帇椹绘尝姣�") && i <= (angles + 1) * portRow) {
cc = (angles + 1) * portRow;
@@ -1946,7 +1945,7 @@
int k = (angles + 1) * portRow2;
int rr = qq == 0 ? (pp == 0 ? (nn == 0 ? (mm == 0 ? (hh == 0 ? (gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg) : hh) : mm) : nn) : pp) : qq;
if (i > rr && i <= rr + k) {
- ss = (rr + k) ;
+ ss = (rr + k);
if (itemSet.add("鏈�澶х浉浣嶅亸宸�")) {
index.getAndIncrement();
}
@@ -2051,7 +2050,7 @@
int length = result2s.get(0).getPort().split(",").length;
int portRow2 = (length % 8 == 0 ? length / 8 : length / 8 + 1);
int k = (angles + 1) * portRow2;
- int rr =ss==0?( qq == 0 ? (pp == 0 ? (nn == 0 ? (mm == 0 ? (hh == 0 ? (gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg) : hh) : mm) : nn) : pp) : qq) : ss;
+ int rr = ss == 0 ? (qq == 0 ? (pp == 0 ? (nn == 0 ? (mm == 0 ? (hh == 0 ? (gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg) : hh) : mm) : nn) : pp) : qq) : ss;
if (i > ss) {
if (itemSet.add("鐩镐綅缁濆鍊�")) {
index.getAndIncrement();
@@ -2598,11 +2597,10 @@
String[] monthNames = {"January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"};
SampleProductDto s = insSample;
models.add(s.getModel());
- standardMethod.addAll(standardMethodListMapper.selectList(Wrappers.<StandardMethodList>lambdaQuery()
- .in(StandardMethodList::getId, Arrays.stream(s.getStandardMethodListId().replaceAll("[\\[\\]]", "").split(","))
- .map(String::trim).map(Integer::parseInt).collect(Collectors.toList()))).stream().map(aa -> {
- return aa.getCode() + " " + aa.getName();
- }).distinct().collect(Collectors.toList()));
+ /*鏌ヨ鏍囧噯鏂规硶*/
+ standardMethod.addAll(insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+ .eq(InsProduct::getInsSampleId, insSample.getId())
+ .eq(InsProduct::getState, 1)).stream().map(InsProduct::getMethodS).distinct().collect(Collectors.toList()));
//鎬绘暟
Long productCount = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery()
.eq(InsProduct::getInsSampleId, s.getId()));
@@ -2623,7 +2621,7 @@
.eq(InsProduct::getInsSampleId, s.getId())
.eq(InsProduct::getInsResult, 1));
// productSize3.set(productSize3.get() + Integer.parseInt(productCount3 + ""));
- productSize3.set(productSize3.get() + Integer.parseInt(productCount3+productCount1 + ""));
+ productSize3.set(productSize3.get() + Integer.parseInt(productCount3 + productCount1 + ""));
//灏嗛」鐩寜鐓х珯鐐硅繘琛屽垎绫�
Map<String, List<InsProduct>> listMap = s.getInsProduct().stream().collect(Collectors.groupingBy(InsProduct::getSonLaboratory));
// 鍒涘缓涓�涓� Map 灏嗙珯鐐瑰拰椤圭洰ID鐨勬槧灏勫叧绯�
@@ -3076,7 +3074,6 @@
for (String s1 : standardMethod) {
standardMethod2.append("锛沑n").append(s1);
}
- standardMethod2.append("锛沑n").append("GB/T 9410-2008 銆婄Щ鍔ㄩ�氫俊澶╃嚎閫氱敤鎶�鏈鑼冦��");
standardMethod2.replace(0, 1, "");
List<Map<String, String>> deviceList = null;
if (deviceSet.size() != 0) {
@@ -4058,8 +4055,7 @@
cells.add(cellRenderData);
}
}
- }
- else {
+ } else {
//鐢佃皟鐗堟湰(澶嶆潅鐗�)
if (inspectionItemSubclass.contains("鐢靛帇椹绘尝姣�") && i <= (angles + 1) * portRow) {
cc = (angles + 1) * portRow;
@@ -5159,7 +5155,7 @@
int k = (angles + 1) * portRow2;
int rr = qq == 0 ? (pp == 0 ? (nn == 0 ? (mm == 0 ? (hh == 0 ? (gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg) : hh) : mm) : nn) : pp) : qq;
if (i > rr && i <= rr + k) {
- ss = (rr + k) ;
+ ss = (rr + k);
if (itemSet.add("鏈�澶х浉浣嶅亸宸�")) {
index.getAndIncrement();
}
@@ -5264,7 +5260,7 @@
int length = result2s.get(0).getPort().split(",").length;
int portRow2 = (length % 8 == 0 ? length / 8 : length / 8 + 1);
int k = (angles + 1) * portRow2;
- int rr =ss==0?( qq == 0 ? (pp == 0 ? (nn == 0 ? (mm == 0 ? (hh == 0 ? (gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg) : hh) : mm) : nn) : pp) : qq) : ss;
+ int rr = ss == 0 ? (qq == 0 ? (pp == 0 ? (nn == 0 ? (mm == 0 ? (hh == 0 ? (gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg) : hh) : mm) : nn) : pp) : qq) : ss;
if (i > ss) {
if (itemSet.add("鐩镐綅缁濆鍊�")) {
index.getAndIncrement();
--
Gitblit v1.9.3