From da39c68aa159b2c587039d5d4981c98cdf149f08 Mon Sep 17 00:00:00 2001
From: wxr <wxr@wangxingrong.com>
Date: Sat, 20 Dec 2025 17:47:10 +0800
Subject: [PATCH] fix

---
 .../business/bus/service/SampleAnalysisAuditServiceImpl.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisAuditServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisAuditServiceImpl.java
index d3c0d83..122a54e 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisAuditServiceImpl.java
+++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisAuditServiceImpl.java
@@ -431,7 +431,7 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic
 			}
 	
 			
-		} else if ("‌vertical ".equals(reportDataType)) {//纵向数据
+		} else if ("‌vertical‌".equals(reportDataType)) {//纵向数据
 			List<BusinessAssayTaskDetailDO> businessAssayTaskDetailList = businessAssayTaskDetailMapper.selectList(new LambdaQueryWrapperX<BusinessAssayTaskDetailDO>().eq(BusinessAssayTaskDetailDO::getBusinessAssayTaskId, businessAssayTaskDO.getId()));  
 	        List<BusinessAssayTaskDataDO> businessAssayTaskDataList = businessAssayTaskDataMapper.selectList(new LambdaQueryWrapperX<BusinessAssayTaskDataDO>().eq(BusinessAssayTaskDataDO::getBusinessAssayTaskId, businessAssayTaskDO.getId()).eq(BusinessAssayTaskDataDO::getConfigAssayMethodId, businessAssayTaskDO.getConfigAssayMethodId()));
 	        
@@ -544,7 +544,7 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic
 //			resultJsonObject.put(entry.getKey(), entry.getValue());
 //		}
 
-		List<Map<String, Object>> fxList = datas.stream().filter(f -> "analysis".equals(f.get("analysisType")) || "zky".equals(f.get("analysisType")) || "kby".equals(f.get("analysisType")) ).collect(Collectors.toList());
+		List<Map<String, Object>> fxList = datas.stream().filter(f -> "analysis".equals(f.get("analysisType")) || "zky".equals(f.get("analysisType")) || "kby".equals(f.get("analysisType")) || "zkkby".equals(f.get("analysisType")) || "jky".equals(f.get("analysisType")) ).collect(Collectors.toList());
 		resultJsonObject.put("fx", fxList);
 		List<Map<String, Object>> byList = datas.stream().filter(f -> "by".equals(f.get("analysisType"))).collect(Collectors.toList());
 		resultJsonObject.put("by", byList);