任务分配调整

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskAnalysisSampleAndQcProjectRespVO.java

@@ -43,6 +43,9 @@ public class BusinessAssayTaskAnalysisSampleAndQcProjectRespVO {
     /** 动态表单值 **/
     private String formValue;
 
+    /** 质量控制分析方法 **/
+    private List<ConfigQCSampleMethodExtendRespVO> configQCSampleMethodList;
+    
     /** 分配任务的分析数据 **/
     private List<BusinessAssayTaskAnalysisDataRespVO> assayTaskAnalysisDataList;
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCCoefficientParameterDataReqVO.java

@@ -0,0 +1,47 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import com.zt.plat.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 质控样检测系数参数业务分页 Request VO")
+@Data
+public class BusinessQCCoefficientParameterDataReqVO {
+
+    @Schema(description = "检测项目业务ID", example = "23013")
+    private Long businessQCCoefficientDataId;
+
+    @Schema(description = "质控样检测方法参数配置ID", example = "870")
+    private Long configQCSampleMethodParameterId;
+
+    @Schema(description = "参数ID,字典表【T_DIC_PRM】", example = "7977")
+    private Long dictionaryParameterId;
+
+    @Schema(description = "值")
+    private String value;
+
+    @Schema(description = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", example = "2")
+    private String dataType;
+
+    @Schema(description = "小数位")
+    private Integer decimalPosition;
+
+    @Schema(description = "所属部门")
+    private String systemDepartmentCode;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "乐观锁", example = "25016")
+    private Integer updateCount;
+
+    @Schema(description = "备注")
+    private String remark;
+
+}

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCManagementParameterDataReqVO.java

@@ -0,0 +1,47 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import com.zt.plat.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 质控样检测参数数据业务分页 Request VO")
+@Data
+public class BusinessQCManagementParameterDataReqVO extends PageParam {
+
+    @Schema(description = "检测项目业务ID", example = "23428")
+    private Long businessQCManagementProjectDataId;
+
+    @Schema(description = "检测方法分析项目参数配置表ID", example = "12018")
+    private Long configAssayMethodProjectParameterId;
+
+    @Schema(description = "参数ID,字典表【T_DIC_PRM】", example = "18162")
+    private Long dictionaryParameterId;
+
+    @Schema(description = "值")
+    private String value;
+
+    @Schema(description = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", example = "2")
+    private String dataType;
+
+    @Schema(description = "小数位")
+    private Integer decimalPosition;
+
+    @Schema(description = "所属部门")
+    private String systemDepartmentCode;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "乐观锁", example = "18772")
+    private Integer updateCount;
+
+    @Schema(description = "备注")
+    private String remark;
+
+}

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCManagementProjectDataReqVO.java

@@ -0,0 +1,59 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import com.zt.plat.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 质控样检测项目数据业务分页 Request VO")
+@Data
+public class BusinessQCManagementProjectDataReqVO {
+
+    @Schema(description = "检测任务ID", example = "940")
+    private Long businessQCManagementDataId;
+
+    @Schema(description = "检测方法分析项目配置ID", example = "413")
+    private Long configAssayMethodProjectId;
+
+    @Schema(description = "检测项目字典ID,字典表【T_DIC_PRJ】", example = "3746")
+    private Long dictionaryProjectId;
+
+    @Schema(description = "用途,ingredient-配料、report-报出、ingredient_report-配料及报出、quality_control-品质控制")
+    private String usage;
+
+    @Schema(description = "符号,=、>、<、等")
+    private String symbol;
+
+    @Schema(description = "值")
+    private String value;
+
+    @Schema(description = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", example = "2")
+    private String dataType;
+
+    @Schema(description = "小数位")
+    private Integer decimalPosition;
+
+    @Schema(description = "是否不参与超差判定")
+    private Integer isNotAssessment;
+
+    @Schema(description = "是否启用")
+    private Integer isEnabled;
+
+    @Schema(description = "乐观锁", example = "10206")
+    private Integer updateCount;
+
+    @Schema(description = "所属部门")
+    private String systemDepartmentCode;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "备注")
+    private String remark;
+
+}

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessQCCoefficientDataMapper.java

@@ -72,4 +72,10 @@ public interface BusinessQCCoefficientDataMapper extends BaseMapperX<BusinessQCC
 				.eq(BusinessQCCoefficientDataDO::getBusinessAssayTaskId, businessAssayTaskId));
 	}
 
+	default List<BusinessQCCoefficientDataDO> selectByBusinessAssayTaskIdAndDictionaryBusinessKey(Long businessAssayTaskId, String dictionaryBusinessKey) {
+		return selectList(new LambdaQueryWrapperX<BusinessQCCoefficientDataDO>()
+				.eq(BusinessQCCoefficientDataDO::getBusinessAssayTaskId, businessAssayTaskId)
+				.eq(BusinessQCCoefficientDataDO::getDictionaryBusinessKey, dictionaryBusinessKey));
+	}
+
 }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessQCCoefficientParameterDataMapper.java

