diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskPageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskPageReqVO.java
index 6a2b069..3d62df8 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskPageReqVO.java
+++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskPageReqVO.java
@@ -121,4 +121,13 @@ public class BusinessAssayTaskPageReqVO extends PageParam {
     
     @Schema(description = "部门id")
     private Long deptId;
+    
+    //=========扩展字段==========
+
+	/** 分析方法名称 **/
+    @Schema(description = "分析方法")
+    private String configAssayMethodName;
+    
+    @Schema(description = "检测方法配置名称及类别")
+	private String configAssayMethodNameAndCategory;
 }
\ No newline at end of file
diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskMapper.java
index ad18e3d..6b1ebe1 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskMapper.java
+++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskMapper.java
@@ -62,6 +62,8 @@ public interface BusinessAssayTaskMapper extends BaseMapperX<BusinessAssayTaskDO
                 .eqIfPresent(BusinessAssayTaskDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
                 .betweenIfPresent(BusinessAssayTaskDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(BusinessAssayTaskDO::getRemark, reqVO.getRemark())
+                .likeIfPresent(ConfigAssayMethodDO::getName, reqVO.getConfigAssayMethodName())
+                .likeIfPresent(ConfigAssayMethodDO::getMethodNameCategory, reqVO.getConfigAssayMethodNameAndCategory())
                 .neIfPresent(BusinessAssayTaskDO::getAssayOperator, reqVO.getNeAssayOperator())
                 .eqIfPresent(BusinessAssayTaskDO::getDeptId, reqVO.getDeptId())
                 .orderByDesc(BusinessAssayTaskDO::getId));
@@ -107,6 +109,8 @@ public interface BusinessAssayTaskMapper extends BaseMapperX<BusinessAssayTaskDO
                 .eqIfPresent(BusinessAssayTaskDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
                 .betweenIfPresent(BusinessAssayTaskDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(BusinessAssayTaskDO::getRemark, reqVO.getRemark())
+                .likeIfPresent(ConfigAssayMethodDO::getName, reqVO.getConfigAssayMethodName())
+                .likeIfPresent(ConfigAssayMethodDO::getMethodNameCategory, reqVO.getConfigAssayMethodNameAndCategory())
                 .eqIfPresent(BusinessAssayTaskDO::getDeptId, reqVO.getDeptId())
                 .neIfPresent(BusinessAssayTaskDO::getAssayOperator, reqVO.getNeAssayOperator())
                 .orderByDesc(BusinessAssayTaskDO::getId));
diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/entrust/SampleEntrustGenSampleDataCmp.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/entrust/SampleEntrustGenSampleDataCmp.java
index 1318c2c..c675372 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/entrust/SampleEntrustGenSampleDataCmp.java
+++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/entrust/SampleEntrustGenSampleDataCmp.java
@@ -608,35 +608,58 @@ public class SampleEntrustGenSampleDataCmp extends NodeComponent {
 						
 //						DictionaryProjectDO dictionaryProject = dictionaryProjectList.stream().filter(f -> f.getId().equals(configAssayMethodProjectDO.getDictionaryProjectId())).findFirst().orElse(null);
 //						assayProjectBuilder.append(dictionaryProject.getShowName()).append(",");
+						
 
 						//检测项目
-						BusinessAssayProjectDataDO businessAssayProjectDataDO = new BusinessAssayProjectDataDO();
-						businessAssayProjectDataDO.setId(IdWorker.getId());
-						businessAssayProjectDataDO.setBusinessAssayTaskDataId(businessAssayTaskDataDO.getId());
-						businessAssayProjectDataDO.setConfigAssayMethodProjectId(configAssayMethodProjectDO.getId());
-						businessAssayProjectDataDO.setDictionaryProjectId(configAssayMethodProjectDO.getDictionaryProjectId());
-						businessAssayProjectDataDO.setDataType(configAssayMethodProjectDO.getDataType());
-						businessAssayProjectDataDO.setDecimalPosition(configAssayMethodProjectDO.getDecimalPosition());
-						businessAssayProjectDataDO.setUsage(QmsCommonConstant.ASSAY_PROJECT_USAGE_REPORT);
+						Long businessAssayTaskDataId = businessAssayTaskDataDO.getId();
+						BusinessAssayProjectDataDO businessAssayProjectDataDO = businessAssayProjectDataDOList.stream().filter(f -> f.getBusinessAssayTaskDataId().equals(businessAssayTaskDataId) && f.getDictionaryProjectId().equals(configAssayMethodProjectDO.getDictionaryProjectId())).findFirst().orElse(null);
+						if (businessAssayProjectDataDO == null) {
+							businessAssayProjectDataDO = new BusinessAssayProjectDataDO();
+							businessAssayProjectDataDO.setId(IdWorker.getId());
+							businessAssayProjectDataDO.setBusinessAssayTaskDataId(businessAssayTaskDataDO.getId());
+							businessAssayProjectDataDO.setConfigAssayMethodProjectId(configAssayMethodProjectDO.getId());
+							businessAssayProjectDataDO.setDictionaryProjectId(configAssayMethodProjectDO.getDictionaryProjectId());
+							businessAssayProjectDataDO.setDataType(configAssayMethodProjectDO.getDataType());
+							businessAssayProjectDataDO.setDecimalPosition(configAssayMethodProjectDO.getDecimalPosition());
+							businessAssayProjectDataDO.setUsage(QmsCommonConstant.ASSAY_PROJECT_USAGE_REPORT);
 
-						businessAssayProjectDataDO.setMinimumLimitValue(configAssayMethodProjectDO.getMinimumLimitValue());
-						businessAssayProjectDataDO.setIsEnabled(1);
-						businessAssayProjectDataDO.setIsNotAssessment(0);
-						
-						businessAssayProjectDataDOList.add(businessAssayProjectDataDO);
-						
-						List<ConfigAssayMethodProjectParameterDO> configAssayMethodProjectParameterDOList = configAssayMethodProjectParameterList.stream().filter(f -> f.getConfigAssayMethodProjectId().equals(configAssayMethodProjectDO.getId())).collect(Collectors.toList());
-						for (ConfigAssayMethodProjectParameterDO configAssayMethodProjectParameterDO : configAssayMethodProjectParameterDOList) {
-							BusinessAssayParameterDataDO businessAssayParameterDataDO = new BusinessAssayParameterDataDO();
-							businessAssayParameterDataDO.setId(IdWorker.getId());
-							businessAssayParameterDataDO.setConfigAssayMethodProjectParameterId(configAssayMethodProjectParameterDO.getId());
-							businessAssayParameterDataDO.setBusinessAssayProjectDataId(businessAssayProjectDataDO.getId());
-							businessAssayParameterDataDO.setDictionaryParameterId(configAssayMethodProjectParameterDO.getDictionaryParameterId());
-							businessAssayParameterDataDO.setDataType(configAssayMethodProjectParameterDO.getDataType());
-							businessAssayParameterDataDO.setDecimalPosition(configAssayMethodProjectParameterDO.getDecimalPosition());
+							businessAssayProjectDataDO.setMinimumLimitValue(configAssayMethodProjectDO.getMinimumLimitValue());
+							businessAssayProjectDataDO.setIsEnabled(1);
+							businessAssayProjectDataDO.setIsNotAssessment(0);
 							
+							businessAssayProjectDataDOList.add(businessAssayProjectDataDO);
 							
-							businessAssayParameterDataDOList.add(businessAssayParameterDataDO);
+							List<ConfigAssayMethodProjectParameterDO> configAssayMethodProjectParameterDOList = configAssayMethodProjectParameterList.stream().filter(f -> f.getConfigAssayMethodProjectId().equals(configAssayMethodProjectDO.getId())).collect(Collectors.toList());
+							for (ConfigAssayMethodProjectParameterDO configAssayMethodProjectParameterDO : configAssayMethodProjectParameterDOList) {
+								BusinessAssayParameterDataDO businessAssayParameterDataDO = new BusinessAssayParameterDataDO();
+								businessAssayParameterDataDO.setId(IdWorker.getId());
+								businessAssayParameterDataDO.setConfigAssayMethodProjectParameterId(configAssayMethodProjectParameterDO.getId());
+								businessAssayParameterDataDO.setBusinessAssayProjectDataId(businessAssayProjectDataDO.getId());
+								businessAssayParameterDataDO.setDictionaryParameterId(configAssayMethodProjectParameterDO.getDictionaryParameterId());
+								businessAssayParameterDataDO.setDataType(configAssayMethodProjectParameterDO.getDataType());
+								businessAssayParameterDataDO.setDecimalPosition(configAssayMethodProjectParameterDO.getDecimalPosition());
+								
+								
+								businessAssayParameterDataDOList.add(businessAssayParameterDataDO);
+							}
+						} else {
+							if (QmsCommonConstant.ASSAY_PROJECT_USAGE_INGREDIENT.equals(businessAssayProjectDataDO.getUsage())) {
+								businessAssayProjectDataDO.setUsage(QmsCommonConstant.ASSAY_PROJECT_USAGE_INGREDIENT_REPORT);
+							}
+
+							List<ConfigAssayMethodProjectParameterDO> configAssayMethodProjectParameterDOList = configAssayMethodProjectParameterList.stream().filter(f -> f.getConfigAssayMethodProjectId().equals(configAssayMethodProjectDO.getId())).collect(Collectors.toList());
+							for (ConfigAssayMethodProjectParameterDO configAssayMethodProjectParameterDO : configAssayMethodProjectParameterDOList) {
+								BusinessAssayParameterDataDO businessAssayParameterDataDO = new BusinessAssayParameterDataDO();
+								businessAssayParameterDataDO.setId(IdWorker.getId());
+								businessAssayParameterDataDO.setConfigAssayMethodProjectParameterId(configAssayMethodProjectParameterDO.getId());
+								businessAssayParameterDataDO.setBusinessAssayProjectDataId(businessAssayProjectDataDO.getId());
+								businessAssayParameterDataDO.setDictionaryParameterId(configAssayMethodProjectParameterDO.getDictionaryParameterId());
+								businessAssayParameterDataDO.setDataType(configAssayMethodProjectParameterDO.getDataType());
+								businessAssayParameterDataDO.setDecimalPosition(configAssayMethodProjectParameterDO.getDecimalPosition());
+								
+								
+								businessAssayParameterDataDOList.add(businessAssayParameterDataDO);
+							}
 						}
 						
 					}
@@ -849,32 +872,55 @@ public class SampleEntrustGenSampleDataCmp extends NodeComponent {
 				
 
 				//检测项目
-				BusinessAssayProjectDataDO businessAssayProjectDataDO = new BusinessAssayProjectDataDO();
-				businessAssayProjectDataDO.setId(IdWorker.getId());
-				businessAssayProjectDataDO.setBusinessAssayTaskDataId(businessAssayTaskDataDO.getId());
-				businessAssayProjectDataDO.setConfigAssayMethodProjectId(configAssayMethodProjectDO.getId());
-				businessAssayProjectDataDO.setDictionaryProjectId(configAssayMethodProjectDO.getDictionaryProjectId());
-				businessAssayProjectDataDO.setDataType(configAssayMethodProjectDO.getDataType());
-				businessAssayProjectDataDO.setDecimalPosition(configAssayMethodProjectDO.getDecimalPosition());
-				businessAssayProjectDataDO.setUsage(QmsCommonConstant.ASSAY_PROJECT_USAGE_INGREDIENT);
-				businessAssayProjectDataDO.setMinimumLimitValue(configAssayMethodProjectDO.getMinimumLimitValue());
-				businessAssayProjectDataDO.setIsEnabled(1);
-				businessAssayProjectDataDO.setIsNotAssessment(0);
-				
-				businessAssayProjectDataDOList.add(businessAssayProjectDataDO);
-				
-				List<ConfigAssayMethodProjectParameterDO> configAssayMethodProjectParameterDOList = configAssayMethodProjectParameterList.stream().filter(f -> f.getConfigAssayMethodProjectId().equals(configAssayMethodProjectDO.getId())).collect(Collectors.toList());
-				for (ConfigAssayMethodProjectParameterDO configAssayMethodProjectParameterDO : configAssayMethodProjectParameterDOList) {
-					BusinessAssayParameterDataDO businessAssayParameterDataDO = new BusinessAssayParameterDataDO();
-					businessAssayParameterDataDO.setId(IdWorker.getId());
-					businessAssayParameterDataDO.setConfigAssayMethodProjectParameterId(configAssayMethodProjectParameterDO.getId());
-					businessAssayParameterDataDO.setBusinessAssayProjectDataId(businessAssayProjectDataDO.getId());
-					businessAssayParameterDataDO.setDictionaryParameterId(configAssayMethodProjectParameterDO.getDictionaryParameterId());
-					businessAssayParameterDataDO.setDataType(configAssayMethodProjectParameterDO.getDataType());
-					businessAssayParameterDataDO.setDecimalPosition(configAssayMethodProjectParameterDO.getDecimalPosition());
+				Long businessAssayTaskDataId = businessAssayTaskDataDO.getId();
+				BusinessAssayProjectDataDO businessAssayProjectDataDO = businessAssayProjectDataDOList.stream().filter(f -> f.getBusinessAssayTaskDataId().equals(businessAssayTaskDataId) && f.getDictionaryProjectId().equals(configAssayMethodProjectDO.getDictionaryProjectId())).findFirst().orElse(null);
+				if (businessAssayProjectDataDO == null) {
+					businessAssayProjectDataDO = new BusinessAssayProjectDataDO();
+					businessAssayProjectDataDO.setId(IdWorker.getId());
+					businessAssayProjectDataDO.setBusinessAssayTaskDataId(businessAssayTaskDataDO.getId());
+					businessAssayProjectDataDO.setConfigAssayMethodProjectId(configAssayMethodProjectDO.getId());
+					businessAssayProjectDataDO.setDictionaryProjectId(configAssayMethodProjectDO.getDictionaryProjectId());
+					businessAssayProjectDataDO.setDataType(configAssayMethodProjectDO.getDataType());
+					businessAssayProjectDataDO.setDecimalPosition(configAssayMethodProjectDO.getDecimalPosition());
+					businessAssayProjectDataDO.setUsage(QmsCommonConstant.ASSAY_PROJECT_USAGE_INGREDIENT);
+
+					businessAssayProjectDataDO.setMinimumLimitValue(configAssayMethodProjectDO.getMinimumLimitValue());
+					businessAssayProjectDataDO.setIsEnabled(1);
+					businessAssayProjectDataDO.setIsNotAssessment(0);
 					
+					businessAssayProjectDataDOList.add(businessAssayProjectDataDO);
 					
-					businessAssayParameterDataDOList.add(businessAssayParameterDataDO);
+					List<ConfigAssayMethodProjectParameterDO> configAssayMethodProjectParameterDOList = configAssayMethodProjectParameterList.stream().filter(f -> f.getConfigAssayMethodProjectId().equals(configAssayMethodProjectDO.getId())).collect(Collectors.toList());
+					for (ConfigAssayMethodProjectParameterDO configAssayMethodProjectParameterDO : configAssayMethodProjectParameterDOList) {
+						BusinessAssayParameterDataDO businessAssayParameterDataDO = new BusinessAssayParameterDataDO();
+						businessAssayParameterDataDO.setId(IdWorker.getId());
+						businessAssayParameterDataDO.setConfigAssayMethodProjectParameterId(configAssayMethodProjectParameterDO.getId());
+						businessAssayParameterDataDO.setBusinessAssayProjectDataId(businessAssayProjectDataDO.getId());
+						businessAssayParameterDataDO.setDictionaryParameterId(configAssayMethodProjectParameterDO.getDictionaryParameterId());
+						businessAssayParameterDataDO.setDataType(configAssayMethodProjectParameterDO.getDataType());
+						businessAssayParameterDataDO.setDecimalPosition(configAssayMethodProjectParameterDO.getDecimalPosition());
+						
+						
+						businessAssayParameterDataDOList.add(businessAssayParameterDataDO);
+					}
+				} else {
+					if (QmsCommonConstant.ASSAY_PROJECT_USAGE_REPORT.equals(businessAssayProjectDataDO.getUsage())) {
+						businessAssayProjectDataDO.setUsage(QmsCommonConstant.ASSAY_PROJECT_USAGE_INGREDIENT_REPORT);
+					}
+
+					List<ConfigAssayMethodProjectParameterDO> configAssayMethodProjectParameterDOList = configAssayMethodProjectParameterList.stream().filter(f -> f.getConfigAssayMethodProjectId().equals(configAssayMethodProjectDO.getId())).collect(Collectors.toList());
+					for (ConfigAssayMethodProjectParameterDO configAssayMethodProjectParameterDO : configAssayMethodProjectParameterDOList) {
+						BusinessAssayParameterDataDO businessAssayParameterDataDO = new BusinessAssayParameterDataDO();
+						businessAssayParameterDataDO.setId(IdWorker.getId());
+						businessAssayParameterDataDO.setConfigAssayMethodProjectParameterId(configAssayMethodProjectParameterDO.getId());
+						businessAssayParameterDataDO.setBusinessAssayProjectDataId(businessAssayProjectDataDO.getId());
+						businessAssayParameterDataDO.setDictionaryParameterId(configAssayMethodProjectParameterDO.getDictionaryParameterId());
+						businessAssayParameterDataDO.setDataType(configAssayMethodProjectParameterDO.getDataType());
+						businessAssayParameterDataDO.setDecimalPosition(configAssayMethodProjectParameterDO.getDecimalPosition());
+						
+						
+						businessAssayParameterDataDOList.add(businessAssayParameterDataDO);
+					}
 				}
 			}
 //			if (assayProjectBuilder.length() > 1) {