diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDataMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDataMapper.java
index 07613588..f5d4d60b 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDataMapper.java
+++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDataMapper.java
@@ -144,7 +144,10 @@ public interface BusinessAssayTaskDataMapper extends BaseMapperX<BusinessAssayTa
         if (ObjectUtil.isNotEmpty(reqVO.getSampleStatus())) {
     		mpjLambdaWrapper.eq(BusinessSubSampleAnalysisGroupDO::getSampleStatus, reqVO.getSampleStatus());
 		}
-        mpjLambdaWrapper.orderByAsc(BusinessAssayTaskDataDO::getSampleFlowNodeTime).orderByAsc(BusinessSubSampleDO::getSampleAssayCode);
+        mpjLambdaWrapper.orderByAsc(BusinessAssayTaskDataDO::getSampleFlowNodeTime)
+        .orderByAsc("NVL(REGEXP_SUBSTR(SMP_ASY_CD, '^(.*-)'), SMP_ASY_CD)")
+        .orderByAsc("CASE WHEN INSTR(SMP_ASY_CD, '-') = 0 THEN 0 WHEN REGEXP_LIKE(REGEXP_SUBSTR(SMP_ASY_CD, '[^-]+$'), '[^0-9]') THEN 9999999 ELSE CAST(REGEXP_SUBSTR(SMP_ASY_CD, '[^-]+$') AS BIGINT) END");
+//        .orderByAsc(BusinessSubSampleDO::getSampleAssayCode);
 		return selectJoinList(BusinessAssayTaskDataExtendRespVO.class, mpjLambdaWrapper);
     }
 
@@ -255,7 +258,10 @@ public interface BusinessAssayTaskDataMapper extends BaseMapperX<BusinessAssayTa
         if (ObjectUtil.isNotEmpty(reqVO.getSampleStatus())) {
     		mpjLambdaWrapper.eq(BusinessSubSampleAnalysisGroupDO::getSampleStatus, reqVO.getSampleStatus());
 		}
-        mpjLambdaWrapper.orderByAsc(BusinessAssayTaskDataDO::getSampleFlowNodeTime).orderByAsc(BusinessSubSampleDO::getSampleAssayCode);
+        mpjLambdaWrapper.orderByAsc(BusinessAssayTaskDataDO::getSampleFlowNodeTime)
+        .orderByAsc("NVL(REGEXP_SUBSTR(SMP_ASY_CD, '^(.*-)'), SMP_ASY_CD)")
+        .orderByAsc("CASE WHEN INSTR(SMP_ASY_CD, '-') = 0 THEN 0 WHEN REGEXP_LIKE(REGEXP_SUBSTR(SMP_ASY_CD, '[^-]+$'), '[^0-9]') THEN 9999999 ELSE CAST(REGEXP_SUBSTR(SMP_ASY_CD, '[^-]+$') AS BIGINT) END");
+//        .orderByAsc(BusinessSubSampleDO::getSampleAssayCode);
         return selectJoinPage(reqVO, BusinessAssayTaskDataExtendRespVO.class, mpjLambdaWrapper);
     }
     