@@ -4,8 +4,13 @@ import java.util.*;
 
 import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.zt.plat.framework.mybatis.core.query.MPJLambdaWrapperX;
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayProjectAndParameterRespVO;
 import com.zt.plat.module.qms.business.bus.controller.vo.BusinessQCCoefficientParameterDataPageReqVO;
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessQCCoefficientParameterDataReqVO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCCoefficientParameterDataDO;
+import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigQCSampleMethodParameterDO;
+import com.zt.plat.module.qms.business.dic.dal.dataobject.DictionaryParameterDO;
 import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -32,4 +37,35 @@ public interface BusinessQCCoefficientParameterDataMapper extends BaseMapperX<Bu
                 .orderByDesc(BusinessQCCoefficientParameterDataDO::getId));
     }
     
+    default List<BusinessAssayProjectAndParameterRespVO> selectProjectAndParameterBy(BusinessQCCoefficientParameterDataReqVO reqVO) {
+    	return selectJoinList(BusinessAssayProjectAndParameterRespVO.class, new MPJLambdaWrapperX<BusinessQCCoefficientParameterDataDO>()
+    			.leftJoin(ConfigQCSampleMethodParameterDO.class, ConfigQCSampleMethodParameterDO::getId, BusinessQCCoefficientParameterDataDO::getConfigQCSampleMethodParameterId)
+				.leftJoin(DictionaryParameterDO.class, DictionaryParameterDO::getId, BusinessQCCoefficientParameterDataDO::getDictionaryParameterId)
+				.selectAs(BusinessQCCoefficientParameterDataDO::getId, BusinessAssayProjectAndParameterRespVO::getId)
+				.selectAs(BusinessQCCoefficientParameterDataDO::getDictionaryParameterId, BusinessAssayProjectAndParameterRespVO::getDicId)
+				.selectAs(DictionaryParameterDO::getKey, BusinessAssayProjectAndParameterRespVO::getDicKey)
+				.selectAs(DictionaryParameterDO::getName, BusinessAssayProjectAndParameterRespVO::getName)
+				.selectAs(DictionaryParameterDO::getName, BusinessAssayProjectAndParameterRespVO::getShowName)
+				.selectAs(DictionaryParameterDO::getFillingWay, BusinessAssayProjectAndParameterRespVO::getFillingWay)
+				.selectAs(BusinessQCCoefficientParameterDataDO::getDataType, BusinessAssayProjectAndParameterRespVO::getDataType)
+				.selectAs(BusinessQCCoefficientParameterDataDO::getDecimalPosition, BusinessAssayProjectAndParameterRespVO::getDecimalPosition)
+				.selectAs(BusinessQCCoefficientParameterDataDO::getValue, BusinessAssayProjectAndParameterRespVO::getValue)
+				.selectAs(DictionaryParameterDO::getUnit, BusinessAssayProjectAndParameterRespVO::getUnit)
+				.selectAs(ConfigQCSampleMethodParameterDO::getIsNull, BusinessAssayProjectAndParameterRespVO::getIsNull)
+				.selectAs(ConfigQCSampleMethodParameterDO::getFormula, BusinessAssayProjectAndParameterRespVO::getFormula)
+				.selectAs(ConfigQCSampleMethodParameterDO::getSortNo, BusinessAssayProjectAndParameterRespVO::getParamNo)
+				.selectAs("'parameter'", BusinessAssayProjectAndParameterRespVO::getType)
+				.eqIfPresent(BusinessQCCoefficientParameterDataDO::getBusinessQCCoefficientDataId, reqVO.getBusinessQCCoefficientDataId())
+                .eqIfPresent(BusinessQCCoefficientParameterDataDO::getConfigQCSampleMethodParameterId, reqVO.getConfigQCSampleMethodParameterId())
+                .eqIfPresent(BusinessQCCoefficientParameterDataDO::getDictionaryParameterId, reqVO.getDictionaryParameterId())
+                .eqIfPresent(BusinessQCCoefficientParameterDataDO::getValue, reqVO.getValue())
+                .eqIfPresent(BusinessQCCoefficientParameterDataDO::getDataType, reqVO.getDataType())
+                .eqIfPresent(BusinessQCCoefficientParameterDataDO::getDecimalPosition, reqVO.getDecimalPosition())
+                .eqIfPresent(BusinessQCCoefficientParameterDataDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
+                .betweenIfPresent(BusinessQCCoefficientParameterDataDO::getCreateTime, reqVO.getCreateTime())
+                .eqIfPresent(BusinessQCCoefficientParameterDataDO::getUpdateCount, reqVO.getUpdateCount())
+                .eqIfPresent(BusinessQCCoefficientParameterDataDO::getRemark, reqVO.getRemark())
+                .orderByAsc(ConfigQCSampleMethodParameterDO::getSortNo)); 
+    }
+
 }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessQCManagementDataMapper.java

@@ -67,4 +67,9 @@ public interface BusinessQCManagementDataMapper extends BaseMapperX<BusinessQCMa
                 .orderByDesc(BusinessQCManagementDataDO::getId));
 	}
 	
+	default List<BusinessQCManagementDataDO> selectByBusinessAssayTaskId(Long businessAssayTaskId) {
+		return selectList(new LambdaQueryWrapperX<BusinessQCManagementDataDO>()
+				.eq(BusinessQCManagementDataDO::getBusinessAssayTaskId, businessAssayTaskId));		
+	}
+
 }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessQCManagementParameterDataMapper.java

@@ -4,8 +4,11 @@ import java.util.*;
 
 import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.zt.plat.framework.mybatis.core.query.MPJLambdaWrapperX;
 import com.zt.plat.module.qms.business.bus.controller.vo.*;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCManagementParameterDataDO;
