diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
index 509b3dd..fb8e7cc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
@@ -31,14 +31,14 @@
 
 /**
  * <p>
- * 业务管理-证书报告 前端控制器
+ * 业务管理-计量数据管理 前端控制器
  * </p>
  *
  * @author zt
  * @since 2023-02-02
  */
 @RestController
-@Api(tags = "证书报告模块")
+@Api(tags = "计量数据管理模块（整合原始记录和证书报告）")
 @RequestMapping("/business/certificateReport")
 public class BusinessCertificateReportController extends ExportController {
     @Resource

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
index 509b3dd..fb8e7cc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
@@ -31,14 +31,14 @@
 
 /**
  * <p>
- * 业务管理-证书报告 前端控制器
+ * 业务管理-计量数据管理 前端控制器
  * </p>
  *
  * @author zt
  * @since 2023-02-02
  */
 @RestController
-@Api(tags = "证书报告模块")
+@Api(tags = "计量数据管理模块（整合原始记录和证书报告）")
 @RequestMapping("/business/certificateReport")
 public class BusinessCertificateReportController extends ExportController {
     @Resource
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index f41c5f8..9f81a54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -105,7 +105,7 @@
             ORDER BY bosr.real_deliver_time DESC
         </if>
         <if test="request.sampleStatus == 5">
-            ORDER BY bosr.real_deliver_time DESC
+            ORDER BY bosr.wait_time DESC
         </if>
         <if test="request.sampleStatus == 6">
             ORDER BY bosr.return_time DESC

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
index 509b3dd..fb8e7cc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
@@ -31,14 +31,14 @@
 
 /**
  * <p>
- * 业务管理-证书报告 前端控制器
+ * 业务管理-计量数据管理 前端控制器
  * </p>
  *
  * @author zt
  * @since 2023-02-02
  */
 @RestController
-@Api(tags = "证书报告模块")
+@Api(tags = "计量数据管理模块（整合原始记录和证书报告）")
 @RequestMapping("/business/certificateReport")
 public class BusinessCertificateReportController extends ExportController {
     @Resource
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index f41c5f8..9f81a54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -105,7 +105,7 @@
             ORDER BY bosr.real_deliver_time DESC
         </if>
         <if test="request.sampleStatus == 5">
-            ORDER BY bosr.real_deliver_time DESC
+            ORDER BY bosr.wait_time DESC
         </if>
         <if test="request.sampleStatus == 6">
             ORDER BY bosr.return_time DESC
diff --git a/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml
index e277576..c4c9b5f 100644
--- a/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml
@@ -22,7 +22,7 @@
         SELECT bo.id AS order_id, fbsi.id, bo.order_code, bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.deliverer_tel,
             bo.is_urgent, bo.create_time, fbsi.suggested_discount, fbsi.extra_charge, fbsi.extra_charge_illustration,fbsi.sample_warehouse,
             fbsi.cert_warehouse,fbsi.fee_status,fbsi.received,fbsi.remark,fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,
-            fbsi.received_amount,fbsi.invoice_amount, bo.order_time
+            fbsi.received_amount,fbsi.invoice_amount, fbsi.order_type, bo.order_time
         FROM finance_business_settlement_info fbsi
         LEFT JOIN business_order bo ON fbsi.order_id = bo.id
         WHERE bo.is_del = 0
@@ -50,7 +50,7 @@
         SELECT bo.id AS order_id, fbsi.id, bo.order_code, bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.deliverer_tel,
             bo.is_urgent, bo.create_time, fbsi.suggested_discount, fbsi.extra_charge, fbsi.extra_charge_illustration,fbsi.sample_warehouse,
             fbsi.cert_warehouse,fbsi.fee_status,fbsi.received,fbsi.remark,fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,
-            fbsi.received_amount,fbsi.invoice_amount
+            fbsi.received_amount, fbsi.invoice_amount, fbsi.order_type
         FROM finance_business_settlement_info fbsi
         LEFT JOIN business_order bo ON fbsi.order_id = bo.id
         WHERE bo.is_del = 0
@@ -79,7 +79,7 @@
             bo.deliverer_tel, bo.create_time, bo.plan_deliver_time, bo.require_over_time, bo.is_urgent, fbsi.suggested_discount,
             fbsi.extra_charge, fbsi.extra_charge_illustration,bo.order_time,bo.customer_address,bo.certification_company,
             bo.certification_company_address,fbsi.sample_warehouse,fbsi.cert_warehouse,fbsi.fee_status,fbsi.received,fbsi.remark,
-            fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,fbsi.received_amount,fbsi.invoice_amount
+            fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,fbsi.received_amount,fbsi.invoice_amount, fbsi.order_type
         FROM finance_business_settlement_info fbsi
         LEFT JOIN business_order bo ON fbsi.order_id = bo.id
         WHERE bo.is_del = 0 AND fbsi.id = #{id}
@@ -89,7 +89,7 @@
         SELECT bo.id AS order_id, fbsi.id, bo.order_code, bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.deliverer_tel,
             bo.is_urgent, bo.create_time, fbsi.suggested_discount, fbsi.extra_charge, fbsi.extra_charge_illustration,fbsi.sample_warehouse,
             fbsi.cert_warehouse,fbsi.fee_status,fbsi.received,fbsi.remark,fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,
-            fbsi.received_amount,fbsi.invoice_amount
+            fbsi.received_amount,fbsi.invoice_amount, fbsi.order_type
         FROM finance_business_settlement_info fbsi
         LEFT JOIN business_order bo ON fbsi.order_id = bo.id
         WHERE bo.is_del = 0

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
index 509b3dd..fb8e7cc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
@@ -31,14 +31,14 @@
 
 /**
  * <p>
- * 业务管理-证书报告 前端控制器
+ * 业务管理-计量数据管理 前端控制器
  * </p>
  *
  * @author zt
  * @since 2023-02-02
  */
 @RestController
-@Api(tags = "证书报告模块")
+@Api(tags = "计量数据管理模块（整合原始记录和证书报告）")
 @RequestMapping("/business/certificateReport")
 public class BusinessCertificateReportController extends ExportController {
     @Resource
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index f41c5f8..9f81a54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -105,7 +105,7 @@
             ORDER BY bosr.real_deliver_time DESC
         </if>
         <if test="request.sampleStatus == 5">
-            ORDER BY bosr.real_deliver_time DESC
+            ORDER BY bosr.wait_time DESC
         </if>
         <if test="request.sampleStatus == 6">
             ORDER BY bosr.return_time DESC
diff --git a/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml
index e277576..c4c9b5f 100644
--- a/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml
@@ -22,7 +22,7 @@
         SELECT bo.id AS order_id, fbsi.id, bo.order_code, bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.deliverer_tel,
             bo.is_urgent, bo.create_time, fbsi.suggested_discount, fbsi.extra_charge, fbsi.extra_charge_illustration,fbsi.sample_warehouse,
             fbsi.cert_warehouse,fbsi.fee_status,fbsi.received,fbsi.remark,fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,
-            fbsi.received_amount,fbsi.invoice_amount, bo.order_time
+            fbsi.received_amount,fbsi.invoice_amount, fbsi.order_type, bo.order_time
         FROM finance_business_settlement_info fbsi
         LEFT JOIN business_order bo ON fbsi.order_id = bo.id
         WHERE bo.is_del = 0
@@ -50,7 +50,7 @@
         SELECT bo.id AS order_id, fbsi.id, bo.order_code, bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.deliverer_tel,
             bo.is_urgent, bo.create_time, fbsi.suggested_discount, fbsi.extra_charge, fbsi.extra_charge_illustration,fbsi.sample_warehouse,
             fbsi.cert_warehouse,fbsi.fee_status,fbsi.received,fbsi.remark,fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,
-            fbsi.received_amount,fbsi.invoice_amount
+            fbsi.received_amount, fbsi.invoice_amount, fbsi.order_type
         FROM finance_business_settlement_info fbsi
         LEFT JOIN business_order bo ON fbsi.order_id = bo.id
         WHERE bo.is_del = 0
@@ -79,7 +79,7 @@
             bo.deliverer_tel, bo.create_time, bo.plan_deliver_time, bo.require_over_time, bo.is_urgent, fbsi.suggested_discount,
             fbsi.extra_charge, fbsi.extra_charge_illustration,bo.order_time,bo.customer_address,bo.certification_company,
             bo.certification_company_address,fbsi.sample_warehouse,fbsi.cert_warehouse,fbsi.fee_status,fbsi.received,fbsi.remark,
-            fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,fbsi.received_amount,fbsi.invoice_amount
+            fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,fbsi.received_amount,fbsi.invoice_amount, fbsi.order_type
         FROM finance_business_settlement_info fbsi
         LEFT JOIN business_order bo ON fbsi.order_id = bo.id
         WHERE bo.is_del = 0 AND fbsi.id = #{id}
@@ -89,7 +89,7 @@
         SELECT bo.id AS order_id, fbsi.id, bo.order_code, bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.deliverer_tel,
             bo.is_urgent, bo.create_time, fbsi.suggested_discount, fbsi.extra_charge, fbsi.extra_charge_illustration,fbsi.sample_warehouse,
             fbsi.cert_warehouse,fbsi.fee_status,fbsi.received,fbsi.remark,fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,
-            fbsi.received_amount,fbsi.invoice_amount
+            fbsi.received_amount,fbsi.invoice_amount, fbsi.order_type
         FROM finance_business_settlement_info fbsi
         LEFT JOIN business_order bo ON fbsi.order_id = bo.id
         WHERE bo.is_del = 0
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
index 66b1438..bd3467b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
@@ -69,7 +69,7 @@
 
     @ApiModelProperty(value = "检定人员名称", dataType = "String")
     @ExcelProperty(value = "检定员", order = 8)
-    private String measurePersonName;
+    private String measurePerson;
 
     @ApiModelProperty(value = "审批状态", dataType = "String")
     @DictCodeField(message = "审批状态不合法", cacheName = MeterDictCode.APPROVAL_STATUS)

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
index 509b3dd..fb8e7cc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
@@ -31,14 +31,14 @@
 
 /**
  * <p>
- * 业务管理-证书报告 前端控制器
+ * 业务管理-计量数据管理 前端控制器
  * </p>
  *
  * @author zt
  * @since 2023-02-02
  */
 @RestController
-@Api(tags = "证书报告模块")
+@Api(tags = "计量数据管理模块（整合原始记录和证书报告）")
 @RequestMapping("/business/certificateReport")
 public class BusinessCertificateReportController extends ExportController {
     @Resource
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index f41c5f8..9f81a54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -105,7 +105,7 @@
             ORDER BY bosr.real_deliver_time DESC
         </if>
         <if test="request.sampleStatus == 5">
-            ORDER BY bosr.real_deliver_time DESC
+            ORDER BY bosr.wait_time DESC
         </if>
         <if test="request.sampleStatus == 6">
             ORDER BY bosr.return_time DESC
diff --git a/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml
index e277576..c4c9b5f 100644
--- a/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml
@@ -22,7 +22,7 @@
         SELECT bo.id AS order_id, fbsi.id, bo.order_code, bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.deliverer_tel,
             bo.is_urgent, bo.create_time, fbsi.suggested_discount, fbsi.extra_charge, fbsi.extra_charge_illustration,fbsi.sample_warehouse,
             fbsi.cert_warehouse,fbsi.fee_status,fbsi.received,fbsi.remark,fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,
-            fbsi.received_amount,fbsi.invoice_amount, bo.order_time
+            fbsi.received_amount,fbsi.invoice_amount, fbsi.order_type, bo.order_time
         FROM finance_business_settlement_info fbsi
         LEFT JOIN business_order bo ON fbsi.order_id = bo.id
         WHERE bo.is_del = 0
@@ -50,7 +50,7 @@
         SELECT bo.id AS order_id, fbsi.id, bo.order_code, bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.deliverer_tel,
             bo.is_urgent, bo.create_time, fbsi.suggested_discount, fbsi.extra_charge, fbsi.extra_charge_illustration,fbsi.sample_warehouse,
             fbsi.cert_warehouse,fbsi.fee_status,fbsi.received,fbsi.remark,fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,
-            fbsi.received_amount,fbsi.invoice_amount
+            fbsi.received_amount, fbsi.invoice_amount, fbsi.order_type
         FROM finance_business_settlement_info fbsi
         LEFT JOIN business_order bo ON fbsi.order_id = bo.id
         WHERE bo.is_del = 0
@@ -79,7 +79,7 @@
             bo.deliverer_tel, bo.create_time, bo.plan_deliver_time, bo.require_over_time, bo.is_urgent, fbsi.suggested_discount,
             fbsi.extra_charge, fbsi.extra_charge_illustration,bo.order_time,bo.customer_address,bo.certification_company,
             bo.certification_company_address,fbsi.sample_warehouse,fbsi.cert_warehouse,fbsi.fee_status,fbsi.received,fbsi.remark,
-            fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,fbsi.received_amount,fbsi.invoice_amount
+            fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,fbsi.received_amount,fbsi.invoice_amount, fbsi.order_type
         FROM finance_business_settlement_info fbsi
         LEFT JOIN business_order bo ON fbsi.order_id = bo.id
         WHERE bo.is_del = 0 AND fbsi.id = #{id}
@@ -89,7 +89,7 @@
         SELECT bo.id AS order_id, fbsi.id, bo.order_code, bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.deliverer_tel,
             bo.is_urgent, bo.create_time, fbsi.suggested_discount, fbsi.extra_charge, fbsi.extra_charge_illustration,fbsi.sample_warehouse,
             fbsi.cert_warehouse,fbsi.fee_status,fbsi.received,fbsi.remark,fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,
-            fbsi.received_amount,fbsi.invoice_amount
+            fbsi.received_amount,fbsi.invoice_amount, fbsi.order_type
         FROM finance_business_settlement_info fbsi
         LEFT JOIN business_order bo ON fbsi.order_id = bo.id
         WHERE bo.is_del = 0
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
index 66b1438..bd3467b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
@@ -69,7 +69,7 @@
 
     @ApiModelProperty(value = "检定人员名称", dataType = "String")
     @ExcelProperty(value = "检定员", order = 8)
-    private String measurePersonName;
+    private String measurePerson;
 
     @ApiModelProperty(value = "审批状态", dataType = "String")
     @DictCodeField(message = "审批状态不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoDetailResponse.java
index 784b2ed..8816c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoDetailResponse.java
@@ -99,6 +99,9 @@
     @ApiModelProperty(value = "是否加急", dataType = "String")
     private String isUrgent;
 
+    @ApiModelProperty(value = "委托单类型/业务结算类型", dataType = "String")
+    private String orderType;
+
 //    @ApiModelProperty(value = "标价-单位分", dataType = "Integer")
 //    private Integer postedPrice;
 //

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
index 509b3dd..fb8e7cc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
@@ -31,14 +31,14 @@
 
 /**
  * <p>
- * 业务管理-证书报告 前端控制器
+ * 业务管理-计量数据管理 前端控制器
  * </p>
  *
  * @author zt
  * @since 2023-02-02
  */
 @RestController
-@Api(tags = "证书报告模块")
+@Api(tags = "计量数据管理模块（整合原始记录和证书报告）")
 @RequestMapping("/business/certificateReport")
 public class BusinessCertificateReportController extends ExportController {
     @Resource
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index f41c5f8..9f81a54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -105,7 +105,7 @@
             ORDER BY bosr.real_deliver_time DESC
         </if>
         <if test="request.sampleStatus == 5">
-            ORDER BY bosr.real_deliver_time DESC
+            ORDER BY bosr.wait_time DESC
         </if>
         <if test="request.sampleStatus == 6">
             ORDER BY bosr.return_time DESC
diff --git a/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml
index e277576..c4c9b5f 100644
--- a/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml
@@ -22,7 +22,7 @@
         SELECT bo.id AS order_id, fbsi.id, bo.order_code, bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.deliverer_tel,
             bo.is_urgent, bo.create_time, fbsi.suggested_discount, fbsi.extra_charge, fbsi.extra_charge_illustration,fbsi.sample_warehouse,
             fbsi.cert_warehouse,fbsi.fee_status,fbsi.received,fbsi.remark,fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,
-            fbsi.received_amount,fbsi.invoice_amount, bo.order_time
+            fbsi.received_amount,fbsi.invoice_amount, fbsi.order_type, bo.order_time
         FROM finance_business_settlement_info fbsi
         LEFT JOIN business_order bo ON fbsi.order_id = bo.id
         WHERE bo.is_del = 0
@@ -50,7 +50,7 @@
         SELECT bo.id AS order_id, fbsi.id, bo.order_code, bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.deliverer_tel,
             bo.is_urgent, bo.create_time, fbsi.suggested_discount, fbsi.extra_charge, fbsi.extra_charge_illustration,fbsi.sample_warehouse,
             fbsi.cert_warehouse,fbsi.fee_status,fbsi.received,fbsi.remark,fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,
-            fbsi.received_amount,fbsi.invoice_amount
+            fbsi.received_amount, fbsi.invoice_amount, fbsi.order_type
         FROM finance_business_settlement_info fbsi
         LEFT JOIN business_order bo ON fbsi.order_id = bo.id
         WHERE bo.is_del = 0
@@ -79,7 +79,7 @@
             bo.deliverer_tel, bo.create_time, bo.plan_deliver_time, bo.require_over_time, bo.is_urgent, fbsi.suggested_discount,
             fbsi.extra_charge, fbsi.extra_charge_illustration,bo.order_time,bo.customer_address,bo.certification_company,
             bo.certification_company_address,fbsi.sample_warehouse,fbsi.cert_warehouse,fbsi.fee_status,fbsi.received,fbsi.remark,
-            fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,fbsi.received_amount,fbsi.invoice_amount
+            fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,fbsi.received_amount,fbsi.invoice_amount, fbsi.order_type
         FROM finance_business_settlement_info fbsi
         LEFT JOIN business_order bo ON fbsi.order_id = bo.id
         WHERE bo.is_del = 0 AND fbsi.id = #{id}
@@ -89,7 +89,7 @@
         SELECT bo.id AS order_id, fbsi.id, bo.order_code, bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.deliverer_tel,
             bo.is_urgent, bo.create_time, fbsi.suggested_discount, fbsi.extra_charge, fbsi.extra_charge_illustration,fbsi.sample_warehouse,
             fbsi.cert_warehouse,fbsi.fee_status,fbsi.received,fbsi.remark,fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,
-            fbsi.received_amount,fbsi.invoice_amount
+            fbsi.received_amount,fbsi.invoice_amount, fbsi.order_type
         FROM finance_business_settlement_info fbsi
         LEFT JOIN business_order bo ON fbsi.order_id = bo.id
         WHERE bo.is_del = 0
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
index 66b1438..bd3467b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
@@ -69,7 +69,7 @@
 
     @ApiModelProperty(value = "检定人员名称", dataType = "String")
     @ExcelProperty(value = "检定员", order = 8)
-    private String measurePersonName;
+    private String measurePerson;
 
     @ApiModelProperty(value = "审批状态", dataType = "String")
     @DictCodeField(message = "审批状态不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoDetailResponse.java
index 784b2ed..8816c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoDetailResponse.java
@@ -99,6 +99,9 @@
     @ApiModelProperty(value = "是否加急", dataType = "String")
     private String isUrgent;
 
+    @ApiModelProperty(value = "委托单类型/业务结算类型", dataType = "String")
+    private String orderType;
+
 //    @ApiModelProperty(value = "标价-单位分", dataType = "Integer")
 //    private Integer postedPrice;
 //
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoListResponse.java
index 81bc5c1..ffeda80 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoListResponse.java
@@ -109,6 +109,9 @@
     @ExcelProperty("开票金额（元）")
     private String invoiceAmount;
 
+    @ApiModelProperty(value = "委托单类型/业务结算类型", dataType = "String")
+    private String orderType;
+
     @ApiModelProperty(value = "送样人", dataType = "String")
 //    @ExcelProperty(value = "送样人")
     private String deliverer;

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
index 509b3dd..fb8e7cc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
@@ -31,14 +31,14 @@
 
 /**
  * <p>
- * 业务管理-证书报告 前端控制器
+ * 业务管理-计量数据管理 前端控制器
  * </p>
  *
  * @author zt
  * @since 2023-02-02
  */
 @RestController
-@Api(tags = "证书报告模块")
+@Api(tags = "计量数据管理模块（整合原始记录和证书报告）")
 @RequestMapping("/business/certificateReport")
 public class BusinessCertificateReportController extends ExportController {
     @Resource
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index f41c5f8..9f81a54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -105,7 +105,7 @@
             ORDER BY bosr.real_deliver_time DESC
         </if>
         <if test="request.sampleStatus == 5">
-            ORDER BY bosr.real_deliver_time DESC
+            ORDER BY bosr.wait_time DESC
         </if>
         <if test="request.sampleStatus == 6">
             ORDER BY bosr.return_time DESC
diff --git a/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml
index e277576..c4c9b5f 100644
--- a/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml
@@ -22,7 +22,7 @@
         SELECT bo.id AS order_id, fbsi.id, bo.order_code, bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.deliverer_tel,
             bo.is_urgent, bo.create_time, fbsi.suggested_discount, fbsi.extra_charge, fbsi.extra_charge_illustration,fbsi.sample_warehouse,
             fbsi.cert_warehouse,fbsi.fee_status,fbsi.received,fbsi.remark,fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,
-            fbsi.received_amount,fbsi.invoice_amount, bo.order_time
+            fbsi.received_amount,fbsi.invoice_amount, fbsi.order_type, bo.order_time
         FROM finance_business_settlement_info fbsi
         LEFT JOIN business_order bo ON fbsi.order_id = bo.id
         WHERE bo.is_del = 0
@@ -50,7 +50,7 @@
         SELECT bo.id AS order_id, fbsi.id, bo.order_code, bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.deliverer_tel,
             bo.is_urgent, bo.create_time, fbsi.suggested_discount, fbsi.extra_charge, fbsi.extra_charge_illustration,fbsi.sample_warehouse,
             fbsi.cert_warehouse,fbsi.fee_status,fbsi.received,fbsi.remark,fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,
-            fbsi.received_amount,fbsi.invoice_amount
+            fbsi.received_amount, fbsi.invoice_amount, fbsi.order_type
         FROM finance_business_settlement_info fbsi
         LEFT JOIN business_order bo ON fbsi.order_id = bo.id
         WHERE bo.is_del = 0
@@ -79,7 +79,7 @@
             bo.deliverer_tel, bo.create_time, bo.plan_deliver_time, bo.require_over_time, bo.is_urgent, fbsi.suggested_discount,
             fbsi.extra_charge, fbsi.extra_charge_illustration,bo.order_time,bo.customer_address,bo.certification_company,
             bo.certification_company_address,fbsi.sample_warehouse,fbsi.cert_warehouse,fbsi.fee_status,fbsi.received,fbsi.remark,
-            fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,fbsi.received_amount,fbsi.invoice_amount
+            fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,fbsi.received_amount,fbsi.invoice_amount, fbsi.order_type
         FROM finance_business_settlement_info fbsi
         LEFT JOIN business_order bo ON fbsi.order_id = bo.id
         WHERE bo.is_del = 0 AND fbsi.id = #{id}
@@ -89,7 +89,7 @@
         SELECT bo.id AS order_id, fbsi.id, bo.order_code, bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.deliverer_tel,
             bo.is_urgent, bo.create_time, fbsi.suggested_discount, fbsi.extra_charge, fbsi.extra_charge_illustration,fbsi.sample_warehouse,
             fbsi.cert_warehouse,fbsi.fee_status,fbsi.received,fbsi.remark,fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,
-            fbsi.received_amount,fbsi.invoice_amount
+            fbsi.received_amount,fbsi.invoice_amount, fbsi.order_type
         FROM finance_business_settlement_info fbsi
         LEFT JOIN business_order bo ON fbsi.order_id = bo.id
         WHERE bo.is_del = 0
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
index 66b1438..bd3467b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
@@ -69,7 +69,7 @@
 
     @ApiModelProperty(value = "检定人员名称", dataType = "String")
     @ExcelProperty(value = "检定员", order = 8)
-    private String measurePersonName;
+    private String measurePerson;
 
     @ApiModelProperty(value = "审批状态", dataType = "String")
     @DictCodeField(message = "审批状态不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoDetailResponse.java
index 784b2ed..8816c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoDetailResponse.java
@@ -99,6 +99,9 @@
     @ApiModelProperty(value = "是否加急", dataType = "String")
     private String isUrgent;
 
+    @ApiModelProperty(value = "委托单类型/业务结算类型", dataType = "String")
+    private String orderType;
+
 //    @ApiModelProperty(value = "标价-单位分", dataType = "Integer")
 //    private Integer postedPrice;
 //
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoListResponse.java
index 81bc5c1..ffeda80 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoListResponse.java
@@ -109,6 +109,9 @@
     @ExcelProperty("开票金额（元）")
     private String invoiceAmount;
 
+    @ApiModelProperty(value = "委托单类型/业务结算类型", dataType = "String")
+    private String orderType;
+
     @ApiModelProperty(value = "送样人", dataType = "String")
 //    @ExcelProperty(value = "送样人")
     private String deliverer;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
index 9381bc3..311d80b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
@@ -105,4 +105,8 @@
     @TableField("update_time")
     private String updateTime;
 
+    //转换为待归还的时间，用于列表排序展示
+    @TableField("wait_time")
+    private String waitTime;
+
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
index 509b3dd..fb8e7cc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
@@ -31,14 +31,14 @@
 
 /**
  * <p>
- * 业务管理-证书报告 前端控制器
+ * 业务管理-计量数据管理 前端控制器
  * </p>
  *
  * @author zt
  * @since 2023-02-02
  */
 @RestController
-@Api(tags = "证书报告模块")
+@Api(tags = "计量数据管理模块（整合原始记录和证书报告）")
 @RequestMapping("/business/certificateReport")
 public class BusinessCertificateReportController extends ExportController {
     @Resource
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index f41c5f8..9f81a54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -105,7 +105,7 @@
             ORDER BY bosr.real_deliver_time DESC
         </if>
         <if test="request.sampleStatus == 5">
-            ORDER BY bosr.real_deliver_time DESC
+            ORDER BY bosr.wait_time DESC
         </if>
         <if test="request.sampleStatus == 6">
             ORDER BY bosr.return_time DESC
diff --git a/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml
index e277576..c4c9b5f 100644
--- a/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml
@@ -22,7 +22,7 @@
         SELECT bo.id AS order_id, fbsi.id, bo.order_code, bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.deliverer_tel,
             bo.is_urgent, bo.create_time, fbsi.suggested_discount, fbsi.extra_charge, fbsi.extra_charge_illustration,fbsi.sample_warehouse,
             fbsi.cert_warehouse,fbsi.fee_status,fbsi.received,fbsi.remark,fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,
-            fbsi.received_amount,fbsi.invoice_amount, bo.order_time
+            fbsi.received_amount,fbsi.invoice_amount, fbsi.order_type, bo.order_time
         FROM finance_business_settlement_info fbsi
         LEFT JOIN business_order bo ON fbsi.order_id = bo.id
         WHERE bo.is_del = 0
@@ -50,7 +50,7 @@
         SELECT bo.id AS order_id, fbsi.id, bo.order_code, bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.deliverer_tel,
             bo.is_urgent, bo.create_time, fbsi.suggested_discount, fbsi.extra_charge, fbsi.extra_charge_illustration,fbsi.sample_warehouse,
             fbsi.cert_warehouse,fbsi.fee_status,fbsi.received,fbsi.remark,fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,
-            fbsi.received_amount,fbsi.invoice_amount
+            fbsi.received_amount, fbsi.invoice_amount, fbsi.order_type
         FROM finance_business_settlement_info fbsi
         LEFT JOIN business_order bo ON fbsi.order_id = bo.id
         WHERE bo.is_del = 0
@@ -79,7 +79,7 @@
             bo.deliverer_tel, bo.create_time, bo.plan_deliver_time, bo.require_over_time, bo.is_urgent, fbsi.suggested_discount,
             fbsi.extra_charge, fbsi.extra_charge_illustration,bo.order_time,bo.customer_address,bo.certification_company,
             bo.certification_company_address,fbsi.sample_warehouse,fbsi.cert_warehouse,fbsi.fee_status,fbsi.received,fbsi.remark,
-            fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,fbsi.received_amount,fbsi.invoice_amount
+            fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,fbsi.received_amount,fbsi.invoice_amount, fbsi.order_type
         FROM finance_business_settlement_info fbsi
         LEFT JOIN business_order bo ON fbsi.order_id = bo.id
         WHERE bo.is_del = 0 AND fbsi.id = #{id}
@@ -89,7 +89,7 @@
         SELECT bo.id AS order_id, fbsi.id, bo.order_code, bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.deliverer_tel,
             bo.is_urgent, bo.create_time, fbsi.suggested_discount, fbsi.extra_charge, fbsi.extra_charge_illustration,fbsi.sample_warehouse,
             fbsi.cert_warehouse,fbsi.fee_status,fbsi.received,fbsi.remark,fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,
-            fbsi.received_amount,fbsi.invoice_amount
+            fbsi.received_amount,fbsi.invoice_amount, fbsi.order_type
         FROM finance_business_settlement_info fbsi
         LEFT JOIN business_order bo ON fbsi.order_id = bo.id
         WHERE bo.is_del = 0
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
index 66b1438..bd3467b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
@@ -69,7 +69,7 @@
 
     @ApiModelProperty(value = "检定人员名称", dataType = "String")
     @ExcelProperty(value = "检定员", order = 8)
-    private String measurePersonName;
+    private String measurePerson;
 
     @ApiModelProperty(value = "审批状态", dataType = "String")
     @DictCodeField(message = "审批状态不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoDetailResponse.java
index 784b2ed..8816c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoDetailResponse.java
@@ -99,6 +99,9 @@
     @ApiModelProperty(value = "是否加急", dataType = "String")
     private String isUrgent;
 
+    @ApiModelProperty(value = "委托单类型/业务结算类型", dataType = "String")
+    private String orderType;
+
 //    @ApiModelProperty(value = "标价-单位分", dataType = "Integer")
 //    private Integer postedPrice;
 //
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoListResponse.java
index 81bc5c1..ffeda80 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoListResponse.java
@@ -109,6 +109,9 @@
     @ExcelProperty("开票金额（元）")
     private String invoiceAmount;
 
+    @ApiModelProperty(value = "委托单类型/业务结算类型", dataType = "String")
+    private String orderType;
+
     @ApiModelProperty(value = "送样人", dataType = "String")
 //    @ExcelProperty(value = "送样人")
     private String deliverer;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
index 9381bc3..311d80b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
@@ -105,4 +105,8 @@
     @TableField("update_time")
     private String updateTime;
 
+    //转换为待归还的时间，用于列表排序展示
+    @TableField("wait_time")
+    private String waitTime;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
index e1cddfb..877dde8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
@@ -179,4 +179,8 @@
 
     @TableField(exist = false)
     private int seq;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "前端可根据判断是否有交接单", dataType = "Long")
+    private Long interchangeId;
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
index 509b3dd..fb8e7cc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
@@ -31,14 +31,14 @@
 
 /**
  * <p>
- * 业务管理-证书报告 前端控制器
+ * 业务管理-计量数据管理 前端控制器
  * </p>
  *
  * @author zt
  * @since 2023-02-02
  */
 @RestController
-@Api(tags = "证书报告模块")
+@Api(tags = "计量数据管理模块（整合原始记录和证书报告）")
 @RequestMapping("/business/certificateReport")
 public class BusinessCertificateReportController extends ExportController {
     @Resource
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index f41c5f8..9f81a54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -105,7 +105,7 @@
             ORDER BY bosr.real_deliver_time DESC
         </if>
         <if test="request.sampleStatus == 5">
-            ORDER BY bosr.real_deliver_time DESC
+            ORDER BY bosr.wait_time DESC
         </if>
         <if test="request.sampleStatus == 6">
             ORDER BY bosr.return_time DESC
diff --git a/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml
index e277576..c4c9b5f 100644
--- a/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml
@@ -22,7 +22,7 @@
         SELECT bo.id AS order_id, fbsi.id, bo.order_code, bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.deliverer_tel,
             bo.is_urgent, bo.create_time, fbsi.suggested_discount, fbsi.extra_charge, fbsi.extra_charge_illustration,fbsi.sample_warehouse,
             fbsi.cert_warehouse,fbsi.fee_status,fbsi.received,fbsi.remark,fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,
-            fbsi.received_amount,fbsi.invoice_amount, bo.order_time
+            fbsi.received_amount,fbsi.invoice_amount, fbsi.order_type, bo.order_time
         FROM finance_business_settlement_info fbsi
         LEFT JOIN business_order bo ON fbsi.order_id = bo.id
         WHERE bo.is_del = 0
@@ -50,7 +50,7 @@
         SELECT bo.id AS order_id, fbsi.id, bo.order_code, bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.deliverer_tel,
             bo.is_urgent, bo.create_time, fbsi.suggested_discount, fbsi.extra_charge, fbsi.extra_charge_illustration,fbsi.sample_warehouse,
             fbsi.cert_warehouse,fbsi.fee_status,fbsi.received,fbsi.remark,fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,
-            fbsi.received_amount,fbsi.invoice_amount
+            fbsi.received_amount, fbsi.invoice_amount, fbsi.order_type
         FROM finance_business_settlement_info fbsi
         LEFT JOIN business_order bo ON fbsi.order_id = bo.id
         WHERE bo.is_del = 0
@@ -79,7 +79,7 @@
             bo.deliverer_tel, bo.create_time, bo.plan_deliver_time, bo.require_over_time, bo.is_urgent, fbsi.suggested_discount,
             fbsi.extra_charge, fbsi.extra_charge_illustration,bo.order_time,bo.customer_address,bo.certification_company,
             bo.certification_company_address,fbsi.sample_warehouse,fbsi.cert_warehouse,fbsi.fee_status,fbsi.received,fbsi.remark,
-            fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,fbsi.received_amount,fbsi.invoice_amount
+            fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,fbsi.received_amount,fbsi.invoice_amount, fbsi.order_type
         FROM finance_business_settlement_info fbsi
         LEFT JOIN business_order bo ON fbsi.order_id = bo.id
         WHERE bo.is_del = 0 AND fbsi.id = #{id}
@@ -89,7 +89,7 @@
         SELECT bo.id AS order_id, fbsi.id, bo.order_code, bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.deliverer_tel,
             bo.is_urgent, bo.create_time, fbsi.suggested_discount, fbsi.extra_charge, fbsi.extra_charge_illustration,fbsi.sample_warehouse,
             fbsi.cert_warehouse,fbsi.fee_status,fbsi.received,fbsi.remark,fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,
-            fbsi.received_amount,fbsi.invoice_amount
+            fbsi.received_amount,fbsi.invoice_amount, fbsi.order_type
         FROM finance_business_settlement_info fbsi
         LEFT JOIN business_order bo ON fbsi.order_id = bo.id
         WHERE bo.is_del = 0
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
index 66b1438..bd3467b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
@@ -69,7 +69,7 @@
 
     @ApiModelProperty(value = "检定人员名称", dataType = "String")
     @ExcelProperty(value = "检定员", order = 8)
-    private String measurePersonName;
+    private String measurePerson;
 
     @ApiModelProperty(value = "审批状态", dataType = "String")
     @DictCodeField(message = "审批状态不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoDetailResponse.java
index 784b2ed..8816c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoDetailResponse.java
@@ -99,6 +99,9 @@
     @ApiModelProperty(value = "是否加急", dataType = "String")
     private String isUrgent;
 
+    @ApiModelProperty(value = "委托单类型/业务结算类型", dataType = "String")
+    private String orderType;
+
 //    @ApiModelProperty(value = "标价-单位分", dataType = "Integer")
 //    private Integer postedPrice;
 //
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoListResponse.java
index 81bc5c1..ffeda80 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoListResponse.java
@@ -109,6 +109,9 @@
     @ExcelProperty("开票金额（元）")
     private String invoiceAmount;
 
+    @ApiModelProperty(value = "委托单类型/业务结算类型", dataType = "String")
+    private String orderType;
+
     @ApiModelProperty(value = "送样人", dataType = "String")
 //    @ExcelProperty(value = "送样人")
     private String deliverer;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
index 9381bc3..311d80b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
@@ -105,4 +105,8 @@
     @TableField("update_time")
     private String updateTime;
 
+    //转换为待归还的时间，用于列表排序展示
+    @TableField("wait_time")
+    private String waitTime;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
index e1cddfb..877dde8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
@@ -179,4 +179,8 @@
 
     @TableField(exist = false)
     private int seq;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "前端可根据判断是否有交接单", dataType = "Long")
+    private Long interchangeId;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementInfo.java
index e3ed45c..19ea54a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementInfo.java
@@ -94,7 +94,7 @@
     /**
      * 实收合计（元）
      */
-    @ApiModelProperty(value = "实收合计（元）", dataType = "String")
+    @ApiModelProperty(value = "实收合计（元）/报价合计", dataType = "String")
     @TableField("actual_total_fee")
     private String actualTotalFee;
 
@@ -112,6 +112,10 @@
     @TableField("invoice_amount")
     private String invoiceAmount;
 
+    @ApiModelProperty(value = "委托单类型/业务结算类型", dataType = "String")
+    @TableField("order_type")
+    private String orderType;
+
     /**
      * 创建时间
      */

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
index 509b3dd..fb8e7cc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
@@ -31,14 +31,14 @@
 
 /**
  * <p>
- * 业务管理-证书报告 前端控制器
+ * 业务管理-计量数据管理 前端控制器
  * </p>
  *
  * @author zt
  * @since 2023-02-02
  */
 @RestController
-@Api(tags = "证书报告模块")
+@Api(tags = "计量数据管理模块（整合原始记录和证书报告）")
 @RequestMapping("/business/certificateReport")
 public class BusinessCertificateReportController extends ExportController {
     @Resource
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index f41c5f8..9f81a54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -105,7 +105,7 @@
             ORDER BY bosr.real_deliver_time DESC
         </if>
         <if test="request.sampleStatus == 5">
-            ORDER BY bosr.real_deliver_time DESC
+            ORDER BY bosr.wait_time DESC
         </if>
         <if test="request.sampleStatus == 6">
             ORDER BY bosr.return_time DESC
diff --git a/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml
index e277576..c4c9b5f 100644
--- a/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml
@@ -22,7 +22,7 @@
         SELECT bo.id AS order_id, fbsi.id, bo.order_code, bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.deliverer_tel,
             bo.is_urgent, bo.create_time, fbsi.suggested_discount, fbsi.extra_charge, fbsi.extra_charge_illustration,fbsi.sample_warehouse,
             fbsi.cert_warehouse,fbsi.fee_status,fbsi.received,fbsi.remark,fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,
-            fbsi.received_amount,fbsi.invoice_amount, bo.order_time
+            fbsi.received_amount,fbsi.invoice_amount, fbsi.order_type, bo.order_time
         FROM finance_business_settlement_info fbsi
         LEFT JOIN business_order bo ON fbsi.order_id = bo.id
         WHERE bo.is_del = 0
@@ -50,7 +50,7 @@
         SELECT bo.id AS order_id, fbsi.id, bo.order_code, bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.deliverer_tel,
             bo.is_urgent, bo.create_time, fbsi.suggested_discount, fbsi.extra_charge, fbsi.extra_charge_illustration,fbsi.sample_warehouse,
             fbsi.cert_warehouse,fbsi.fee_status,fbsi.received,fbsi.remark,fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,
-            fbsi.received_amount,fbsi.invoice_amount
+            fbsi.received_amount, fbsi.invoice_amount, fbsi.order_type
         FROM finance_business_settlement_info fbsi
         LEFT JOIN business_order bo ON fbsi.order_id = bo.id
         WHERE bo.is_del = 0
@@ -79,7 +79,7 @@
             bo.deliverer_tel, bo.create_time, bo.plan_deliver_time, bo.require_over_time, bo.is_urgent, fbsi.suggested_discount,
             fbsi.extra_charge, fbsi.extra_charge_illustration,bo.order_time,bo.customer_address,bo.certification_company,
             bo.certification_company_address,fbsi.sample_warehouse,fbsi.cert_warehouse,fbsi.fee_status,fbsi.received,fbsi.remark,
-            fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,fbsi.received_amount,fbsi.invoice_amount
+            fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,fbsi.received_amount,fbsi.invoice_amount, fbsi.order_type
         FROM finance_business_settlement_info fbsi
         LEFT JOIN business_order bo ON fbsi.order_id = bo.id
         WHERE bo.is_del = 0 AND fbsi.id = #{id}
@@ -89,7 +89,7 @@
         SELECT bo.id AS order_id, fbsi.id, bo.order_code, bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.deliverer_tel,
             bo.is_urgent, bo.create_time, fbsi.suggested_discount, fbsi.extra_charge, fbsi.extra_charge_illustration,fbsi.sample_warehouse,
             fbsi.cert_warehouse,fbsi.fee_status,fbsi.received,fbsi.remark,fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,
-            fbsi.received_amount,fbsi.invoice_amount
+            fbsi.received_amount,fbsi.invoice_amount, fbsi.order_type
         FROM finance_business_settlement_info fbsi
         LEFT JOIN business_order bo ON fbsi.order_id = bo.id
         WHERE bo.is_del = 0
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
index 66b1438..bd3467b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
@@ -69,7 +69,7 @@
 
     @ApiModelProperty(value = "检定人员名称", dataType = "String")
     @ExcelProperty(value = "检定员", order = 8)
-    private String measurePersonName;
+    private String measurePerson;
 
     @ApiModelProperty(value = "审批状态", dataType = "String")
     @DictCodeField(message = "审批状态不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoDetailResponse.java
index 784b2ed..8816c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoDetailResponse.java
@@ -99,6 +99,9 @@
     @ApiModelProperty(value = "是否加急", dataType = "String")
     private String isUrgent;
 
+    @ApiModelProperty(value = "委托单类型/业务结算类型", dataType = "String")
+    private String orderType;
+
 //    @ApiModelProperty(value = "标价-单位分", dataType = "Integer")
 //    private Integer postedPrice;
 //
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoListResponse.java
index 81bc5c1..ffeda80 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoListResponse.java
@@ -109,6 +109,9 @@
     @ExcelProperty("开票金额（元）")
     private String invoiceAmount;
 
+    @ApiModelProperty(value = "委托单类型/业务结算类型", dataType = "String")
+    private String orderType;
+
     @ApiModelProperty(value = "送样人", dataType = "String")
 //    @ExcelProperty(value = "送样人")
     private String deliverer;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
index 9381bc3..311d80b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
@@ -105,4 +105,8 @@
     @TableField("update_time")
     private String updateTime;
 
+    //转换为待归还的时间，用于列表排序展示
+    @TableField("wait_time")
+    private String waitTime;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
index e1cddfb..877dde8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
@@ -179,4 +179,8 @@
 
     @TableField(exist = false)
     private int seq;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "前端可根据判断是否有交接单", dataType = "Long")
+    private Long interchangeId;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementInfo.java
index e3ed45c..19ea54a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementInfo.java
@@ -94,7 +94,7 @@
     /**
      * 实收合计（元）
      */
-    @ApiModelProperty(value = "实收合计（元）", dataType = "String")
+    @ApiModelProperty(value = "实收合计（元）/报价合计", dataType = "String")
     @TableField("actual_total_fee")
     private String actualTotalFee;
 
@@ -112,6 +112,10 @@
     @TableField("invoice_amount")
     private String invoiceAmount;
 
+    @ApiModelProperty(value = "委托单类型/业务结算类型", dataType = "String")
+    @TableField("order_type")
+    private String orderType;
+
     /**
      * 创建时间
      */
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
index 8a75844..0a07474 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
@@ -417,9 +417,9 @@
         }
         if (ApprovalStatusEnum.PASSED.equals(certificateReport.getApprovalStatus())) {
             try {
-                threadPool.submit(new Runnable() {
-                    @Override
-                    public void run() {
+//                threadPool.submit(new Runnable() {
+//                    @Override
+//                    public void run() {
                         String printFileName = printFileRegister.registerPrintFile(
                                 RegisterCustomParameters.builder()
                                         .customFileName(certificateReport.getCertificateReportName() + certificateReport.getCertificateReportCode())
@@ -434,8 +434,8 @@
                         //生成证书打印信息
                         CertificatePrintBuilder(certificateReport, printFileName);
                         log.debug("----success");
-                    }
-                });
+//                    }
+//                });
             } catch (Exception ex) {
                 log.error("");
             }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
index 509b3dd..fb8e7cc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
@@ -31,14 +31,14 @@
 
 /**
  * <p>
- * 业务管理-证书报告 前端控制器
+ * 业务管理-计量数据管理 前端控制器
  * </p>
  *
  * @author zt
  * @since 2023-02-02
  */
 @RestController
-@Api(tags = "证书报告模块")
+@Api(tags = "计量数据管理模块（整合原始记录和证书报告）")
 @RequestMapping("/business/certificateReport")
 public class BusinessCertificateReportController extends ExportController {
     @Resource
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index f41c5f8..9f81a54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -105,7 +105,7 @@
             ORDER BY bosr.real_deliver_time DESC
         </if>
         <if test="request.sampleStatus == 5">
-            ORDER BY bosr.real_deliver_time DESC
+            ORDER BY bosr.wait_time DESC
         </if>
         <if test="request.sampleStatus == 6">
             ORDER BY bosr.return_time DESC
diff --git a/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml
index e277576..c4c9b5f 100644
--- a/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml
@@ -22,7 +22,7 @@
         SELECT bo.id AS order_id, fbsi.id, bo.order_code, bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.deliverer_tel,
             bo.is_urgent, bo.create_time, fbsi.suggested_discount, fbsi.extra_charge, fbsi.extra_charge_illustration,fbsi.sample_warehouse,
             fbsi.cert_warehouse,fbsi.fee_status,fbsi.received,fbsi.remark,fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,
-            fbsi.received_amount,fbsi.invoice_amount, bo.order_time
+            fbsi.received_amount,fbsi.invoice_amount, fbsi.order_type, bo.order_time
         FROM finance_business_settlement_info fbsi
         LEFT JOIN business_order bo ON fbsi.order_id = bo.id
         WHERE bo.is_del = 0
@@ -50,7 +50,7 @@
         SELECT bo.id AS order_id, fbsi.id, bo.order_code, bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.deliverer_tel,
             bo.is_urgent, bo.create_time, fbsi.suggested_discount, fbsi.extra_charge, fbsi.extra_charge_illustration,fbsi.sample_warehouse,
             fbsi.cert_warehouse,fbsi.fee_status,fbsi.received,fbsi.remark,fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,
-            fbsi.received_amount,fbsi.invoice_amount
+            fbsi.received_amount, fbsi.invoice_amount, fbsi.order_type
         FROM finance_business_settlement_info fbsi
         LEFT JOIN business_order bo ON fbsi.order_id = bo.id
         WHERE bo.is_del = 0
@@ -79,7 +79,7 @@
             bo.deliverer_tel, bo.create_time, bo.plan_deliver_time, bo.require_over_time, bo.is_urgent, fbsi.suggested_discount,
             fbsi.extra_charge, fbsi.extra_charge_illustration,bo.order_time,bo.customer_address,bo.certification_company,
             bo.certification_company_address,fbsi.sample_warehouse,fbsi.cert_warehouse,fbsi.fee_status,fbsi.received,fbsi.remark,
-            fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,fbsi.received_amount,fbsi.invoice_amount
+            fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,fbsi.received_amount,fbsi.invoice_amount, fbsi.order_type
         FROM finance_business_settlement_info fbsi
         LEFT JOIN business_order bo ON fbsi.order_id = bo.id
         WHERE bo.is_del = 0 AND fbsi.id = #{id}
@@ -89,7 +89,7 @@
         SELECT bo.id AS order_id, fbsi.id, bo.order_code, bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.deliverer_tel,
             bo.is_urgent, bo.create_time, fbsi.suggested_discount, fbsi.extra_charge, fbsi.extra_charge_illustration,fbsi.sample_warehouse,
             fbsi.cert_warehouse,fbsi.fee_status,fbsi.received,fbsi.remark,fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,
-            fbsi.received_amount,fbsi.invoice_amount
+            fbsi.received_amount,fbsi.invoice_amount, fbsi.order_type
         FROM finance_business_settlement_info fbsi
         LEFT JOIN business_order bo ON fbsi.order_id = bo.id
         WHERE bo.is_del = 0
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
index 66b1438..bd3467b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
@@ -69,7 +69,7 @@
 
     @ApiModelProperty(value = "检定人员名称", dataType = "String")
     @ExcelProperty(value = "检定员", order = 8)
-    private String measurePersonName;
+    private String measurePerson;
 
     @ApiModelProperty(value = "审批状态", dataType = "String")
     @DictCodeField(message = "审批状态不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoDetailResponse.java
index 784b2ed..8816c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoDetailResponse.java
@@ -99,6 +99,9 @@
     @ApiModelProperty(value = "是否加急", dataType = "String")
     private String isUrgent;
 
+    @ApiModelProperty(value = "委托单类型/业务结算类型", dataType = "String")
+    private String orderType;
+
 //    @ApiModelProperty(value = "标价-单位分", dataType = "Integer")
 //    private Integer postedPrice;
 //
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoListResponse.java
index 81bc5c1..ffeda80 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoListResponse.java
@@ -109,6 +109,9 @@
     @ExcelProperty("开票金额（元）")
     private String invoiceAmount;
 
+    @ApiModelProperty(value = "委托单类型/业务结算类型", dataType = "String")
+    private String orderType;
+
     @ApiModelProperty(value = "送样人", dataType = "String")
 //    @ExcelProperty(value = "送样人")
     private String deliverer;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
index 9381bc3..311d80b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
@@ -105,4 +105,8 @@
     @TableField("update_time")
     private String updateTime;
 
+    //转换为待归还的时间，用于列表排序展示
+    @TableField("wait_time")
+    private String waitTime;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
index e1cddfb..877dde8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
@@ -179,4 +179,8 @@
 
     @TableField(exist = false)
     private int seq;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "前端可根据判断是否有交接单", dataType = "Long")
+    private Long interchangeId;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementInfo.java
index e3ed45c..19ea54a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementInfo.java
@@ -94,7 +94,7 @@
     /**
      * 实收合计（元）
      */
-    @ApiModelProperty(value = "实收合计（元）", dataType = "String")
+    @ApiModelProperty(value = "实收合计（元）/报价合计", dataType = "String")
     @TableField("actual_total_fee")
     private String actualTotalFee;
 
@@ -112,6 +112,10 @@
     @TableField("invoice_amount")
     private String invoiceAmount;
 
+    @ApiModelProperty(value = "委托单类型/业务结算类型", dataType = "String")
+    @TableField("order_type")
+    private String orderType;
+
     /**
      * 创建时间
      */
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
index 8a75844..0a07474 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
@@ -417,9 +417,9 @@
         }
         if (ApprovalStatusEnum.PASSED.equals(certificateReport.getApprovalStatus())) {
             try {
-                threadPool.submit(new Runnable() {
-                    @Override
-                    public void run() {
+//                threadPool.submit(new Runnable() {
+//                    @Override
+//                    public void run() {
                         String printFileName = printFileRegister.registerPrintFile(
                                 RegisterCustomParameters.builder()
                                         .customFileName(certificateReport.getCertificateReportName() + certificateReport.getCertificateReportCode())
@@ -434,8 +434,8 @@
                         //生成证书打印信息
                         CertificatePrintBuilder(certificateReport, printFileName);
                         log.debug("----success");
-                    }
-                });
+//                    }
+//                });
             } catch (Exception ex) {
                 log.error("");
             }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
index 50b014b..ba6ab23 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
@@ -103,6 +103,7 @@
                 customerSampleInfo.setSampleStatus(orderSample.getSampleStatus());
                 customerSampleInfo.setIsExistSample("1");
                 customerSampleInfo.setRelationId(orderSample.getId());
+                customerSampleInfo.setInterchangeId(orderSample.getInterchangeId());
                 customerSampleList.add(customerSampleInfo);
             }
         }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
index 509b3dd..fb8e7cc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
@@ -31,14 +31,14 @@
 
 /**
  * <p>
- * 业务管理-证书报告 前端控制器
+ * 业务管理-计量数据管理 前端控制器
  * </p>
  *
  * @author zt
  * @since 2023-02-02
  */
 @RestController
-@Api(tags = "证书报告模块")
+@Api(tags = "计量数据管理模块（整合原始记录和证书报告）")
 @RequestMapping("/business/certificateReport")
 public class BusinessCertificateReportController extends ExportController {
     @Resource
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index f41c5f8..9f81a54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -105,7 +105,7 @@
             ORDER BY bosr.real_deliver_time DESC
         </if>
         <if test="request.sampleStatus == 5">
-            ORDER BY bosr.real_deliver_time DESC
+            ORDER BY bosr.wait_time DESC
         </if>
         <if test="request.sampleStatus == 6">
             ORDER BY bosr.return_time DESC
diff --git a/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml
index e277576..c4c9b5f 100644
--- a/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml
@@ -22,7 +22,7 @@
         SELECT bo.id AS order_id, fbsi.id, bo.order_code, bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.deliverer_tel,
             bo.is_urgent, bo.create_time, fbsi.suggested_discount, fbsi.extra_charge, fbsi.extra_charge_illustration,fbsi.sample_warehouse,
             fbsi.cert_warehouse,fbsi.fee_status,fbsi.received,fbsi.remark,fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,
-            fbsi.received_amount,fbsi.invoice_amount, bo.order_time
+            fbsi.received_amount,fbsi.invoice_amount, fbsi.order_type, bo.order_time
         FROM finance_business_settlement_info fbsi
         LEFT JOIN business_order bo ON fbsi.order_id = bo.id
         WHERE bo.is_del = 0
@@ -50,7 +50,7 @@
         SELECT bo.id AS order_id, fbsi.id, bo.order_code, bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.deliverer_tel,
             bo.is_urgent, bo.create_time, fbsi.suggested_discount, fbsi.extra_charge, fbsi.extra_charge_illustration,fbsi.sample_warehouse,
             fbsi.cert_warehouse,fbsi.fee_status,fbsi.received,fbsi.remark,fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,
-            fbsi.received_amount,fbsi.invoice_amount
+            fbsi.received_amount, fbsi.invoice_amount, fbsi.order_type
         FROM finance_business_settlement_info fbsi
         LEFT JOIN business_order bo ON fbsi.order_id = bo.id
         WHERE bo.is_del = 0
@@ -79,7 +79,7 @@
             bo.deliverer_tel, bo.create_time, bo.plan_deliver_time, bo.require_over_time, bo.is_urgent, fbsi.suggested_discount,
             fbsi.extra_charge, fbsi.extra_charge_illustration,bo.order_time,bo.customer_address,bo.certification_company,
             bo.certification_company_address,fbsi.sample_warehouse,fbsi.cert_warehouse,fbsi.fee_status,fbsi.received,fbsi.remark,
-            fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,fbsi.received_amount,fbsi.invoice_amount
+            fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,fbsi.received_amount,fbsi.invoice_amount, fbsi.order_type
         FROM finance_business_settlement_info fbsi
         LEFT JOIN business_order bo ON fbsi.order_id = bo.id
         WHERE bo.is_del = 0 AND fbsi.id = #{id}
@@ -89,7 +89,7 @@
         SELECT bo.id AS order_id, fbsi.id, bo.order_code, bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.deliverer_tel,
             bo.is_urgent, bo.create_time, fbsi.suggested_discount, fbsi.extra_charge, fbsi.extra_charge_illustration,fbsi.sample_warehouse,
             fbsi.cert_warehouse,fbsi.fee_status,fbsi.received,fbsi.remark,fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,
-            fbsi.received_amount,fbsi.invoice_amount
+            fbsi.received_amount,fbsi.invoice_amount, fbsi.order_type
         FROM finance_business_settlement_info fbsi
         LEFT JOIN business_order bo ON fbsi.order_id = bo.id
         WHERE bo.is_del = 0
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
index 66b1438..bd3467b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
@@ -69,7 +69,7 @@
 
     @ApiModelProperty(value = "检定人员名称", dataType = "String")
     @ExcelProperty(value = "检定员", order = 8)
-    private String measurePersonName;
+    private String measurePerson;
 
     @ApiModelProperty(value = "审批状态", dataType = "String")
     @DictCodeField(message = "审批状态不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoDetailResponse.java
index 784b2ed..8816c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoDetailResponse.java
@@ -99,6 +99,9 @@
     @ApiModelProperty(value = "是否加急", dataType = "String")
     private String isUrgent;
 
+    @ApiModelProperty(value = "委托单类型/业务结算类型", dataType = "String")
+    private String orderType;
+
 //    @ApiModelProperty(value = "标价-单位分", dataType = "Integer")
 //    private Integer postedPrice;
 //
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoListResponse.java
index 81bc5c1..ffeda80 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoListResponse.java
@@ -109,6 +109,9 @@
     @ExcelProperty("开票金额（元）")
     private String invoiceAmount;
 
+    @ApiModelProperty(value = "委托单类型/业务结算类型", dataType = "String")
+    private String orderType;
+
     @ApiModelProperty(value = "送样人", dataType = "String")
 //    @ExcelProperty(value = "送样人")
     private String deliverer;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
index 9381bc3..311d80b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
@@ -105,4 +105,8 @@
     @TableField("update_time")
     private String updateTime;
 
+    //转换为待归还的时间，用于列表排序展示
+    @TableField("wait_time")
+    private String waitTime;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
index e1cddfb..877dde8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
@@ -179,4 +179,8 @@
 
     @TableField(exist = false)
     private int seq;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "前端可根据判断是否有交接单", dataType = "Long")
+    private Long interchangeId;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementInfo.java
index e3ed45c..19ea54a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementInfo.java
@@ -94,7 +94,7 @@
     /**
      * 实收合计（元）
      */
-    @ApiModelProperty(value = "实收合计（元）", dataType = "String")
+    @ApiModelProperty(value = "实收合计（元）/报价合计", dataType = "String")
     @TableField("actual_total_fee")
     private String actualTotalFee;
 
@@ -112,6 +112,10 @@
     @TableField("invoice_amount")
     private String invoiceAmount;
 
+    @ApiModelProperty(value = "委托单类型/业务结算类型", dataType = "String")
+    @TableField("order_type")
+    private String orderType;
+
     /**
      * 创建时间
      */
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
index 8a75844..0a07474 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
@@ -417,9 +417,9 @@
         }
         if (ApprovalStatusEnum.PASSED.equals(certificateReport.getApprovalStatus())) {
             try {
-                threadPool.submit(new Runnable() {
-                    @Override
-                    public void run() {
+//                threadPool.submit(new Runnable() {
+//                    @Override
+//                    public void run() {
                         String printFileName = printFileRegister.registerPrintFile(
                                 RegisterCustomParameters.builder()
                                         .customFileName(certificateReport.getCertificateReportName() + certificateReport.getCertificateReportCode())
@@ -434,8 +434,8 @@
                         //生成证书打印信息
                         CertificatePrintBuilder(certificateReport, printFileName);
                         log.debug("----success");
-                    }
-                });
+//                    }
+//                });
             } catch (Exception ex) {
                 log.error("");
             }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
index 50b014b..ba6ab23 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
@@ -103,6 +103,7 @@
                 customerSampleInfo.setSampleStatus(orderSample.getSampleStatus());
                 customerSampleInfo.setIsExistSample("1");
                 customerSampleInfo.setRelationId(orderSample.getId());
+                customerSampleInfo.setInterchangeId(orderSample.getInterchangeId());
                 customerSampleList.add(customerSampleInfo);
             }
         }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
index 5cdc941..4029fab 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
@@ -40,7 +40,6 @@
 import com.casic.missiles.model.workbench.WorkbenchRemindMessage;
 import com.casic.missiles.service.business.IBusinessDispatchService;
 import com.casic.missiles.service.system.IMessagePushService;
-import com.casic.missiles.utils.DictCodeUtils;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -50,8 +49,10 @@
 import org.springframework.util.ObjectUtils;
 
 import javax.servlet.http.HttpServletResponse;
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
 
 /**
  * @author cz
@@ -429,6 +430,10 @@
         if ("1".equals(statusChangeDTO.getStatus())) {
             updateLabExecutiveInfo(statusChangeDTO, MeasureStatusEnum.TERMINATED);
         }
+        if (TO_GIVE_BACK.equals(statusChangeDTO.getStatus())) {
+            //更新转换为待归还的时间
+            businessOrderSampleRelation.setWaitTime(DateUtil.now());
+        }
         return this.orderSampleRelationMapper.update(businessOrderSampleRelation, queryWrapper);
     }
 

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
index 509b3dd..fb8e7cc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
@@ -31,14 +31,14 @@
 
 /**
  * <p>
- * 业务管理-证书报告 前端控制器
+ * 业务管理-计量数据管理 前端控制器
  * </p>
  *
  * @author zt
  * @since 2023-02-02
  */
 @RestController
-@Api(tags = "证书报告模块")
+@Api(tags = "计量数据管理模块（整合原始记录和证书报告）")
 @RequestMapping("/business/certificateReport")
 public class BusinessCertificateReportController extends ExportController {
     @Resource
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index f41c5f8..9f81a54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -105,7 +105,7 @@
             ORDER BY bosr.real_deliver_time DESC
         </if>
         <if test="request.sampleStatus == 5">
-            ORDER BY bosr.real_deliver_time DESC
+            ORDER BY bosr.wait_time DESC
         </if>
         <if test="request.sampleStatus == 6">
             ORDER BY bosr.return_time DESC
diff --git a/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml
index e277576..c4c9b5f 100644
--- a/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml
@@ -22,7 +22,7 @@
         SELECT bo.id AS order_id, fbsi.id, bo.order_code, bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.deliverer_tel,
             bo.is_urgent, bo.create_time, fbsi.suggested_discount, fbsi.extra_charge, fbsi.extra_charge_illustration,fbsi.sample_warehouse,
             fbsi.cert_warehouse,fbsi.fee_status,fbsi.received,fbsi.remark,fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,
-            fbsi.received_amount,fbsi.invoice_amount, bo.order_time
+            fbsi.received_amount,fbsi.invoice_amount, fbsi.order_type, bo.order_time
         FROM finance_business_settlement_info fbsi
         LEFT JOIN business_order bo ON fbsi.order_id = bo.id
         WHERE bo.is_del = 0
@@ -50,7 +50,7 @@
         SELECT bo.id AS order_id, fbsi.id, bo.order_code, bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.deliverer_tel,
             bo.is_urgent, bo.create_time, fbsi.suggested_discount, fbsi.extra_charge, fbsi.extra_charge_illustration,fbsi.sample_warehouse,
             fbsi.cert_warehouse,fbsi.fee_status,fbsi.received,fbsi.remark,fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,
-            fbsi.received_amount,fbsi.invoice_amount
+            fbsi.received_amount, fbsi.invoice_amount, fbsi.order_type
         FROM finance_business_settlement_info fbsi
         LEFT JOIN business_order bo ON fbsi.order_id = bo.id
         WHERE bo.is_del = 0
@@ -79,7 +79,7 @@
             bo.deliverer_tel, bo.create_time, bo.plan_deliver_time, bo.require_over_time, bo.is_urgent, fbsi.suggested_discount,
             fbsi.extra_charge, fbsi.extra_charge_illustration,bo.order_time,bo.customer_address,bo.certification_company,
             bo.certification_company_address,fbsi.sample_warehouse,fbsi.cert_warehouse,fbsi.fee_status,fbsi.received,fbsi.remark,
-            fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,fbsi.received_amount,fbsi.invoice_amount
+            fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,fbsi.received_amount,fbsi.invoice_amount, fbsi.order_type
         FROM finance_business_settlement_info fbsi
         LEFT JOIN business_order bo ON fbsi.order_id = bo.id
         WHERE bo.is_del = 0 AND fbsi.id = #{id}
@@ -89,7 +89,7 @@
         SELECT bo.id AS order_id, fbsi.id, bo.order_code, bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.deliverer_tel,
             bo.is_urgent, bo.create_time, fbsi.suggested_discount, fbsi.extra_charge, fbsi.extra_charge_illustration,fbsi.sample_warehouse,
             fbsi.cert_warehouse,fbsi.fee_status,fbsi.received,fbsi.remark,fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,
-            fbsi.received_amount,fbsi.invoice_amount
+            fbsi.received_amount,fbsi.invoice_amount, fbsi.order_type
         FROM finance_business_settlement_info fbsi
         LEFT JOIN business_order bo ON fbsi.order_id = bo.id
         WHERE bo.is_del = 0
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
index 66b1438..bd3467b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
@@ -69,7 +69,7 @@
 
     @ApiModelProperty(value = "检定人员名称", dataType = "String")
     @ExcelProperty(value = "检定员", order = 8)
-    private String measurePersonName;
+    private String measurePerson;
 
     @ApiModelProperty(value = "审批状态", dataType = "String")
     @DictCodeField(message = "审批状态不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoDetailResponse.java
index 784b2ed..8816c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoDetailResponse.java
@@ -99,6 +99,9 @@
     @ApiModelProperty(value = "是否加急", dataType = "String")
     private String isUrgent;
 
+    @ApiModelProperty(value = "委托单类型/业务结算类型", dataType = "String")
+    private String orderType;
+
 //    @ApiModelProperty(value = "标价-单位分", dataType = "Integer")
 //    private Integer postedPrice;
 //
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoListResponse.java
index 81bc5c1..ffeda80 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoListResponse.java
@@ -109,6 +109,9 @@
     @ExcelProperty("开票金额（元）")
     private String invoiceAmount;
 
+    @ApiModelProperty(value = "委托单类型/业务结算类型", dataType = "String")
+    private String orderType;
+
     @ApiModelProperty(value = "送样人", dataType = "String")
 //    @ExcelProperty(value = "送样人")
     private String deliverer;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
index 9381bc3..311d80b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
@@ -105,4 +105,8 @@
     @TableField("update_time")
     private String updateTime;
 
+    //转换为待归还的时间，用于列表排序展示
+    @TableField("wait_time")
+    private String waitTime;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
index e1cddfb..877dde8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
@@ -179,4 +179,8 @@
 
     @TableField(exist = false)
     private int seq;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "前端可根据判断是否有交接单", dataType = "Long")
+    private Long interchangeId;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementInfo.java
index e3ed45c..19ea54a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementInfo.java
@@ -94,7 +94,7 @@
     /**
      * 实收合计（元）
      */
-    @ApiModelProperty(value = "实收合计（元）", dataType = "String")
+    @ApiModelProperty(value = "实收合计（元）/报价合计", dataType = "String")
     @TableField("actual_total_fee")
     private String actualTotalFee;
 
@@ -112,6 +112,10 @@
     @TableField("invoice_amount")
     private String invoiceAmount;
 
+    @ApiModelProperty(value = "委托单类型/业务结算类型", dataType = "String")
+    @TableField("order_type")
+    private String orderType;
+
     /**
      * 创建时间
      */
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
index 8a75844..0a07474 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
@@ -417,9 +417,9 @@
         }
         if (ApprovalStatusEnum.PASSED.equals(certificateReport.getApprovalStatus())) {
             try {
-                threadPool.submit(new Runnable() {
-                    @Override
-                    public void run() {
+//                threadPool.submit(new Runnable() {
+//                    @Override
+//                    public void run() {
                         String printFileName = printFileRegister.registerPrintFile(
                                 RegisterCustomParameters.builder()
                                         .customFileName(certificateReport.getCertificateReportName() + certificateReport.getCertificateReportCode())
@@ -434,8 +434,8 @@
                         //生成证书打印信息
                         CertificatePrintBuilder(certificateReport, printFileName);
                         log.debug("----success");
-                    }
-                });
+//                    }
+//                });
             } catch (Exception ex) {
                 log.error("");
             }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
index 50b014b..ba6ab23 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
@@ -103,6 +103,7 @@
                 customerSampleInfo.setSampleStatus(orderSample.getSampleStatus());
                 customerSampleInfo.setIsExistSample("1");
                 customerSampleInfo.setRelationId(orderSample.getId());
+                customerSampleInfo.setInterchangeId(orderSample.getInterchangeId());
                 customerSampleList.add(customerSampleInfo);
             }
         }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
index 5cdc941..4029fab 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
@@ -40,7 +40,6 @@
 import com.casic.missiles.model.workbench.WorkbenchRemindMessage;
 import com.casic.missiles.service.business.IBusinessDispatchService;
 import com.casic.missiles.service.system.IMessagePushService;
-import com.casic.missiles.utils.DictCodeUtils;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -50,8 +49,10 @@
 import org.springframework.util.ObjectUtils;
 
 import javax.servlet.http.HttpServletResponse;
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
 
 /**
  * @author cz
@@ -429,6 +430,10 @@
         if ("1".equals(statusChangeDTO.getStatus())) {
             updateLabExecutiveInfo(statusChangeDTO, MeasureStatusEnum.TERMINATED);
         }
+        if (TO_GIVE_BACK.equals(statusChangeDTO.getStatus())) {
+            //更新转换为待归还的时间
+            businessOrderSampleRelation.setWaitTime(DateUtil.now());
+        }
         return this.orderSampleRelationMapper.update(businessOrderSampleRelation, queryWrapper);
     }
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/finance/FinanceBusinessSettlementInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/finance/FinanceBusinessSettlementInfoServiceImpl.java
index b26c706..640dbb7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/finance/FinanceBusinessSettlementInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/finance/FinanceBusinessSettlementInfoServiceImpl.java
@@ -159,6 +159,8 @@
         if (Objects.isNull(detail) || CollectionUtils.isEmpty(detail.getSampleDetailsList())) {
             return;
         }
+        int sum = detail.getSampleDetailsList().stream().mapToInt(FinanceBusinessSettlementDetails::getSets).sum();
+        detail.setSampleCount(sum);
         Map<String, Object> map = new HashMap<>();
         map.put("settlementType", String.valueOf(settlementType));
         PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class);

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
index 509b3dd..fb8e7cc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
@@ -31,14 +31,14 @@
 
 /**
  * <p>
- * 业务管理-证书报告 前端控制器
+ * 业务管理-计量数据管理 前端控制器
  * </p>
  *
  * @author zt
  * @since 2023-02-02
  */
 @RestController
-@Api(tags = "证书报告模块")
+@Api(tags = "计量数据管理模块（整合原始记录和证书报告）")
 @RequestMapping("/business/certificateReport")
 public class BusinessCertificateReportController extends ExportController {
     @Resource
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index f41c5f8..9f81a54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -105,7 +105,7 @@
             ORDER BY bosr.real_deliver_time DESC
         </if>
         <if test="request.sampleStatus == 5">
-            ORDER BY bosr.real_deliver_time DESC
+            ORDER BY bosr.wait_time DESC
         </if>
         <if test="request.sampleStatus == 6">
             ORDER BY bosr.return_time DESC
diff --git a/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml
index e277576..c4c9b5f 100644
--- a/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml
@@ -22,7 +22,7 @@
         SELECT bo.id AS order_id, fbsi.id, bo.order_code, bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.deliverer_tel,
             bo.is_urgent, bo.create_time, fbsi.suggested_discount, fbsi.extra_charge, fbsi.extra_charge_illustration,fbsi.sample_warehouse,
             fbsi.cert_warehouse,fbsi.fee_status,fbsi.received,fbsi.remark,fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,
-            fbsi.received_amount,fbsi.invoice_amount, bo.order_time
+            fbsi.received_amount,fbsi.invoice_amount, fbsi.order_type, bo.order_time
         FROM finance_business_settlement_info fbsi
         LEFT JOIN business_order bo ON fbsi.order_id = bo.id
         WHERE bo.is_del = 0
@@ -50,7 +50,7 @@
         SELECT bo.id AS order_id, fbsi.id, bo.order_code, bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.deliverer_tel,
             bo.is_urgent, bo.create_time, fbsi.suggested_discount, fbsi.extra_charge, fbsi.extra_charge_illustration,fbsi.sample_warehouse,
             fbsi.cert_warehouse,fbsi.fee_status,fbsi.received,fbsi.remark,fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,
-            fbsi.received_amount,fbsi.invoice_amount
+            fbsi.received_amount, fbsi.invoice_amount, fbsi.order_type
         FROM finance_business_settlement_info fbsi
         LEFT JOIN business_order bo ON fbsi.order_id = bo.id
         WHERE bo.is_del = 0
@@ -79,7 +79,7 @@
             bo.deliverer_tel, bo.create_time, bo.plan_deliver_time, bo.require_over_time, bo.is_urgent, fbsi.suggested_discount,
             fbsi.extra_charge, fbsi.extra_charge_illustration,bo.order_time,bo.customer_address,bo.certification_company,
             bo.certification_company_address,fbsi.sample_warehouse,fbsi.cert_warehouse,fbsi.fee_status,fbsi.received,fbsi.remark,
-            fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,fbsi.received_amount,fbsi.invoice_amount
+            fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,fbsi.received_amount,fbsi.invoice_amount, fbsi.order_type
         FROM finance_business_settlement_info fbsi
         LEFT JOIN business_order bo ON fbsi.order_id = bo.id
         WHERE bo.is_del = 0 AND fbsi.id = #{id}
@@ -89,7 +89,7 @@
         SELECT bo.id AS order_id, fbsi.id, bo.order_code, bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.deliverer_tel,
             bo.is_urgent, bo.create_time, fbsi.suggested_discount, fbsi.extra_charge, fbsi.extra_charge_illustration,fbsi.sample_warehouse,
             fbsi.cert_warehouse,fbsi.fee_status,fbsi.received,fbsi.remark,fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,
-            fbsi.received_amount,fbsi.invoice_amount
+            fbsi.received_amount,fbsi.invoice_amount, fbsi.order_type
         FROM finance_business_settlement_info fbsi
         LEFT JOIN business_order bo ON fbsi.order_id = bo.id
         WHERE bo.is_del = 0
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
index 66b1438..bd3467b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
@@ -69,7 +69,7 @@
 
     @ApiModelProperty(value = "检定人员名称", dataType = "String")
     @ExcelProperty(value = "检定员", order = 8)
-    private String measurePersonName;
+    private String measurePerson;
 
     @ApiModelProperty(value = "审批状态", dataType = "String")
     @DictCodeField(message = "审批状态不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoDetailResponse.java
index 784b2ed..8816c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoDetailResponse.java
@@ -99,6 +99,9 @@
     @ApiModelProperty(value = "是否加急", dataType = "String")
     private String isUrgent;
 
+    @ApiModelProperty(value = "委托单类型/业务结算类型", dataType = "String")
+    private String orderType;
+
 //    @ApiModelProperty(value = "标价-单位分", dataType = "Integer")
 //    private Integer postedPrice;
 //
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoListResponse.java
index 81bc5c1..ffeda80 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoListResponse.java
@@ -109,6 +109,9 @@
     @ExcelProperty("开票金额（元）")
     private String invoiceAmount;
 
+    @ApiModelProperty(value = "委托单类型/业务结算类型", dataType = "String")
+    private String orderType;
+
     @ApiModelProperty(value = "送样人", dataType = "String")
 //    @ExcelProperty(value = "送样人")
     private String deliverer;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
index 9381bc3..311d80b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
@@ -105,4 +105,8 @@
     @TableField("update_time")
     private String updateTime;
 
+    //转换为待归还的时间，用于列表排序展示
+    @TableField("wait_time")
+    private String waitTime;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
index e1cddfb..877dde8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
@@ -179,4 +179,8 @@
 
     @TableField(exist = false)
     private int seq;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "前端可根据判断是否有交接单", dataType = "Long")
+    private Long interchangeId;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementInfo.java
index e3ed45c..19ea54a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementInfo.java
@@ -94,7 +94,7 @@
     /**
      * 实收合计（元）
      */
-    @ApiModelProperty(value = "实收合计（元）", dataType = "String")
+    @ApiModelProperty(value = "实收合计（元）/报价合计", dataType = "String")
     @TableField("actual_total_fee")
     private String actualTotalFee;
 
@@ -112,6 +112,10 @@
     @TableField("invoice_amount")
     private String invoiceAmount;
 
+    @ApiModelProperty(value = "委托单类型/业务结算类型", dataType = "String")
+    @TableField("order_type")
+    private String orderType;
+
     /**
      * 创建时间
      */
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
index 8a75844..0a07474 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
@@ -417,9 +417,9 @@
         }
         if (ApprovalStatusEnum.PASSED.equals(certificateReport.getApprovalStatus())) {
             try {
-                threadPool.submit(new Runnable() {
-                    @Override
-                    public void run() {
+//                threadPool.submit(new Runnable() {
+//                    @Override
+//                    public void run() {
                         String printFileName = printFileRegister.registerPrintFile(
                                 RegisterCustomParameters.builder()
                                         .customFileName(certificateReport.getCertificateReportName() + certificateReport.getCertificateReportCode())
@@ -434,8 +434,8 @@
                         //生成证书打印信息
                         CertificatePrintBuilder(certificateReport, printFileName);
                         log.debug("----success");
-                    }
-                });
+//                    }
+//                });
             } catch (Exception ex) {
                 log.error("");
             }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
index 50b014b..ba6ab23 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
@@ -103,6 +103,7 @@
                 customerSampleInfo.setSampleStatus(orderSample.getSampleStatus());
                 customerSampleInfo.setIsExistSample("1");
                 customerSampleInfo.setRelationId(orderSample.getId());
+                customerSampleInfo.setInterchangeId(orderSample.getInterchangeId());
                 customerSampleList.add(customerSampleInfo);
             }
         }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
index 5cdc941..4029fab 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
@@ -40,7 +40,6 @@
 import com.casic.missiles.model.workbench.WorkbenchRemindMessage;
 import com.casic.missiles.service.business.IBusinessDispatchService;
 import com.casic.missiles.service.system.IMessagePushService;
-import com.casic.missiles.utils.DictCodeUtils;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -50,8 +49,10 @@
 import org.springframework.util.ObjectUtils;
 
 import javax.servlet.http.HttpServletResponse;
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
 
 /**
  * @author cz
@@ -429,6 +430,10 @@
         if ("1".equals(statusChangeDTO.getStatus())) {
             updateLabExecutiveInfo(statusChangeDTO, MeasureStatusEnum.TERMINATED);
         }
+        if (TO_GIVE_BACK.equals(statusChangeDTO.getStatus())) {
+            //更新转换为待归还的时间
+            businessOrderSampleRelation.setWaitTime(DateUtil.now());
+        }
         return this.orderSampleRelationMapper.update(businessOrderSampleRelation, queryWrapper);
     }
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/finance/FinanceBusinessSettlementInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/finance/FinanceBusinessSettlementInfoServiceImpl.java
index b26c706..640dbb7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/finance/FinanceBusinessSettlementInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/finance/FinanceBusinessSettlementInfoServiceImpl.java
@@ -159,6 +159,8 @@
         if (Objects.isNull(detail) || CollectionUtils.isEmpty(detail.getSampleDetailsList())) {
             return;
         }
+        int sum = detail.getSampleDetailsList().stream().mapToInt(FinanceBusinessSettlementDetails::getSets).sum();
+        detail.setSampleCount(sum);
         Map<String, Object> map = new HashMap<>();
         map.put("settlementType", String.valueOf(settlementType));
         PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/CertificateReportEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/CertificateReportEventPostProcessor.java
index 50795e9..92a0889 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/CertificateReportEventPostProcessor.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/CertificateReportEventPostProcessor.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.dto.flowable.NotifyEventStatusDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.business.MeasureTypeEnum;
@@ -15,6 +16,7 @@
 import com.casic.missiles.mapper.customer.CustomerSampleMapper;
 import com.casic.missiles.model.business.BusinessCertificateReport;
 import com.casic.missiles.model.business.BusinessOrder;
+import com.casic.missiles.model.business.BusinessOrderSampleRelation;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.service.listeners.NotifyEventPostProcessor;
 import com.casic.missiles.utils.SpringContextUtil;
@@ -78,7 +80,13 @@
                     //获取样品已取得的证书不小于应出具的总数时更新样品待归还状态
                     if(certificateReportMapper.selectSampleCertifications(sampleInfo.getId(), businessOrder.getId())>=
                             certificateReportMapper.selectSampleCertificationAlls(sampleInfo.getId(), businessOrder.getId())) {
-                        orderSampleRelationMapper.updateByOrderIdAndSampleId(businessOrder.getId(),sampleInfo.getId(), SampleStatusEnum.TO_GIVE_BACK);
+                        BusinessOrderSampleRelation businessOrderSampleRelation = new BusinessOrderSampleRelation();
+                        businessOrderSampleRelation.setSampleStatus(SampleStatusEnum.TO_GIVE_BACK);
+                        businessOrderSampleRelation.setWaitTime(DateUtil.now());
+                        QueryWrapper<BusinessOrderSampleRelation> wrapper = new QueryWrapper<>();
+                        wrapper.eq("order_id", businessOrder.getId());
+                        wrapper.eq("sample_id", sampleInfo.getId());
+                        orderSampleRelationMapper.update(businessOrderSampleRelation, wrapper);
                     }
                 }
             }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
index 509b3dd..fb8e7cc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
@@ -31,14 +31,14 @@
 
 /**
  * <p>
- * 业务管理-证书报告 前端控制器
+ * 业务管理-计量数据管理 前端控制器
  * </p>
  *
  * @author zt
  * @since 2023-02-02
  */
 @RestController
-@Api(tags = "证书报告模块")
+@Api(tags = "计量数据管理模块（整合原始记录和证书报告）")
 @RequestMapping("/business/certificateReport")
 public class BusinessCertificateReportController extends ExportController {
     @Resource
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index f41c5f8..9f81a54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -105,7 +105,7 @@
             ORDER BY bosr.real_deliver_time DESC
         </if>
         <if test="request.sampleStatus == 5">
-            ORDER BY bosr.real_deliver_time DESC
+            ORDER BY bosr.wait_time DESC
         </if>
         <if test="request.sampleStatus == 6">
             ORDER BY bosr.return_time DESC
diff --git a/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml
index e277576..c4c9b5f 100644
--- a/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml
@@ -22,7 +22,7 @@
         SELECT bo.id AS order_id, fbsi.id, bo.order_code, bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.deliverer_tel,
             bo.is_urgent, bo.create_time, fbsi.suggested_discount, fbsi.extra_charge, fbsi.extra_charge_illustration,fbsi.sample_warehouse,
             fbsi.cert_warehouse,fbsi.fee_status,fbsi.received,fbsi.remark,fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,
-            fbsi.received_amount,fbsi.invoice_amount, bo.order_time
+            fbsi.received_amount,fbsi.invoice_amount, fbsi.order_type, bo.order_time
         FROM finance_business_settlement_info fbsi
         LEFT JOIN business_order bo ON fbsi.order_id = bo.id
         WHERE bo.is_del = 0
@@ -50,7 +50,7 @@
         SELECT bo.id AS order_id, fbsi.id, bo.order_code, bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.deliverer_tel,
             bo.is_urgent, bo.create_time, fbsi.suggested_discount, fbsi.extra_charge, fbsi.extra_charge_illustration,fbsi.sample_warehouse,
             fbsi.cert_warehouse,fbsi.fee_status,fbsi.received,fbsi.remark,fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,
-            fbsi.received_amount,fbsi.invoice_amount
+            fbsi.received_amount, fbsi.invoice_amount, fbsi.order_type
         FROM finance_business_settlement_info fbsi
         LEFT JOIN business_order bo ON fbsi.order_id = bo.id
         WHERE bo.is_del = 0
@@ -79,7 +79,7 @@
             bo.deliverer_tel, bo.create_time, bo.plan_deliver_time, bo.require_over_time, bo.is_urgent, fbsi.suggested_discount,
             fbsi.extra_charge, fbsi.extra_charge_illustration,bo.order_time,bo.customer_address,bo.certification_company,
             bo.certification_company_address,fbsi.sample_warehouse,fbsi.cert_warehouse,fbsi.fee_status,fbsi.received,fbsi.remark,
-            fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,fbsi.received_amount,fbsi.invoice_amount
+            fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,fbsi.received_amount,fbsi.invoice_amount, fbsi.order_type
         FROM finance_business_settlement_info fbsi
         LEFT JOIN business_order bo ON fbsi.order_id = bo.id
         WHERE bo.is_del = 0 AND fbsi.id = #{id}
@@ -89,7 +89,7 @@
         SELECT bo.id AS order_id, fbsi.id, bo.order_code, bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.deliverer_tel,
             bo.is_urgent, bo.create_time, fbsi.suggested_discount, fbsi.extra_charge, fbsi.extra_charge_illustration,fbsi.sample_warehouse,
             fbsi.cert_warehouse,fbsi.fee_status,fbsi.received,fbsi.remark,fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,
-            fbsi.received_amount,fbsi.invoice_amount
+            fbsi.received_amount,fbsi.invoice_amount, fbsi.order_type
         FROM finance_business_settlement_info fbsi
         LEFT JOIN business_order bo ON fbsi.order_id = bo.id
         WHERE bo.is_del = 0
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
index 66b1438..bd3467b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
@@ -69,7 +69,7 @@
 
     @ApiModelProperty(value = "检定人员名称", dataType = "String")
     @ExcelProperty(value = "检定员", order = 8)
-    private String measurePersonName;
+    private String measurePerson;
 
     @ApiModelProperty(value = "审批状态", dataType = "String")
     @DictCodeField(message = "审批状态不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoDetailResponse.java
index 784b2ed..8816c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoDetailResponse.java
@@ -99,6 +99,9 @@
     @ApiModelProperty(value = "是否加急", dataType = "String")
     private String isUrgent;
 
+    @ApiModelProperty(value = "委托单类型/业务结算类型", dataType = "String")
+    private String orderType;
+
 //    @ApiModelProperty(value = "标价-单位分", dataType = "Integer")
 //    private Integer postedPrice;
 //
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoListResponse.java
index 81bc5c1..ffeda80 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoListResponse.java
@@ -109,6 +109,9 @@
     @ExcelProperty("开票金额（元）")
     private String invoiceAmount;
 
+    @ApiModelProperty(value = "委托单类型/业务结算类型", dataType = "String")
+    private String orderType;
+
     @ApiModelProperty(value = "送样人", dataType = "String")
 //    @ExcelProperty(value = "送样人")
     private String deliverer;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
index 9381bc3..311d80b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
@@ -105,4 +105,8 @@
     @TableField("update_time")
     private String updateTime;
 
+    //转换为待归还的时间，用于列表排序展示
+    @TableField("wait_time")
+    private String waitTime;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
index e1cddfb..877dde8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
@@ -179,4 +179,8 @@
 
     @TableField(exist = false)
     private int seq;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "前端可根据判断是否有交接单", dataType = "Long")
+    private Long interchangeId;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementInfo.java
index e3ed45c..19ea54a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementInfo.java
@@ -94,7 +94,7 @@
     /**
      * 实收合计（元）
      */
-    @ApiModelProperty(value = "实收合计（元）", dataType = "String")
+    @ApiModelProperty(value = "实收合计（元）/报价合计", dataType = "String")
     @TableField("actual_total_fee")
     private String actualTotalFee;
 
@@ -112,6 +112,10 @@
     @TableField("invoice_amount")
     private String invoiceAmount;
 
+    @ApiModelProperty(value = "委托单类型/业务结算类型", dataType = "String")
+    @TableField("order_type")
+    private String orderType;
+
     /**
      * 创建时间
      */
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
index 8a75844..0a07474 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
@@ -417,9 +417,9 @@
         }
         if (ApprovalStatusEnum.PASSED.equals(certificateReport.getApprovalStatus())) {
             try {
-                threadPool.submit(new Runnable() {
-                    @Override
-                    public void run() {
+//                threadPool.submit(new Runnable() {
+//                    @Override
+//                    public void run() {
                         String printFileName = printFileRegister.registerPrintFile(
                                 RegisterCustomParameters.builder()
                                         .customFileName(certificateReport.getCertificateReportName() + certificateReport.getCertificateReportCode())
@@ -434,8 +434,8 @@
                         //生成证书打印信息
                         CertificatePrintBuilder(certificateReport, printFileName);
                         log.debug("----success");
-                    }
-                });
+//                    }
+//                });
             } catch (Exception ex) {
                 log.error("");
             }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
index 50b014b..ba6ab23 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
@@ -103,6 +103,7 @@
                 customerSampleInfo.setSampleStatus(orderSample.getSampleStatus());
                 customerSampleInfo.setIsExistSample("1");
                 customerSampleInfo.setRelationId(orderSample.getId());
+                customerSampleInfo.setInterchangeId(orderSample.getInterchangeId());
                 customerSampleList.add(customerSampleInfo);
             }
         }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
index 5cdc941..4029fab 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
@@ -40,7 +40,6 @@
 import com.casic.missiles.model.workbench.WorkbenchRemindMessage;
 import com.casic.missiles.service.business.IBusinessDispatchService;
 import com.casic.missiles.service.system.IMessagePushService;
-import com.casic.missiles.utils.DictCodeUtils;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -50,8 +49,10 @@
 import org.springframework.util.ObjectUtils;
 
 import javax.servlet.http.HttpServletResponse;
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
 
 /**
  * @author cz
@@ -429,6 +430,10 @@
         if ("1".equals(statusChangeDTO.getStatus())) {
             updateLabExecutiveInfo(statusChangeDTO, MeasureStatusEnum.TERMINATED);
         }
+        if (TO_GIVE_BACK.equals(statusChangeDTO.getStatus())) {
+            //更新转换为待归还的时间
+            businessOrderSampleRelation.setWaitTime(DateUtil.now());
+        }
         return this.orderSampleRelationMapper.update(businessOrderSampleRelation, queryWrapper);
     }
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/finance/FinanceBusinessSettlementInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/finance/FinanceBusinessSettlementInfoServiceImpl.java
index b26c706..640dbb7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/finance/FinanceBusinessSettlementInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/finance/FinanceBusinessSettlementInfoServiceImpl.java
@@ -159,6 +159,8 @@
         if (Objects.isNull(detail) || CollectionUtils.isEmpty(detail.getSampleDetailsList())) {
             return;
         }
+        int sum = detail.getSampleDetailsList().stream().mapToInt(FinanceBusinessSettlementDetails::getSets).sum();
+        detail.setSampleCount(sum);
         Map<String, Object> map = new HashMap<>();
         map.put("settlementType", String.valueOf(settlementType));
         PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/CertificateReportEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/CertificateReportEventPostProcessor.java
index 50795e9..92a0889 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/CertificateReportEventPostProcessor.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/CertificateReportEventPostProcessor.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.dto.flowable.NotifyEventStatusDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.business.MeasureTypeEnum;
@@ -15,6 +16,7 @@
 import com.casic.missiles.mapper.customer.CustomerSampleMapper;
 import com.casic.missiles.model.business.BusinessCertificateReport;
 import com.casic.missiles.model.business.BusinessOrder;
+import com.casic.missiles.model.business.BusinessOrderSampleRelation;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.service.listeners.NotifyEventPostProcessor;
 import com.casic.missiles.utils.SpringContextUtil;
@@ -78,7 +80,13 @@
                     //获取样品已取得的证书不小于应出具的总数时更新样品待归还状态
                     if(certificateReportMapper.selectSampleCertifications(sampleInfo.getId(), businessOrder.getId())>=
                             certificateReportMapper.selectSampleCertificationAlls(sampleInfo.getId(), businessOrder.getId())) {
-                        orderSampleRelationMapper.updateByOrderIdAndSampleId(businessOrder.getId(),sampleInfo.getId(), SampleStatusEnum.TO_GIVE_BACK);
+                        BusinessOrderSampleRelation businessOrderSampleRelation = new BusinessOrderSampleRelation();
+                        businessOrderSampleRelation.setSampleStatus(SampleStatusEnum.TO_GIVE_BACK);
+                        businessOrderSampleRelation.setWaitTime(DateUtil.now());
+                        QueryWrapper<BusinessOrderSampleRelation> wrapper = new QueryWrapper<>();
+                        wrapper.eq("order_id", businessOrder.getId());
+                        wrapper.eq("sample_id", sampleInfo.getId());
+                        orderSampleRelationMapper.update(businessOrderSampleRelation, wrapper);
                     }
                 }
             }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificateReportApprovalData.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificateReportApprovalData.java
index 7133335..c03a93d 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificateReportApprovalData.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificateReportApprovalData.java
@@ -54,7 +54,7 @@
                 .collect(Collectors.toMap(e -> e.get(0).getTaskName(), e -> e));
         //初始化，生成模板文件
         FilePrintRegister filePrintRegister = initialization(templateFileDir, metaData.getId(), metaData.getCertificateReportFile());
-        filePrintRegister.setTemplateWordType("1".equals(metaData.getCertificateReportCategory()) ? true : false);
+        filePrintRegister.setTemplateWordType(false);
         //定制化签名开发预处理，定制化参数
         List<ImageConfig> approvalImageList = customizedSignNamesParamCreator(filePrintRegister.getTemplateWordType());
         filePrintRegister.setCustomFileName(registerParameters.getCustomFileName());

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
index 509b3dd..fb8e7cc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
@@ -31,14 +31,14 @@
 
 /**
  * <p>
- * 业务管理-证书报告 前端控制器
+ * 业务管理-计量数据管理 前端控制器
  * </p>
  *
  * @author zt
  * @since 2023-02-02
  */
 @RestController
-@Api(tags = "证书报告模块")
+@Api(tags = "计量数据管理模块（整合原始记录和证书报告）")
 @RequestMapping("/business/certificateReport")
 public class BusinessCertificateReportController extends ExportController {
     @Resource
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index f41c5f8..9f81a54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -105,7 +105,7 @@
             ORDER BY bosr.real_deliver_time DESC
         </if>
         <if test="request.sampleStatus == 5">
-            ORDER BY bosr.real_deliver_time DESC
+            ORDER BY bosr.wait_time DESC
         </if>
         <if test="request.sampleStatus == 6">
             ORDER BY bosr.return_time DESC
diff --git a/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml
index e277576..c4c9b5f 100644
--- a/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml
@@ -22,7 +22,7 @@
         SELECT bo.id AS order_id, fbsi.id, bo.order_code, bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.deliverer_tel,
             bo.is_urgent, bo.create_time, fbsi.suggested_discount, fbsi.extra_charge, fbsi.extra_charge_illustration,fbsi.sample_warehouse,
             fbsi.cert_warehouse,fbsi.fee_status,fbsi.received,fbsi.remark,fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,
-            fbsi.received_amount,fbsi.invoice_amount, bo.order_time
+            fbsi.received_amount,fbsi.invoice_amount, fbsi.order_type, bo.order_time
         FROM finance_business_settlement_info fbsi
         LEFT JOIN business_order bo ON fbsi.order_id = bo.id
         WHERE bo.is_del = 0
@@ -50,7 +50,7 @@
         SELECT bo.id AS order_id, fbsi.id, bo.order_code, bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.deliverer_tel,
             bo.is_urgent, bo.create_time, fbsi.suggested_discount, fbsi.extra_charge, fbsi.extra_charge_illustration,fbsi.sample_warehouse,
             fbsi.cert_warehouse,fbsi.fee_status,fbsi.received,fbsi.remark,fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,
-            fbsi.received_amount,fbsi.invoice_amount
+            fbsi.received_amount, fbsi.invoice_amount, fbsi.order_type
         FROM finance_business_settlement_info fbsi
         LEFT JOIN business_order bo ON fbsi.order_id = bo.id
         WHERE bo.is_del = 0
@@ -79,7 +79,7 @@
             bo.deliverer_tel, bo.create_time, bo.plan_deliver_time, bo.require_over_time, bo.is_urgent, fbsi.suggested_discount,
             fbsi.extra_charge, fbsi.extra_charge_illustration,bo.order_time,bo.customer_address,bo.certification_company,
             bo.certification_company_address,fbsi.sample_warehouse,fbsi.cert_warehouse,fbsi.fee_status,fbsi.received,fbsi.remark,
-            fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,fbsi.received_amount,fbsi.invoice_amount
+            fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,fbsi.received_amount,fbsi.invoice_amount, fbsi.order_type
         FROM finance_business_settlement_info fbsi
         LEFT JOIN business_order bo ON fbsi.order_id = bo.id
         WHERE bo.is_del = 0 AND fbsi.id = #{id}
@@ -89,7 +89,7 @@
         SELECT bo.id AS order_id, fbsi.id, bo.order_code, bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.deliverer_tel,
             bo.is_urgent, bo.create_time, fbsi.suggested_discount, fbsi.extra_charge, fbsi.extra_charge_illustration,fbsi.sample_warehouse,
             fbsi.cert_warehouse,fbsi.fee_status,fbsi.received,fbsi.remark,fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee,
-            fbsi.received_amount,fbsi.invoice_amount
+            fbsi.received_amount,fbsi.invoice_amount, fbsi.order_type
         FROM finance_business_settlement_info fbsi
         LEFT JOIN business_order bo ON fbsi.order_id = bo.id
         WHERE bo.is_del = 0
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
index 66b1438..bd3467b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
@@ -69,7 +69,7 @@
 
     @ApiModelProperty(value = "检定人员名称", dataType = "String")
     @ExcelProperty(value = "检定员", order = 8)
-    private String measurePersonName;
+    private String measurePerson;
 
     @ApiModelProperty(value = "审批状态", dataType = "String")
     @DictCodeField(message = "审批状态不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoDetailResponse.java
index 784b2ed..8816c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoDetailResponse.java
@@ -99,6 +99,9 @@
     @ApiModelProperty(value = "是否加急", dataType = "String")
     private String isUrgent;
 
+    @ApiModelProperty(value = "委托单类型/业务结算类型", dataType = "String")
+    private String orderType;
+
 //    @ApiModelProperty(value = "标价-单位分", dataType = "Integer")
 //    private Integer postedPrice;
 //
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoListResponse.java
index 81bc5c1..ffeda80 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoListResponse.java
@@ -109,6 +109,9 @@
     @ExcelProperty("开票金额（元）")
     private String invoiceAmount;
 
+    @ApiModelProperty(value = "委托单类型/业务结算类型", dataType = "String")
+    private String orderType;
+
     @ApiModelProperty(value = "送样人", dataType = "String")
 //    @ExcelProperty(value = "送样人")
     private String deliverer;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
index 9381bc3..311d80b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
@@ -105,4 +105,8 @@
     @TableField("update_time")
     private String updateTime;
 
+    //转换为待归还的时间，用于列表排序展示
+    @TableField("wait_time")
+    private String waitTime;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
index e1cddfb..877dde8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
@@ -179,4 +179,8 @@
 
     @TableField(exist = false)
     private int seq;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "前端可根据判断是否有交接单", dataType = "Long")
+    private Long interchangeId;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementInfo.java
index e3ed45c..19ea54a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementInfo.java
@@ -94,7 +94,7 @@
     /**
      * 实收合计（元）
      */
-    @ApiModelProperty(value = "实收合计（元）", dataType = "String")
+    @ApiModelProperty(value = "实收合计（元）/报价合计", dataType = "String")
     @TableField("actual_total_fee")
     private String actualTotalFee;
 
@@ -112,6 +112,10 @@
     @TableField("invoice_amount")
     private String invoiceAmount;
 
+    @ApiModelProperty(value = "委托单类型/业务结算类型", dataType = "String")
+    @TableField("order_type")
+    private String orderType;
+
     /**
      * 创建时间
      */
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
index 8a75844..0a07474 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
@@ -417,9 +417,9 @@
         }
         if (ApprovalStatusEnum.PASSED.equals(certificateReport.getApprovalStatus())) {
             try {
-                threadPool.submit(new Runnable() {
-                    @Override
-                    public void run() {
+//                threadPool.submit(new Runnable() {
+//                    @Override
+//                    public void run() {
                         String printFileName = printFileRegister.registerPrintFile(
                                 RegisterCustomParameters.builder()
                                         .customFileName(certificateReport.getCertificateReportName() + certificateReport.getCertificateReportCode())
@@ -434,8 +434,8 @@
                         //生成证书打印信息
                         CertificatePrintBuilder(certificateReport, printFileName);
                         log.debug("----success");
-                    }
-                });
+//                    }
+//                });
             } catch (Exception ex) {
                 log.error("");
             }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
index 50b014b..ba6ab23 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
@@ -103,6 +103,7 @@
                 customerSampleInfo.setSampleStatus(orderSample.getSampleStatus());
                 customerSampleInfo.setIsExistSample("1");
                 customerSampleInfo.setRelationId(orderSample.getId());
+                customerSampleInfo.setInterchangeId(orderSample.getInterchangeId());
                 customerSampleList.add(customerSampleInfo);
             }
         }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
index 5cdc941..4029fab 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
@@ -40,7 +40,6 @@
 import com.casic.missiles.model.workbench.WorkbenchRemindMessage;
 import com.casic.missiles.service.business.IBusinessDispatchService;
 import com.casic.missiles.service.system.IMessagePushService;
-import com.casic.missiles.utils.DictCodeUtils;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -50,8 +49,10 @@
 import org.springframework.util.ObjectUtils;
 
 import javax.servlet.http.HttpServletResponse;
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
 
 /**
  * @author cz
@@ -429,6 +430,10 @@
         if ("1".equals(statusChangeDTO.getStatus())) {
             updateLabExecutiveInfo(statusChangeDTO, MeasureStatusEnum.TERMINATED);
         }
+        if (TO_GIVE_BACK.equals(statusChangeDTO.getStatus())) {
+            //更新转换为待归还的时间
+            businessOrderSampleRelation.setWaitTime(DateUtil.now());
+        }
         return this.orderSampleRelationMapper.update(businessOrderSampleRelation, queryWrapper);
     }
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/finance/FinanceBusinessSettlementInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/finance/FinanceBusinessSettlementInfoServiceImpl.java
index b26c706..640dbb7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/finance/FinanceBusinessSettlementInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/finance/FinanceBusinessSettlementInfoServiceImpl.java
@@ -159,6 +159,8 @@
         if (Objects.isNull(detail) || CollectionUtils.isEmpty(detail.getSampleDetailsList())) {
             return;
         }
+        int sum = detail.getSampleDetailsList().stream().mapToInt(FinanceBusinessSettlementDetails::getSets).sum();
+        detail.setSampleCount(sum);
         Map<String, Object> map = new HashMap<>();
         map.put("settlementType", String.valueOf(settlementType));
         PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/CertificateReportEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/CertificateReportEventPostProcessor.java
index 50795e9..92a0889 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/CertificateReportEventPostProcessor.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/CertificateReportEventPostProcessor.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.dto.flowable.NotifyEventStatusDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.business.MeasureTypeEnum;
@@ -15,6 +16,7 @@
 import com.casic.missiles.mapper.customer.CustomerSampleMapper;
 import com.casic.missiles.model.business.BusinessCertificateReport;
 import com.casic.missiles.model.business.BusinessOrder;
+import com.casic.missiles.model.business.BusinessOrderSampleRelation;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.service.listeners.NotifyEventPostProcessor;
 import com.casic.missiles.utils.SpringContextUtil;
@@ -78,7 +80,13 @@
                     //获取样品已取得的证书不小于应出具的总数时更新样品待归还状态
                     if(certificateReportMapper.selectSampleCertifications(sampleInfo.getId(), businessOrder.getId())>=
                             certificateReportMapper.selectSampleCertificationAlls(sampleInfo.getId(), businessOrder.getId())) {
-                        orderSampleRelationMapper.updateByOrderIdAndSampleId(businessOrder.getId(),sampleInfo.getId(), SampleStatusEnum.TO_GIVE_BACK);
+                        BusinessOrderSampleRelation businessOrderSampleRelation = new BusinessOrderSampleRelation();
+                        businessOrderSampleRelation.setSampleStatus(SampleStatusEnum.TO_GIVE_BACK);
+                        businessOrderSampleRelation.setWaitTime(DateUtil.now());
+                        QueryWrapper<BusinessOrderSampleRelation> wrapper = new QueryWrapper<>();
+                        wrapper.eq("order_id", businessOrder.getId());
+                        wrapper.eq("sample_id", sampleInfo.getId());
+                        orderSampleRelationMapper.update(businessOrderSampleRelation, wrapper);
                     }
                 }
             }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificateReportApprovalData.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificateReportApprovalData.java
index 7133335..c03a93d 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificateReportApprovalData.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificateReportApprovalData.java
@@ -54,7 +54,7 @@
                 .collect(Collectors.toMap(e -> e.get(0).getTaskName(), e -> e));
         //初始化，生成模板文件
         FilePrintRegister filePrintRegister = initialization(templateFileDir, metaData.getId(), metaData.getCertificateReportFile());
-        filePrintRegister.setTemplateWordType("1".equals(metaData.getCertificateReportCategory()) ? true : false);
+        filePrintRegister.setTemplateWordType(false);
         //定制化签名开发预处理，定制化参数
         List<ImageConfig> approvalImageList = customizedSignNamesParamCreator(filePrintRegister.getTemplateWordType());
         filePrintRegister.setCustomFileName(registerParameters.getCustomFileName());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/finance/SettlementPrintFileData.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/finance/SettlementPrintFileData.java
index 960f549..d9946e9 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/finance/SettlementPrintFileData.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/finance/SettlementPrintFileData.java
@@ -62,6 +62,10 @@
         map.put("delivererTel", metaData.getDelivererTel());
         map.put("certificationCompany", metaData.getCertificationCompany());
         map.put("certificationCompanyAddress", metaData.getCertificationCompanyAddress());
+        map.put("sampleCount", metaData.getSampleCount());
+        map.put("shouldTestFee", metaData.getShouldTestFee());
+        map.put("actualTestFee", metaData.getActualTestFee());
+        map.put("actualTotalFee", metaData.getActualTotalFee());
         DateTime dateTime = DateUtil.parseDate(metaData.getCreateTime());
         SimpleDateFormat dateFormat = new SimpleDateFormat( "yyyy-MM-dd");
         map.put("createTime", dateFormat.format(dateTime));