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 a45bde2..6362901 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
@@ -19,7 +19,10 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONFactory;
 import com.alibaba.fastjson2.JSONObject;
+import com.alibaba.fastjson2.JSONWriter;
 import com.alibaba.nacos.shaded.io.grpc.Attributes.Key;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
@@ -281,16 +284,30 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic
 	
 	@Override
 	public JSONObject crossAuditByTaskId(Long businessAssayTaskId) {
+		JSONWriter.Context context = JSONFactory.createWriteContext();
+		context.setDateFormat("yyyy-MM-dd HH:mm:ss");
+		
 		JSONObject resultJsonObject = new JSONObject();
 		
 		BusinessAssayTaskDO businessAssayTaskDO = businessAssayTaskMapper.selectById(businessAssayTaskId);
 		if (businessAssayTaskDO == null) {
 			throw new ServiceException(1_032_100_000, "未找到任务分配单");
 		}
+		String formValue = businessAssayTaskDO.getFormValue();
+		JSONObject formValueJsonObject = JSON.parseObject(formValue);
+
+		String jsonString = JSON.toJSONString(businessAssayTaskDO, context);
+		JSONObject businessAssayTaskJson = JSON.parseObject(jsonString);
+		formValueJsonObject.forEach((key, value) -> {
+			businessAssayTaskJson.put(key, value);
+		});
+		JSONArray jsonArray = new JSONArray();
+		jsonArray.add(businessAssayTaskJson);
+		resultJsonObject.put("businessAssayTask", jsonArray);
 
         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()));
-        BusinessAssayTaskDataDO businessAssayTaskData = businessAssayTaskDataList.get(0);
+//        BusinessAssayTaskDataDO businessAssayTaskData = businessAssayTaskDataList.get(0);
         //处理数据
         List<Map<String, Object>> datas = new ArrayList<>();
         for (BusinessAssayTaskDataDO businessAssayTaskDataDO : businessAssayTaskDataList) {
@@ -311,13 +328,15 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic
             projectDataSearch2.setBusinessAssayTaskDataId(businessAssayTaskDataDO.getId());
             List<BusinessAssayProjectAndParameterRespVO> projectAndParameterList2 = businessAssayProjectDataMapper.selectProjectAndParameterBy(projectDataSearch2);
             for (BusinessAssayProjectAndParameterRespVO ep : projectAndParameterList2) {
-				map.put("e" + ep.getDicId(), ep);
+//				map.put("e" + ep.getDicId(), ep);
+            	map.put(ep.getName(), ep.getValue());
 				if (StringUtils.isNotEmpty(ep.getFormula())) {
 	        		BusinessAssayParameterDataReqVO parameterDataSearch = new BusinessAssayParameterDataReqVO();
 	        		parameterDataSearch.setBusinessAssayProjectDataId(ep.getId());
 	                List<BusinessAssayProjectAndParameterRespVO> plist = businessAssayParameterDataMapper.selectProjectAndParameterBy(parameterDataSearch);
 	                for (BusinessAssayProjectAndParameterRespVO p : plist) {
-	                	map.put("p" + p.getDicId(), p);
+//	                	map.put("p" + p.getDicId(), p);
+	                	map.put(p.getName(), p.getValue());
 					}
 				}
 				
@@ -344,13 +363,15 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic
             projectDataSearch2.setBusinessQCManagementDataId(businessQCManagementData.getId());
             List<BusinessAssayProjectAndParameterRespVO> projectAndParameterList2 = businessQCManagementProjectDataMapper.selectProjectAndParameterBy(projectDataSearch2);
             for (BusinessAssayProjectAndParameterRespVO ep : projectAndParameterList2) {
-				map.put("e" + ep.getDicId(), ep);
+//				map.put("e" + ep.getDicId(), ep);
+            	map.put(ep.getName(), ep.getValue());
 				if (StringUtils.isNotEmpty(ep.getFormula())) {
 					BusinessQCManagementParameterDataReqVO parameterDataSearch = new BusinessQCManagementParameterDataReqVO();
 	        		parameterDataSearch.setBusinessQCManagementProjectDataId(ep.getId());
 	                List<BusinessAssayProjectAndParameterRespVO> plist = businessQCManagementParameterDataMapper.selectProjectAndParameterBy(parameterDataSearch);
 	                for (BusinessAssayProjectAndParameterRespVO p : plist) {
-	                	map.put("p" + p.getDicId(), p);
+//	                	map.put("p" + p.getDicId(), p);
+	                	map.put(p.getName(), p.getValue());
 					}
 				}
 				
@@ -375,7 +396,8 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic
             parameterDataSearch2.setBusinessQCCoefficientDataId(businessQCCoefficientData.getId());
             List<BusinessAssayProjectAndParameterRespVO> plist2 = businessQCCoefficientParameterDataMapper.selectProjectAndParameterBy(parameterDataSearch2);
             for (BusinessAssayProjectAndParameterRespVO p : plist2) {
-            	map.put("p" + p.getDicId(), p);
+//            	map.put("p" + p.getDicId(), p);
+            	map.put(p.getName(), p.getValue());
 			}
             datas.add(map);
 		}