+import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigAssayMethodProjectParameterDO;
+import com.zt.plat.module.qms.business.dic.dal.dataobject.DictionaryParameterDO;
 import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -32,4 +35,35 @@ public interface BusinessQCManagementParameterDataMapper extends BaseMapperX<Bus
                 .orderByDesc(BusinessQCManagementParameterDataDO::getId));
     }
     
+    default List<BusinessAssayProjectAndParameterRespVO> selectProjectAndParameterBy(BusinessQCManagementParameterDataReqVO reqVO) {
+    	return selectJoinList(BusinessAssayProjectAndParameterRespVO.class, new MPJLambdaWrapperX<BusinessQCManagementParameterDataDO>()
+				.leftJoin(ConfigAssayMethodProjectParameterDO.class, ConfigAssayMethodProjectParameterDO::getId, BusinessQCManagementParameterDataDO::getConfigAssayMethodProjectParameterId)
+				.leftJoin(DictionaryParameterDO.class, DictionaryParameterDO::getId, BusinessQCManagementParameterDataDO::getDictionaryParameterId)
+				.selectAs(BusinessQCManagementParameterDataDO::getId, BusinessAssayProjectAndParameterRespVO::getId)
+				.selectAs(BusinessQCManagementParameterDataDO::getDictionaryParameterId, BusinessAssayProjectAndParameterRespVO::getDicId)
+				.selectAs(DictionaryParameterDO::getKey, BusinessAssayProjectAndParameterRespVO::getDicKey)
+				.selectAs(DictionaryParameterDO::getName, BusinessAssayProjectAndParameterRespVO::getName)
+				.selectAs(DictionaryParameterDO::getName, BusinessAssayProjectAndParameterRespVO::getShowName)
+				.selectAs(DictionaryParameterDO::getFillingWay, BusinessAssayProjectAndParameterRespVO::getFillingWay)
+				.selectAs(BusinessQCManagementParameterDataDO::getDataType, BusinessAssayProjectAndParameterRespVO::getDataType)
+				.selectAs(BusinessQCManagementParameterDataDO::getDecimalPosition, BusinessAssayProjectAndParameterRespVO::getDecimalPosition)
+				.selectAs(BusinessQCManagementParameterDataDO::getValue, BusinessAssayProjectAndParameterRespVO::getValue)
+				.selectAs(DictionaryParameterDO::getUnit, BusinessAssayProjectAndParameterRespVO::getUnit)
+				.selectAs(ConfigAssayMethodProjectParameterDO::getIsNull, BusinessAssayProjectAndParameterRespVO::getIsNull)
+				.selectAs(ConfigAssayMethodProjectParameterDO::getFormula, BusinessAssayProjectAndParameterRespVO::getFormula)
+				.selectAs(ConfigAssayMethodProjectParameterDO::getSortNo, BusinessAssayProjectAndParameterRespVO::getParamNo)
+				.selectAs("'parameter'", BusinessAssayProjectAndParameterRespVO::getType)
+                .eqIfPresent(BusinessQCManagementParameterDataDO::getBusinessQCManagementProjectDataId, reqVO.getBusinessQCManagementProjectDataId())
+                .eqIfPresent(BusinessQCManagementParameterDataDO::getConfigAssayMethodProjectParameterId, reqVO.getConfigAssayMethodProjectParameterId())
+                .eqIfPresent(BusinessQCManagementParameterDataDO::getDictionaryParameterId, reqVO.getDictionaryParameterId())
+                .eqIfPresent(BusinessQCManagementParameterDataDO::getValue, reqVO.getValue())
+                .eqIfPresent(BusinessQCManagementParameterDataDO::getDataType, reqVO.getDataType())
+                .eqIfPresent(BusinessQCManagementParameterDataDO::getDecimalPosition, reqVO.getDecimalPosition())
+                .eqIfPresent(BusinessQCManagementParameterDataDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
+                .betweenIfPresent(BusinessQCManagementParameterDataDO::getCreateTime, reqVO.getCreateTime())
+                .eqIfPresent(BusinessQCManagementParameterDataDO::getUpdateCount, reqVO.getUpdateCount())
+                .eqIfPresent(BusinessQCManagementParameterDataDO::getRemark, reqVO.getRemark())
+                .orderByAsc(ConfigAssayMethodProjectParameterDO::getSortNo));
+    } 
+
 }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessQCManagementProjectDataMapper.java

@@ -4,8 +4,11 @@ import java.util.*;
 
 import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.zt.plat.framework.mybatis.core.query.MPJLambdaWrapperX;
 import com.zt.plat.module.qms.business.bus.controller.vo.*;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCManagementProjectDataDO;
+import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigAssayMethodProjectDO;
+import com.zt.plat.module.qms.business.dic.dal.dataobject.DictionaryProjectDO;
 import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -36,4 +39,38 @@ public interface BusinessQCManagementProjectDataMapper extends BaseMapperX<Busin
                 .orderByDesc(BusinessQCManagementProjectDataDO::getId));
     }
 