@@ -378,8 +384,12 @@ public interface BusinessAssayTaskDataMapper extends BaseMapperX<BusinessAssayTa
      * @return
      */
 	default List<BusinessAssayTaskDataDO> selectByBusinessAssayTaskId(Long businessAssayTaskId) {
-		return selectList(new LambdaQueryWrapperX<BusinessAssayTaskDataDO>()
-				.eq(BusinessAssayTaskDataDO::getBusinessAssayTaskId, businessAssayTaskId));
+		return selectJoinList(BusinessAssayTaskDataDO.class, new MPJLambdaWrapperX<BusinessAssayTaskDataDO>()
+				.leftJoin(BusinessSubSampleDO.class, BusinessSubSampleDO::getId, BusinessAssayTaskDataDO::getBusinessSubSampleId)
+				.eq(BusinessAssayTaskDataDO::getBusinessAssayTaskId, businessAssayTaskId)
+		        .orderByAsc("NVL(REGEXP_SUBSTR(SMP_ASY_CD, '^(.*-)'), SMP_ASY_CD)")
+		        .orderByAsc("CASE WHEN INSTR(SMP_ASY_CD, '-') = 0 THEN 0 WHEN REGEXP_LIKE(REGEXP_SUBSTR(SMP_ASY_CD, '[^-]+$'), '[^0-9]') THEN 9999999 ELSE CAST(REGEXP_SUBSTR(SMP_ASY_CD, '[^-]+$') AS BIGINT) END")
+				);
 	}
 
     /**
diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDetailMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDetailMapper.java
index 76229917..8da26cfe 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDetailMapper.java
+++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDetailMapper.java
@@ -49,7 +49,10 @@ public interface BusinessAssayTaskDetailMapper extends BaseMapperX<BusinessAssay
                 .eqIfPresent(BusinessAssayTaskDetailDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
                 .betweenIfPresent(BusinessAssayTaskDetailDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(BusinessAssayTaskDetailDO::getRemark, reqVO.getRemark())
-    			.orderByAsc(BusinessAssayTaskDetailDO::getSampleCode));
+                .orderByAsc("NVL(REGEXP_SUBSTR(SMP_CD, '^(.*-)'), SMP_CD)")
+                .orderByAsc("CASE WHEN INSTR(SMP_CD, '-') = 0 THEN 0 WHEN REGEXP_LIKE(REGEXP_SUBSTR(SMP_CD, '[^-]+$'), '[^0-9]') THEN 9999999 ELSE CAST(REGEXP_SUBSTR(SMP_CD, '[^-]+$') AS BIGINT) END")
+//    			.orderByAsc(BusinessAssayTaskDetailDO::getSampleCode)
+    			);
     }
     
     default List<BusinessAssayTaskDetailExtendRespVO> selectList(BusinessAssayTaskDetailReqVO reqVO) {
@@ -80,12 +83,18 @@ public interface BusinessAssayTaskDetailMapper extends BaseMapperX<BusinessAssay
                 .eqIfPresent(BusinessAssayTaskDetailDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
                 .betweenIfPresent(BusinessAssayTaskDetailDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(BusinessAssayTaskDetailDO::getRemark, reqVO.getRemark())
-    			.orderByAsc(BusinessAssayTaskDetailDO::getSampleCode));
+                .orderByAsc("NVL(REGEXP_SUBSTR(SMP_CD, '^(.*-)'), SMP_CD)")
+                .orderByAsc("CASE WHEN INSTR(SMP_CD, '-') = 0 THEN 0 WHEN REGEXP_LIKE(REGEXP_SUBSTR(SMP_CD, '[^-]+$'), '[^0-9]') THEN 9999999 ELSE CAST(REGEXP_SUBSTR(SMP_CD, '[^-]+$') AS BIGINT) END")
+//    			.orderByAsc(BusinessAssayTaskDetailDO::getSampleCode)
+    			);
     }
 
 	default List<BusinessAssayTaskDetailDO> selectByBusinessAssayTaskId(Long businessAssayTaskId) {
-		return selectList(new LambdaQueryWrapperX<BusinessAssayTaskDetailDO>()
-                .eqIfPresent(BusinessAssayTaskDetailDO::getBusinessAssayTaskId, businessAssayTaskId));
+		return selectList(new MPJLambdaWrapperX<BusinessAssayTaskDetailDO>()
+                .eqIfPresent(BusinessAssayTaskDetailDO::getBusinessAssayTaskId, businessAssayTaskId)
+                .orderByAsc("NVL(REGEXP_SUBSTR(SMP_CD, '^(.*-)'), SMP_CD)")
+                .orderByAsc("CASE WHEN INSTR(SMP_CD, '-') = 0 THEN 0 WHEN REGEXP_LIKE(REGEXP_SUBSTR(SMP_CD, '[^-]+$'), '[^0-9]') THEN 9999999 ELSE CAST(REGEXP_SUBSTR(SMP_CD, '[^-]+$') AS BIGINT) END")
+				);
 	}
 	
 	default Long selectCountByBusinessAssayTaskId(Long businessAssayTaskId) {
diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSampleHandoverDetailMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSampleHandoverDetailMapper.java
index 927ae004..2abd31d7 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSampleHandoverDetailMapper.java
+++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSampleHandoverDetailMapper.java
@@ -39,8 +39,12 @@ public interface BusinessSampleHandoverDetailMapper extends BaseMapperX<Business
     }
     
     default List<BusinessSampleHandoverDetailDO> selectByBusinessSampleHandoverId(Long businessSampleHandoverId) {
-    	return selectList(new LambdaQueryWrapperX<BusinessSampleHandoverDetailDO>()
-    			.eq(BusinessSampleHandoverDetailDO::getBusinessSampleHandoverId, businessSampleHandoverId));
+    	return selectList(new MPJLambdaWrapperX<BusinessSampleHandoverDetailDO>()
+    			.eq(BusinessSampleHandoverDetailDO::getBusinessSampleHandoverId, businessSampleHandoverId)
+    			.orderByAsc(BusinessSampleHandoverDetailDO::getSampleName)
+                .orderByAsc("NVL(REGEXP_SUBSTR(SMP_CD, '^(.*-)'), SMP_CD)")
+                .orderByAsc("CASE WHEN INSTR(SMP_CD, '-') = 0 THEN 0 WHEN REGEXP_LIKE(REGEXP_SUBSTR(SMP_CD, '[^-]+$'), '[^0-9]') THEN 9999999 ELSE CAST(REGEXP_SUBSTR(SMP_CD, '[^-]+$') AS BIGINT) END")
+    			);
     }
 
     /*
diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubSampleMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubSampleMapper.java
index db9c439f..2fdabec5 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubSampleMapper.java
+++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubSampleMapper.java
@@ -86,7 +86,11 @@ public interface BusinessSubSampleMapper extends BaseMapperX<BusinessSubSampleDO
                 .eqIfPresent(BusinessSubSampleDO::getRemark, reqVO.getRemark())
                 .eqIfPresent(BusinessSubSampleDO::getUpSampleRecordId, reqVO.getUpSampleRecordId())
 				.likeIfPresent(ConfigWarehouseLocationDO::getCode, reqVO.getWarehouseLocationCode())
-                .orderByDesc(BusinessSubSampleDO::getSampleFlowNodeTime).orderByAsc(BusinessSubSampleDO::getSampleCode));
+                .orderByDesc(BusinessSubSampleDO::getSampleFlowNodeTime)
+                .orderByAsc("NVL(REGEXP_SUBSTR(SMP_CD, '^(.*-)'), SMP_CD)")
+                .orderByAsc("CASE WHEN INSTR(SMP_CD, '-') = 0 THEN 0 WHEN REGEXP_LIKE(REGEXP_SUBSTR(SMP_CD, '[^-]+$'), '[^0-9]') THEN 9999999 ELSE CAST(REGEXP_SUBSTR(SMP_CD, '[^-]+$') AS BIGINT) END")
+//                .orderByAsc(BusinessSubSampleDO::getSampleCode)
+                );
     }
 
 	default PageResult<BusinessSubSampleExtendRespVO> selectAnalysisGroupPage(BusinessSubSamplePageReqVO reqVO) {
@@ -146,7 +150,11 @@ public interface BusinessSubSampleMapper extends BaseMapperX<BusinessSubSampleDO
                 .eqIfPresent(BusinessSubSampleAnalysisGroupDO::getSampleStatus, reqVO.getAssayDepartmentStatus())
                 .inIfPresent(BusinessSubSampleAnalysisGroupDO::getSampleStatus, reqVO.getAssayDepartmentStatusList())
                 .eqIfPresent(BusinessSubSampleAnalysisGroupDO::getIsSend, reqVO.getIsSendSample())
-                .orderByDesc(BusinessSubSampleDO::getSampleFlowNodeTime).orderByAsc(BusinessSubSampleDO::getSampleCode));
+                .orderByDesc(BusinessSubSampleDO::getSampleFlowNodeTime)
+                .orderByAsc("NVL(REGEXP_SUBSTR(SMP_CD, '^(.*-)'), SMP_CD)")
+                .orderByAsc("CASE WHEN INSTR(SMP_CD, '-') = 0 THEN 0 WHEN REGEXP_LIKE(REGEXP_SUBSTR(SMP_CD, '[^-]+$'), '[^0-9]') THEN 9999999 ELSE CAST(REGEXP_SUBSTR(SMP_CD, '[^-]+$') AS BIGINT) END")
+                //.orderByAsc(BusinessSubSampleDO::getSampleCode)
+                );
 	}
 
 	default List<BusinessSubSampleExtendRespVO> selectList(@Valid BusinessSubSampleReqVO reqVO) {
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 a8f4a9bb..4acd2ea5 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
@@ -352,7 +352,8 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic
         //横向数据
 		if ("horizontal".equals(reportDataType)) {
 
-	        List<BusinessAssayTaskDetailDO> businessAssayTaskDetailList = businessAssayTaskDetailMapper.selectList(new LambdaQueryWrapperX<BusinessAssayTaskDetailDO>().eq(BusinessAssayTaskDetailDO::getBusinessAssayTaskId, businessAssayTaskDO.getId()));  
+	        List<BusinessAssayTaskDetailDO> businessAssayTaskDetailList = businessAssayTaskDetailMapper.selectByBusinessAssayTaskId(businessAssayTaskDO.getId());  
+//	        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()));
 	        List<BusinessAssayTaskDataDO> businessAssayTaskDataList = businessAssayTaskDataMapper.selectByBusinessAssayTaskId(businessAssayTaskId);
 	        
@@ -482,7 +483,8 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic
 			}
 			
 		} else if ("vertical".equals(reportDataType)) {//纵向数据
-			List<BusinessAssayTaskDetailDO> businessAssayTaskDetailList = businessAssayTaskDetailMapper.selectList(new LambdaQueryWrapperX<BusinessAssayTaskDetailDO>().eq(BusinessAssayTaskDetailDO::getBusinessAssayTaskId, businessAssayTaskDO.getId()));  
+			List<BusinessAssayTaskDetailDO> businessAssayTaskDetailList = businessAssayTaskDetailMapper.selectByBusinessAssayTaskId(businessAssayTaskDO.getId()); 
+//			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()));
 			List<BusinessAssayTaskDataDO> businessAssayTaskDataList = businessAssayTaskDataMapper.selectByBusinessAssayTaskId(businessAssayTaskId);
 			
diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisServiceImpl.java
index bbb83eb8..9561a384 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisServiceImpl.java
+++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisServiceImpl.java
@@ -576,7 +576,8 @@ public class SampleAnalysisServiceImpl implements SampleAnalysisService {
         cloumns.add(new BatchSampleAnalysisColumnRespVO("sampleCode", "sampleCode", "样品编号", minWidth, minWidth, "string", null, null, null, null, false, null, null, null, null, null, null));
         cloumns.add(new BatchSampleAnalysisColumnRespVO("sampleName", "sampleName", "样品名称", minWidth, minWidth, "string", null, null, null, null, false, null, null, null, null, null, null));        
         
-        List<BusinessAssayTaskDetailDO> businessAssayTaskDetailList = businessAssayTaskDetailMapper.selectList(new LambdaQueryWrapperX<BusinessAssayTaskDetailDO>().eq(BusinessAssayTaskDetailDO::getBusinessAssayTaskId, businessAssayTaskDO.getId()));  
+        List<BusinessAssayTaskDetailDO> businessAssayTaskDetailList = businessAssayTaskDetailMapper.selectByBusinessAssayTaskId(businessAssayTaskDO.getId());
+//        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()));
         List<BusinessAssayTaskDataDO> businessAssayTaskDataList = businessAssayTaskDataMapper.selectByBusinessAssayTaskId(businessAssayTaskDO.getId());