+	default List<BusinessAssayProjectAndParameterRespVO> selectProjectAndParameterBy(BusinessQCManagementProjectDataReqVO reqVO) {
+		return selectJoinList(BusinessAssayProjectAndParameterRespVO.class, new MPJLambdaWrapperX<BusinessQCManagementProjectDataDO>()
+				.leftJoin(ConfigAssayMethodProjectDO.class, ConfigAssayMethodProjectDO::getId, BusinessQCManagementProjectDataDO::getConfigAssayMethodProjectId)
+				.leftJoin(DictionaryProjectDO.class, DictionaryProjectDO::getId, BusinessQCManagementProjectDataDO::getDictionaryProjectId)
+				.selectAs(BusinessQCManagementProjectDataDO::getId, BusinessAssayProjectAndParameterRespVO::getId)
+				.selectAs(BusinessQCManagementProjectDataDO::getDictionaryProjectId, BusinessAssayProjectAndParameterRespVO::getDicId)
+				.selectAs(DictionaryProjectDO::getKey, BusinessAssayProjectAndParameterRespVO::getDicKey)
+				//.selectAs(DictionaryProjectDO::getName, BusinessAssayProjectAndParameterRespVO::getName)
+				.selectAs(DictionaryProjectDO::getSimpleName, BusinessAssayProjectAndParameterRespVO::getName)
+				.selectAs(DictionaryProjectDO::getShowName, BusinessAssayProjectAndParameterRespVO::getShowName)
+				.selectAs(BusinessQCManagementProjectDataDO::getDataType, BusinessAssayProjectAndParameterRespVO::getDataType)
+				.selectAs(BusinessQCManagementProjectDataDO::getDecimalPosition, BusinessAssayProjectAndParameterRespVO::getDecimalPosition)
+				.selectAs(BusinessQCManagementProjectDataDO::getValue, BusinessAssayProjectAndParameterRespVO::getValue)
+				.selectAs(ConfigAssayMethodProjectDO::getDictionaryProjectUnit, BusinessAssayProjectAndParameterRespVO::getUnit)
+				.selectAs(ConfigAssayMethodProjectDO::getIsNull, BusinessAssayProjectAndParameterRespVO::getIsNull)
+				.selectAs(ConfigAssayMethodProjectDO::getFormula, BusinessAssayProjectAndParameterRespVO::getFormula)
+				.selectAs(ConfigAssayMethodProjectDO::getSortNo, BusinessAssayProjectAndParameterRespVO::getParamNo)
+				.selectAs("'project'", BusinessAssayProjectAndParameterRespVO::getType)
+                .eqIfPresent(BusinessQCManagementProjectDataDO::getBusinessQCManagementDataId, reqVO.getBusinessQCManagementDataId())
+                .eqIfPresent(BusinessQCManagementProjectDataDO::getConfigAssayMethodProjectId, reqVO.getConfigAssayMethodProjectId())
+                .eqIfPresent(BusinessQCManagementProjectDataDO::getDictionaryProjectId, reqVO.getDictionaryProjectId())
+                .eqIfPresent(BusinessQCManagementProjectDataDO::getUsage, reqVO.getUsage())
+                .eqIfPresent(BusinessQCManagementProjectDataDO::getSymbol, reqVO.getSymbol())
+                .eqIfPresent(BusinessQCManagementProjectDataDO::getValue, reqVO.getValue())
+                .eqIfPresent(BusinessQCManagementProjectDataDO::getDataType, reqVO.getDataType())
+                .eqIfPresent(BusinessQCManagementProjectDataDO::getDecimalPosition, reqVO.getDecimalPosition())
+                .eqIfPresent(BusinessQCManagementProjectDataDO::getIsNotAssessment, reqVO.getIsNotAssessment())
+                .eqIfPresent(BusinessQCManagementProjectDataDO::getIsEnabled, reqVO.getIsEnabled())
+                .eqIfPresent(BusinessQCManagementProjectDataDO::getUpdateCount, reqVO.getUpdateCount())
+                .eqIfPresent(BusinessQCManagementProjectDataDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
+                .betweenIfPresent(BusinessQCManagementProjectDataDO::getCreateTime, reqVO.getCreateTime())
+                .eqIfPresent(BusinessQCManagementProjectDataDO::getRemark, reqVO.getRemark())
+                .orderByAsc(ConfigAssayMethodProjectDO::getSortNo));
+	}
 }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisServiceImpl.java

@@ -25,20 +25,26 @@ import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayProjectAnd
 import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayProjectDataReqVO;
 import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayTaskAnalysisSampleAndQcProjectRespVO;
 import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayTaskAnalysisSampleProjectRespVO;
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessQCCoefficientParameterDataReqVO;
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessQCManagementParameterDataReqVO;
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessQCManagementProjectDataReqVO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayParameterDataDO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayProjectDataDO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDataDO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDetailDO;
-import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCDataDO;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCCoefficientDataDO;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCManagementDataDO;
 import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessAssayParameterDataMapper;
 import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessAssayProjectDataMapper;
 import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessAssayTaskDataMapper;
 import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessAssayTaskDetailMapper;
 import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessAssayTaskMapper;
-import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessQCDataMapper;
+import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessQCCoefficientDataMapper;
-import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessQCParameterDataMapper;
+import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessQCCoefficientParameterDataMapper;
-import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessQCProjectDataMapper;
+import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessQCManagementDataMapper;
+import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessQCManagementParameterDataMapper;
+import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessQCManagementProjectDataMapper;
 import com.zt.plat.module.qms.business.config.controller.vo.BusinessAssayTaskAnalysisDataRespVO;
 import com.zt.plat.module.qms.business.config.controller.vo.ConfigAssayMethodProjectCoefficientRespVO;
 import com.zt.plat.module.qms.business.config.controller.vo.ConfigAssayMethodProjectRangeRespVO;
@@ -100,13 +106,19 @@ public class SampleAnalysisServiceImpl implements SampleAnalysisService {
 	private ConfigQCSampleMethodMapper configQCSampleMethodMapper;
 	
 	@Resource
-	private BusinessQCDataMapper businessQCDataMapper;
+	private BusinessQCCoefficientDataMapper businessQCCoefficientDataMapper;
 	
 	@Resource
-	private BusinessQCProjectDataMapper businessQCProjectDataMapper;
+	private BusinessQCCoefficientParameterDataMapper businessQCCoefficientParameterDataMapper;
 	
 	@Resource
-	private BusinessQCParameterDataMapper businessQCParameterDataMapper;
+	private BusinessQCManagementDataMapper businessQCManagementDataMapper;
+	
+	@Resource
+	private BusinessQCManagementProjectDataMapper businessQCManagementProjectDataMapper;
+	
+	@Resource
+	private BusinessQCManagementParameterDataMapper businessQCManagementParameterDataMapper;
 	
     @Resource
     private DataCollectionService dataCollectionService;
@@ -354,8 +366,20 @@ public class SampleAnalysisServiceImpl implements SampleAnalysisService {
 		businessAssayTaskAnalysisSampleAndQcProjectRespVO.setConfigAssayMethodName(configAssayMethodDO.getName());
 		businessAssayTaskAnalysisSampleAndQcProjectRespVO.setDataCollectionKey(configAssayMethodDO.getDataCollectionKey());
 
+		List<BusinessAssayTaskAnalysisDataRespVO> assayTaskAnalysisDataList = new ArrayList<>();
 		
+		//质控分析数据
+		List<BusinessAssayTaskAnalysisDataRespVO> qcAnalysis = getQcAnalysis(businessAssayTaskDO);
+		assayTaskAnalysisDataList.addAll(qcAnalysis);
 		
+		//样品分析数据
+		BusinessAssayTaskAnalysisDataRespVO analysis = getAnalysis(businessAssayTaskDO);
+		assayTaskAnalysisDataList.add(analysis);
+		
+		businessAssayTaskAnalysisSampleAndQcProjectRespVO.setAssayTaskAnalysisDataList(assayTaskAnalysisDataList);
+
+		List<ConfigQCSampleMethodExtendRespVO> configQCSampleMethodList = configQCSampleMethodMapper.selectByConfigAssayMethodId(businessAssayTaskDO.getConfigAssayMethodId());
+    	businessAssayTaskAnalysisSampleAndQcProjectRespVO.setConfigQCSampleMethodList(configQCSampleMethodList);
 		
         //查询区间范围
         List<ConfigAssayMethodProjectRangeDO> configAssayMethodProjectRangeDOList = configAssayMethodProjectRangeMapper.selectList(new LambdaQueryWrapperX<ConfigAssayMethodProjectRangeDO>().eq(ConfigAssayMethodProjectRangeDO::getConfigAssayMethodId, businessAssayTaskDO.getConfigAssayMethodId()));
@@ -368,12 +392,207 @@ public class SampleAnalysisServiceImpl implements SampleAnalysisService {
 		return businessAssayTaskAnalysisSampleAndQcProjectRespVO;
 	}
 	
+	private BusinessAssayTaskAnalysisDataRespVO getAnalysis(BusinessAssayTaskDO businessAssayTaskDO) {
+		BusinessAssayTaskAnalysisDataRespVO businessAssayTaskAnalysisDataRespVO = new BusinessAssayTaskAnalysisDataRespVO();
+		businessAssayTaskAnalysisDataRespVO.setAnalysisType("analysis");
+		businessAssayTaskAnalysisDataRespVO.setSortNo(99);
+		
+
+		//处理列
+        List<BatchSampleAnalysisColumnRespVO> cloumns = new ArrayList<>();
+        cloumns.add(new BatchSampleAnalysisColumnRespVO("sampleCode", "sampleCode", "样品编号", "200px", "200px", "string", null, null, null, null, false, null, null));
+        cloumns.add(new BatchSampleAnalysisColumnRespVO("sampleName", "sampleName", "样品名称", "200px", "200px", "string", null, null, null, null, false, null, null));
+        //cloumns.add(new BatchSampleAnalysisColumnRespVO("cupNumber", "cupNumber", "杯号", "200px", "200px", "string", null, null, null, null, true, null));
+        
+        
+        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);
+        
+        BusinessAssayProjectDataReqVO projectDataSearch = new BusinessAssayProjectDataReqVO();
+        projectDataSearch.setBusinessAssayTaskDataId(businessAssayTaskData.getId());
+        List<BusinessAssayProjectAndParameterRespVO> projectAndParameterList = businessAssayProjectDataMapper.selectProjectAndParameterBy(projectDataSearch);
+        for (BusinessAssayProjectAndParameterRespVO ep : projectAndParameterList) {
+        	String fieldIndex = "e" + ep.getDicId();
+        	String title = ep.getShowName() + (StringUtils.isBlank(ep.getUnit()) ? "" : "(" + ep.getUnit() + ")");
+        	boolean isEdit = StringUtils.isBlank(ep.getFormula());
+        	cloumns.add(new BatchSampleAnalysisColumnRespVO(fieldIndex, fieldIndex + ".value", title,  "", "120px", ep.getDataType(), ep.getDecimalPosition(), null, ep.getFormula(), ep.getParamNo(), isEdit, ep.getUnit(), ep.getFillingWay()));
+        	
+        	if (StringUtils.isNotEmpty(ep.getFormula())) {
+        		BusinessAssayParameterDataReqVO parameterDataSearch = new BusinessAssayParameterDataReqVO();
+        		parameterDataSearch.setBusinessAssayProjectDataId(ep.getId());
+                List<BusinessAssayProjectAndParameterRespVO> plist = businessAssayParameterDataMapper.selectProjectAndParameterBy(parameterDataSearch);
+                for (BusinessAssayProjectAndParameterRespVO p : plist) {
+                	fieldIndex = "p" + p.getDicId();
+                	title = p.getShowName() + (StringUtils.isBlank(p.getUnit()) ? "" : "(" + p.getUnit() + ")");
+                	isEdit = StringUtils.isBlank(p.getFormula());
+                	cloumns.add(new BatchSampleAnalysisColumnRespVO(fieldIndex, fieldIndex + ".value", title,  "", "120px", p.getDataType(), p.getDecimalPosition(), null, p.getFormula(), p.getParamNo(), isEdit, p.getUnit(), p.getFillingWay()));
+				}
+			}
+		}
+        businessAssayTaskAnalysisDataRespVO.setColumns(cloumns);
+        
+
+        //处理数据
+        List<Map<String, Object>> datas = new ArrayList<>();
+        for (BusinessAssayTaskDataDO businessAssayTaskDataDO : businessAssayTaskDataList) {
+        	BusinessAssayTaskDetailDO businessAssayTaskDetailDO = businessAssayTaskDetailList.stream().filter(f -> f.getSampleId().equals(businessAssayTaskDataDO.getBusinessSubSampleId())).findFirst().orElse(null);
+        	
+            Map<String, Object> map = new HashedMap<>();
+            map.put("businessAssayTaskDataId", businessAssayTaskDataDO.getId());
+            map.put("businessAssayTaskId", businessAssayTaskDataDO.getBusinessAssayTaskId());
+            map.put("businessSubSampleId", businessAssayTaskDataDO.getBusinessSubSampleId());
+            map.put("businessSubParentSampleId", businessAssayTaskDataDO.getBusinessSubParentSampleId());
+            map.put("configAssayMethodId", businessAssayTaskDataDO.getConfigAssayMethodId());
+            map.put("businessAssayTaskDetailId", businessAssayTaskDetailDO.getId());
+            map.put("sampleCode", businessAssayTaskDetailDO.getSampleCode());
+            map.put("sampleName", businessAssayTaskDetailDO.getSampleName());
+
+            BusinessAssayProjectDataReqVO projectDataSearch2 = new BusinessAssayProjectDataReqVO();
+            projectDataSearch2.setBusinessAssayTaskDataId(businessAssayTaskDataDO.getId());
+            List<BusinessAssayProjectAndParameterRespVO> projectAndParameterList2 = businessAssayProjectDataMapper.selectProjectAndParameterBy(projectDataSearch2);
+            for (BusinessAssayProjectAndParameterRespVO ep : projectAndParameterList2) {
+				map.put("e" + ep.getDicId(), ep);
+				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);
+					}
+				}
+				
+			}
+            datas.add(map);
+        }
+        
+        businessAssayTaskAnalysisDataRespVO.setDatas(datas);
+		
+		
+		return businessAssayTaskAnalysisDataRespVO;
+	}
+	
 	private List<BusinessAssayTaskAnalysisDataRespVO> getQcAnalysis(BusinessAssayTaskDO businessAssayTaskDO) {
 		List<BusinessAssayTaskAnalysisDataRespVO> list = new ArrayList<>();
-		List<ConfigQCSampleMethodExtendRespVO> configQCSampleMethodList = configQCSampleMethodMapper.selectByConfigAssayMethodId(businessAssayTaskDO.getConfigAssayMethodId());
-		List<BusinessQCDataDO> businessQCDataDOList  = businessQCDataMapper.selectByBusinessAssayTaskId(businessAssayTaskDO.getConfigAssayMethodId());
-		//businessQCProjectDataMapper.selectby		
 		
+		List<ConfigQCSampleMethodExtendRespVO> configQCSampleMethodList = configQCSampleMethodMapper.selectByConfigAssayMethodId(businessAssayTaskDO.getConfigAssayMethodId());
+		BusinessAssayTaskAnalysisDataRespVO businessAssayTaskAnalysisDataRespVO = null;
+		for (ConfigQCSampleMethodExtendRespVO configQCSampleMethodExtendRespVO : configQCSampleMethodList) {
+			businessAssayTaskAnalysisDataRespVO = new BusinessAssayTaskAnalysisDataRespVO();
+			businessAssayTaskAnalysisDataRespVO.setAnalysisType(configQCSampleMethodExtendRespVO.getDictionaryBusinessKey());
+			businessAssayTaskAnalysisDataRespVO.setSortNo(configQCSampleMethodExtendRespVO.getSortNo());
+			
+			
+			//处理列
+	        List<BatchSampleAnalysisColumnRespVO> cloumns = new ArrayList<>();
+	        cloumns.add(new BatchSampleAnalysisColumnRespVO("sampleCode", "sampleCode", "样品编号", "200px", "200px", "string", null, null, null, null, false, null, null));
+	        cloumns.add(new BatchSampleAnalysisColumnRespVO("sampleName", "sampleName", "样品名称", "200px", "200px", "string", null, null, null, null, false, null, null));
+	        
+	        //处理数据
+	        List<Map<String, Object>> datas = new ArrayList<>();
+			if ("kby".equals(configQCSampleMethodExtendRespVO.getDictionaryBusinessKey()) || "by".equals(configQCSampleMethodExtendRespVO.getDictionaryBusinessKey())) {
+				List<BusinessQCCoefficientDataDO> businessQCCoefficientDataDOList = businessQCCoefficientDataMapper.selectByBusinessAssayTaskIdAndDictionaryBusinessKey(businessAssayTaskDO.getId(), configQCSampleMethodExtendRespVO.getDictionaryBusinessKey());			
+				if (CollUtil.isEmpty(businessQCCoefficientDataDOList)) {
+					break;
+				}
+				BusinessQCCoefficientDataDO businessQCCoefficientDataDO = businessQCCoefficientDataDOList.get(0);
+				
+				BusinessQCCoefficientParameterDataReqVO parameterDataSearch = new BusinessQCCoefficientParameterDataReqVO();
+				parameterDataSearch.setBusinessQCCoefficientDataId(businessQCCoefficientDataDO.getId());
+				List<BusinessAssayProjectAndParameterRespVO> plist = businessQCCoefficientParameterDataMapper.selectProjectAndParameterBy(parameterDataSearch);
+				for (BusinessAssayProjectAndParameterRespVO p : plist) {
+					String fieldIndex = "p" + p.getDicId();
+					String title = p.getShowName() + (StringUtils.isBlank(p.getUnit()) ? "" : "(" + p.getUnit() + ")");
+					boolean isEdit = StringUtils.isBlank(p.getFormula());
+                	cloumns.add(new BatchSampleAnalysisColumnRespVO(fieldIndex, fieldIndex + ".value", title,  "", "120px", p.getDataType(), p.getDecimalPosition(), null, p.getFormula(), p.getParamNo(), isEdit, p.getUnit(), p.getFillingWay()));
+				}
+				
+				
+				for (BusinessQCCoefficientDataDO businessQCCoefficientData: businessQCCoefficientDataDOList) {
+		            Map<String, Object> map = new HashedMap<>();
+		            map.put("businessAssayTaskDataId", businessQCCoefficientData.getId());
+		            map.put("businessAssayTaskId", businessQCCoefficientData.getBusinessAssayTaskId());
+		            map.put("businessSubSampleId", "");
+		            map.put("businessSubParentSampleId", "");
+		            map.put("configAssayMethodId", businessQCCoefficientData.getConfigAssayMethodId());
+		            map.put("businessAssayTaskDetailId", "");
+		            map.put("sampleCode", businessQCCoefficientData.getSampleCode());
+		            map.put("sampleName", businessQCCoefficientData.getSampleName());
+
+		            BusinessQCCoefficientParameterDataReqVO parameterDataSearch2 = new BusinessQCCoefficientParameterDataReqVO();
+		            parameterDataSearch2.setBusinessQCCoefficientDataId(businessQCCoefficientData.getId());
+	                List<BusinessAssayProjectAndParameterRespVO> plist2 = businessQCCoefficientParameterDataMapper.selectProjectAndParameterBy(parameterDataSearch2);
+	                for (BusinessAssayProjectAndParameterRespVO p : plist2) {
+	                	map.put("p" + p.getDicId(), p);
+					}
+		            datas.add(map);
+				}
+				
+				
+			} else {
+				List<BusinessQCManagementDataDO> businessQCManagementDataDOList = businessQCManagementDataMapper.selectByBusinessAssayTaskId(businessAssayTaskDO.getId());
+				
+				if (CollUtil.isEmpty(businessQCManagementDataDOList)) {
+					break;
+				}
+				BusinessQCManagementDataDO businessQCManagementDataDO = businessQCManagementDataDOList.get(0);
+
+		        BusinessQCManagementProjectDataReqVO projectDataSearch = new BusinessQCManagementProjectDataReqVO();
+		        projectDataSearch.setBusinessQCManagementDataId(businessQCManagementDataDO.getId());
+		        List<BusinessAssayProjectAndParameterRespVO> projectAndParameterList = businessQCManagementProjectDataMapper.selectProjectAndParameterBy(projectDataSearch);
+		        for (BusinessAssayProjectAndParameterRespVO ep : projectAndParameterList) {
+		        	String fieldIndex = "e" + ep.getDicId();
+		        	String title = ep.getShowName() + (StringUtils.isBlank(ep.getUnit()) ? "" : "(" + ep.getUnit() + ")");
+		        	boolean isEdit = StringUtils.isBlank(ep.getFormula());
+		        	cloumns.add(new BatchSampleAnalysisColumnRespVO(fieldIndex, fieldIndex + ".value", title,  "", "120px", ep.getDataType(), ep.getDecimalPosition(), null, ep.getFormula(), ep.getParamNo(), isEdit, ep.getUnit(), ep.getFillingWay()));
+		        	
+		        	if (StringUtils.isNotEmpty(ep.getFormula())) {
+		        		BusinessQCManagementParameterDataReqVO parameterDataSearch = new BusinessQCManagementParameterDataReqVO();
+		        		parameterDataSearch.setBusinessQCManagementProjectDataId(ep.getId());
+		                List<BusinessAssayProjectAndParameterRespVO> plist = businessQCManagementParameterDataMapper.selectProjectAndParameterBy(parameterDataSearch);
+		                for (BusinessAssayProjectAndParameterRespVO p : plist) {
+		                	fieldIndex = "p" + p.getDicId();
+		                	title = p.getShowName() + (StringUtils.isBlank(p.getUnit()) ? "" : "(" + p.getUnit() + ")");
+		                	isEdit = StringUtils.isBlank(p.getFormula());
+		                	cloumns.add(new BatchSampleAnalysisColumnRespVO(fieldIndex, fieldIndex + ".value", title,  "", "120px", p.getDataType(), p.getDecimalPosition(), null, p.getFormula(), p.getParamNo(), isEdit, p.getUnit(), p.getFillingWay()));
+						}
+					}
+				}
+
+		        for (BusinessQCManagementDataDO businessQCManagementData : businessQCManagementDataDOList) {
+		            Map<String, Object> map = new HashedMap<>();
+		            map.put("businessAssayTaskDataId", businessQCManagementData.getId());
+		            map.put("businessAssayTaskId", businessQCManagementData.getBusinessAssayTaskId());
+		            map.put("businessSubSampleId", "");
+		            map.put("businessSubParentSampleId", "");
+		            map.put("configAssayMethodId", businessQCManagementData.getConfigAssayMethodId());
+		            map.put("businessAssayTaskDetailId", "");
+		            map.put("sampleCode", businessQCManagementData.getSampleCode());
+		            map.put("sampleName", businessQCManagementData.getSampleName());
+
+		            BusinessQCManagementProjectDataReqVO projectDataSearch2 = new BusinessQCManagementProjectDataReqVO();
+		            projectDataSearch2.setBusinessQCManagementDataId(businessQCManagementDataDO.getId());
+		            List<BusinessAssayProjectAndParameterRespVO> projectAndParameterList2 = businessQCManagementProjectDataMapper.selectProjectAndParameterBy(projectDataSearch2);
+		            for (BusinessAssayProjectAndParameterRespVO ep : projectAndParameterList2) {
+						map.put("e" + ep.getDicId(), ep);
+						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);
+							}
+						}
+						
+					}
+		            datas.add(map);
+				}
+				
+			}
+			businessAssayTaskAnalysisDataRespVO.setColumns(cloumns);
+			businessAssayTaskAnalysisDataRespVO.setDatas(datas);
+			list.add(businessAssayTaskAnalysisDataRespVO);
+		}
 		return list;
 	}
 	

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/BusinessAssayTaskAnalysisDataRespVO.java

@@ -19,6 +19,8 @@ public class BusinessAssayTaskAnalysisDataRespVO {
 	/** 排序号 **/
 	private Integer sortNo;
 
+	/** 质控方法 **/
+	private ConfigQCSampleMethodExtendRespVO configQCSampleMethod;
     
     /** 分析的列 **/
     private List<BatchSampleAnalysisColumnRespVO> columns;

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/mapper/ConfigQCSampleMethodMapper.java

@@ -44,7 +44,8 @@ public interface ConfigQCSampleMethodMapper extends BaseMapperX<ConfigQCSampleMe
     			.leftJoin(DictionaryBusinessDO.class, DictionaryBusinessDO::getId, ConfigQCSampleMethodDO::getDictionaryBusinessId)
     			.selectAll(ConfigQCSampleMethodDO.class)
     			.selectAs(DictionaryBusinessDO::getName, ConfigQCSampleMethodExtendRespVO::getDictionaryBusinessName)
-    			.eq(ConfigQCSampleMethodDO::getConfigAssayMethodId, configAssayMethodId));
+    			.eq(ConfigQCSampleMethodDO::getConfigAssayMethodId, configAssayMethodId)
+    			.orderByAsc(ConfigQCSampleMethodDO::getSortNo));
     }
     
     
@@ -53,7 +54,8 @@ public interface ConfigQCSampleMethodMapper extends BaseMapperX<ConfigQCSampleMe
     			.leftJoin(DictionaryBusinessDO.class, DictionaryBusinessDO::getId, ConfigQCSampleMethodDO::getDictionaryBusinessId)
     			.selectAll(ConfigQCSampleMethodDO.class)
     			.selectAs(DictionaryBusinessDO::getName, ConfigQCSampleMethodExtendRespVO::getDictionaryBusinessName)
-    			.in(ConfigQCSampleMethodDO::getConfigAssayMethodId, configAssayMethodIds));
+    			.in(ConfigQCSampleMethodDO::getConfigAssayMethodId, configAssayMethodIds)
+    			.orderByAsc(ConfigQCSampleMethodDO::getSortNo));
     }
     
     default ConfigQCSampleMethodExtendRespVO selectByConfigAssayMethodIdAndDictionaryBusinessKey(Long configAssayMethodId, String dictionaryBusinessKey) {