diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/HomepageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/HomepageController.java
index f54eaa7..fcabdca 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/HomepageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/HomepageController.java
@@ -95,6 +95,12 @@
         return ReturnUtil.success(homepageService.sampleOverdue());
     }
 
+    @ApiOperation("样品超期总数")
+    @GetMapping("/sampleOverdueTotal")
+    public ReturnDTO<SampleOverdueTotalResponse> sampleOverdueTotal() {
+        return ReturnUtil.success(homepageService.sampleOverdueTotal());
+    }
+
     @ApiOperation("优质客户")
     @GetMapping("/excellentList")
     public ReturnDTO<CustomerExcellentResponse> customerExcellentList() {

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/HomepageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/HomepageController.java
index f54eaa7..fcabdca 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/HomepageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/HomepageController.java
@@ -95,6 +95,12 @@
         return ReturnUtil.success(homepageService.sampleOverdue());
     }
 
+    @ApiOperation("样品超期总数")
+    @GetMapping("/sampleOverdueTotal")
+    public ReturnDTO<SampleOverdueTotalResponse> sampleOverdueTotal() {
+        return ReturnUtil.success(homepageService.sampleOverdueTotal());
+    }
+
     @ApiOperation("优质客户")
     @GetMapping("/excellentList")
     public ReturnDTO<CustomerExcellentResponse> customerExcellentList() {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java
index 0d6f1e3..4b25bd6 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java
@@ -91,11 +91,11 @@
     }
 
     /**
-     * 本月调度工况，中间的各实验室样品超期数量在部门综合分析中有，建议直接放到工作分析中展示
+     * 本月调度工况，中间的各实验室样品超期数量在部门综合分析中有，放到工作分析中展示
      */
 
     /**
-     * 本月调度工况-合格信息，样品检测合格与否无该信息，待和产品确认
+     * 本月调度工况-合格信息，样品检测合格与否无该信息，不做
      */
 
     /**

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/HomepageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/HomepageController.java
index f54eaa7..fcabdca 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/HomepageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/HomepageController.java
@@ -95,6 +95,12 @@
         return ReturnUtil.success(homepageService.sampleOverdue());
     }
 
+    @ApiOperation("样品超期总数")
+    @GetMapping("/sampleOverdueTotal")
+    public ReturnDTO<SampleOverdueTotalResponse> sampleOverdueTotal() {
+        return ReturnUtil.success(homepageService.sampleOverdueTotal());
+    }
+
     @ApiOperation("优质客户")
     @GetMapping("/excellentList")
     public ReturnDTO<CustomerExcellentResponse> customerExcellentList() {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java
index 0d6f1e3..4b25bd6 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java
@@ -91,11 +91,11 @@
     }
 
     /**
-     * 本月调度工况，中间的各实验室样品超期数量在部门综合分析中有，建议直接放到工作分析中展示
+     * 本月调度工况，中间的各实验室样品超期数量在部门综合分析中有，放到工作分析中展示
      */
 
     /**
-     * 本月调度工况-合格信息，样品检测合格与否无该信息，待和产品确认
+     * 本月调度工况-合格信息，样品检测合格与否无该信息，不做
      */
 
     /**
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessBoardMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessBoardMapper.xml
index 9c4000b..68cbe19 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessBoardMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessBoardMapper.xml
@@ -194,11 +194,23 @@
     </select>
 
     <select id="selectDeptSamples" resultType="com.casic.missiles.dto.business.board.BoardDeptComprehensiveResponse">
-        SELECT <include refid="baseOutputParamThree"/> COUNT(blei.id) AS samples
+        SELECT <include refid="baseOutputParamThree"/> COUNT(bleii.id) AS samples
         FROM meter_organize mo
-        LEFT JOIN business_lab_executive_info blei ON blei.measure_dept_id = mo.dept_id AND blei.measure_status = 4
+        LEFT JOIN
+            (SELECT blei.id, blei.measure_dept_id
+            FROM business_lab_executive_info blei
+            WHERE blei.measure_status = 4
+            <if test="request.startTime != null and request.startTime !=''">
+                AND blei.end_time &gt;= #{request.startTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !=''">
+                AND blei.end_time &lt;= #{request.endTime}
+            </if>
+            ) bleii ON bleii.measure_dept_id = mo.dept_id
         WHERE mo.is_lab = 1 AND mo.is_del = 0
-        <include refid="baseQueryConditionTwo"/>
+        <if test="request.deptId != null and request.deptId !=''">
+            AND mo.dept_id = #{request.deptId}
+        </if>
         GROUP BY mo.id
     </select>
 

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/HomepageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/HomepageController.java
index f54eaa7..fcabdca 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/HomepageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/HomepageController.java
@@ -95,6 +95,12 @@
         return ReturnUtil.success(homepageService.sampleOverdue());
     }
 
+    @ApiOperation("样品超期总数")
+    @GetMapping("/sampleOverdueTotal")
+    public ReturnDTO<SampleOverdueTotalResponse> sampleOverdueTotal() {
+        return ReturnUtil.success(homepageService.sampleOverdueTotal());
+    }
+
     @ApiOperation("优质客户")
     @GetMapping("/excellentList")
     public ReturnDTO<CustomerExcellentResponse> customerExcellentList() {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java
index 0d6f1e3..4b25bd6 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java
@@ -91,11 +91,11 @@
     }
 
     /**
-     * 本月调度工况，中间的各实验室样品超期数量在部门综合分析中有，建议直接放到工作分析中展示
+     * 本月调度工况，中间的各实验室样品超期数量在部门综合分析中有，放到工作分析中展示
      */
 
     /**
-     * 本月调度工况-合格信息，样品检测合格与否无该信息，待和产品确认
+     * 本月调度工况-合格信息，样品检测合格与否无该信息，不做
      */
 
     /**
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessBoardMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessBoardMapper.xml
index 9c4000b..68cbe19 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessBoardMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessBoardMapper.xml
@@ -194,11 +194,23 @@
     </select>
 
     <select id="selectDeptSamples" resultType="com.casic.missiles.dto.business.board.BoardDeptComprehensiveResponse">
-        SELECT <include refid="baseOutputParamThree"/> COUNT(blei.id) AS samples
+        SELECT <include refid="baseOutputParamThree"/> COUNT(bleii.id) AS samples
         FROM meter_organize mo
-        LEFT JOIN business_lab_executive_info blei ON blei.measure_dept_id = mo.dept_id AND blei.measure_status = 4
+        LEFT JOIN
+            (SELECT blei.id, blei.measure_dept_id
+            FROM business_lab_executive_info blei
+            WHERE blei.measure_status = 4
+            <if test="request.startTime != null and request.startTime !=''">
+                AND blei.end_time &gt;= #{request.startTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !=''">
+                AND blei.end_time &lt;= #{request.endTime}
+            </if>
+            ) bleii ON bleii.measure_dept_id = mo.dept_id
         WHERE mo.is_lab = 1 AND mo.is_del = 0
-        <include refid="baseQueryConditionTwo"/>
+        <if test="request.deptId != null and request.deptId !=''">
+            AND mo.dept_id = #{request.deptId}
+        </if>
         GROUP BY mo.id
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
index b5a7712..0ac2a54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
@@ -65,13 +65,13 @@
     </select>
 
     <select id="selectOrderCityRank" resultType="com.casic.missiles.dto.cockpit.CityTopResponse">
-        SELECT ci.address_city_name AS cityName, COUNT(bo.id) AS orderCount
+        SELECT ci.address_city_name AS cityName, COUNT(case when certifications=1 then 1 end) AS orderCount, COUNT(case when certifications=2 then 1 end) AS calibrationOrderCount
         FROM business_order bo
         JOIN customer_info ci ON bo.customer_id = ci.id
         WHERE bo.is_del = 0
         GROUP BY ci.address_city_name
         HAVING ci.address_city_name IS NOT NULL
-        ORDER BY orderCount
+        ORDER BY orderCount + calibrationOrderCount
     </select>
 
     <select id="selectPreMonthCountByYear" resultType="com.casic.missiles.dto.cockpit.BusTrendResponse">

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/HomepageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/HomepageController.java
index f54eaa7..fcabdca 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/HomepageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/HomepageController.java
@@ -95,6 +95,12 @@
         return ReturnUtil.success(homepageService.sampleOverdue());
     }
 
+    @ApiOperation("样品超期总数")
+    @GetMapping("/sampleOverdueTotal")
+    public ReturnDTO<SampleOverdueTotalResponse> sampleOverdueTotal() {
+        return ReturnUtil.success(homepageService.sampleOverdueTotal());
+    }
+
     @ApiOperation("优质客户")
     @GetMapping("/excellentList")
     public ReturnDTO<CustomerExcellentResponse> customerExcellentList() {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java
index 0d6f1e3..4b25bd6 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java
@@ -91,11 +91,11 @@
     }
 
     /**
-     * 本月调度工况，中间的各实验室样品超期数量在部门综合分析中有，建议直接放到工作分析中展示
+     * 本月调度工况，中间的各实验室样品超期数量在部门综合分析中有，放到工作分析中展示
      */
 
     /**
-     * 本月调度工况-合格信息，样品检测合格与否无该信息，待和产品确认
+     * 本月调度工况-合格信息，样品检测合格与否无该信息，不做
      */
 
     /**
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessBoardMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessBoardMapper.xml
index 9c4000b..68cbe19 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessBoardMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessBoardMapper.xml
@@ -194,11 +194,23 @@
     </select>
 
     <select id="selectDeptSamples" resultType="com.casic.missiles.dto.business.board.BoardDeptComprehensiveResponse">
-        SELECT <include refid="baseOutputParamThree"/> COUNT(blei.id) AS samples
+        SELECT <include refid="baseOutputParamThree"/> COUNT(bleii.id) AS samples
         FROM meter_organize mo
-        LEFT JOIN business_lab_executive_info blei ON blei.measure_dept_id = mo.dept_id AND blei.measure_status = 4
+        LEFT JOIN
+            (SELECT blei.id, blei.measure_dept_id
+            FROM business_lab_executive_info blei
+            WHERE blei.measure_status = 4
+            <if test="request.startTime != null and request.startTime !=''">
+                AND blei.end_time &gt;= #{request.startTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !=''">
+                AND blei.end_time &lt;= #{request.endTime}
+            </if>
+            ) bleii ON bleii.measure_dept_id = mo.dept_id
         WHERE mo.is_lab = 1 AND mo.is_del = 0
-        <include refid="baseQueryConditionTwo"/>
+        <if test="request.deptId != null and request.deptId !=''">
+            AND mo.dept_id = #{request.deptId}
+        </if>
         GROUP BY mo.id
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
index b5a7712..0ac2a54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
@@ -65,13 +65,13 @@
     </select>
 
     <select id="selectOrderCityRank" resultType="com.casic.missiles.dto.cockpit.CityTopResponse">
-        SELECT ci.address_city_name AS cityName, COUNT(bo.id) AS orderCount
+        SELECT ci.address_city_name AS cityName, COUNT(case when certifications=1 then 1 end) AS orderCount, COUNT(case when certifications=2 then 1 end) AS calibrationOrderCount
         FROM business_order bo
         JOIN customer_info ci ON bo.customer_id = ci.id
         WHERE bo.is_del = 0
         GROUP BY ci.address_city_name
         HAVING ci.address_city_name IS NOT NULL
-        ORDER BY orderCount
+        ORDER BY orderCount + calibrationOrderCount
     </select>
 
     <select id="selectPreMonthCountByYear" resultType="com.casic.missiles.dto.cockpit.BusTrendResponse">
diff --git a/casic-metering-dao/src/main/resources/mapper/finance/FinanceAgreementInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/finance/FinanceAgreementInfoMapper.xml
index ad529c8..f3b63d2 100644
--- a/casic-metering-dao/src/main/resources/mapper/finance/FinanceAgreementInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/finance/FinanceAgreementInfoMapper.xml
@@ -135,20 +135,23 @@
     </select>
 
     <select id="selectAmountByDept" resultType="com.casic.missiles.dto.business.order.labIncomeResponse">
-        SELECT fai.dept_name AS labName, IFNULL(SUM(fai.agreement_amount),0) AS amount
-        FROM finance_agreement_info fai
-        JOIN meter_organize mo ON (mo.dept_id = fai.dept_id AND mo.is_lab = 1)
-        WHERE fai.is_del = 0 AND fai.dept_name IS NOT NULL
-        <if test="dimension != null and dimension !='' and dimension == 'year'">
-            and YEAR(fai.create_time) = YEAR(CURDATE())
-        </if>
-        <if test="dimension != null and dimension !='' and dimension == 'quarter'">
-            and QUARTER(fai.create_time) = QUARTER(CURDATE()) AND YEAR(fai.create_time) = YEAR(CURDATE())
-        </if>
-        <if test="dimension != null and dimension !='' and dimension == 'month'">
-            and DATE_FORMAT(fai.create_time, '%Y%m') = DATE_FORMAT(CURDATE( ),'%Y%m')
-        </if>
-        GROUP BY fai.dept_name
+        SELECT mo.organize_name AS labName, IFNULL(SUM(faii.amount),0) AS amount
+        FROM meter_organize mo
+        LEFT JOIN
+            (SELECT fai.dept_id AS deptId, IFNULL(fai.agreement_amount,0) AS amount
+            FROM finance_agreement_info fai
+            WHERE fai.is_del = 0 AND fai.dept_name IS NOT NULL
+            <if test="dimension != null and dimension !='' and dimension == 'year'">
+                and YEAR(fai.create_time) = YEAR(CURDATE())
+            </if>
+            <if test="dimension != null and dimension !='' and dimension == 'quarter'">
+                and QUARTER(fai.create_time) = QUARTER(CURDATE()) AND YEAR(fai.create_time) = YEAR(CURDATE())
+            </if>
+            <if test="dimension != null and dimension !='' and dimension == 'month'">
+                and DATE_FORMAT(fai.create_time, '%Y%m') = DATE_FORMAT(CURDATE( ),'%Y%m')
+            </if>
+            ) faii ON (mo.dept_id = faii.deptId AND mo.is_lab = 1)
+        GROUP BY mo.organize_name
     </select>
 
     <select id="selectCustomerExcellentForCockpit" resultType="com.casic.missiles.dto.customer.CustomerExcellentResponse">

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/HomepageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/HomepageController.java
index f54eaa7..fcabdca 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/HomepageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/HomepageController.java
@@ -95,6 +95,12 @@
         return ReturnUtil.success(homepageService.sampleOverdue());
     }
 
+    @ApiOperation("样品超期总数")
+    @GetMapping("/sampleOverdueTotal")
+    public ReturnDTO<SampleOverdueTotalResponse> sampleOverdueTotal() {
+        return ReturnUtil.success(homepageService.sampleOverdueTotal());
+    }
+
     @ApiOperation("优质客户")
     @GetMapping("/excellentList")
     public ReturnDTO<CustomerExcellentResponse> customerExcellentList() {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java
index 0d6f1e3..4b25bd6 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java
@@ -91,11 +91,11 @@
     }
 
     /**
-     * 本月调度工况，中间的各实验室样品超期数量在部门综合分析中有，建议直接放到工作分析中展示
+     * 本月调度工况，中间的各实验室样品超期数量在部门综合分析中有，放到工作分析中展示
      */
 
     /**
-     * 本月调度工况-合格信息，样品检测合格与否无该信息，待和产品确认
+     * 本月调度工况-合格信息，样品检测合格与否无该信息，不做
      */
 
     /**
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessBoardMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessBoardMapper.xml
index 9c4000b..68cbe19 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessBoardMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessBoardMapper.xml
@@ -194,11 +194,23 @@
     </select>
 
     <select id="selectDeptSamples" resultType="com.casic.missiles.dto.business.board.BoardDeptComprehensiveResponse">
-        SELECT <include refid="baseOutputParamThree"/> COUNT(blei.id) AS samples
+        SELECT <include refid="baseOutputParamThree"/> COUNT(bleii.id) AS samples
         FROM meter_organize mo
-        LEFT JOIN business_lab_executive_info blei ON blei.measure_dept_id = mo.dept_id AND blei.measure_status = 4
+        LEFT JOIN
+            (SELECT blei.id, blei.measure_dept_id
+            FROM business_lab_executive_info blei
+            WHERE blei.measure_status = 4
+            <if test="request.startTime != null and request.startTime !=''">
+                AND blei.end_time &gt;= #{request.startTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !=''">
+                AND blei.end_time &lt;= #{request.endTime}
+            </if>
+            ) bleii ON bleii.measure_dept_id = mo.dept_id
         WHERE mo.is_lab = 1 AND mo.is_del = 0
-        <include refid="baseQueryConditionTwo"/>
+        <if test="request.deptId != null and request.deptId !=''">
+            AND mo.dept_id = #{request.deptId}
+        </if>
         GROUP BY mo.id
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
index b5a7712..0ac2a54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
@@ -65,13 +65,13 @@
     </select>
 
     <select id="selectOrderCityRank" resultType="com.casic.missiles.dto.cockpit.CityTopResponse">
-        SELECT ci.address_city_name AS cityName, COUNT(bo.id) AS orderCount
+        SELECT ci.address_city_name AS cityName, COUNT(case when certifications=1 then 1 end) AS orderCount, COUNT(case when certifications=2 then 1 end) AS calibrationOrderCount
         FROM business_order bo
         JOIN customer_info ci ON bo.customer_id = ci.id
         WHERE bo.is_del = 0
         GROUP BY ci.address_city_name
         HAVING ci.address_city_name IS NOT NULL
-        ORDER BY orderCount
+        ORDER BY orderCount + calibrationOrderCount
     </select>
 
     <select id="selectPreMonthCountByYear" resultType="com.casic.missiles.dto.cockpit.BusTrendResponse">
diff --git a/casic-metering-dao/src/main/resources/mapper/finance/FinanceAgreementInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/finance/FinanceAgreementInfoMapper.xml
index ad529c8..f3b63d2 100644
--- a/casic-metering-dao/src/main/resources/mapper/finance/FinanceAgreementInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/finance/FinanceAgreementInfoMapper.xml
@@ -135,20 +135,23 @@
     </select>
 
     <select id="selectAmountByDept" resultType="com.casic.missiles.dto.business.order.labIncomeResponse">
-        SELECT fai.dept_name AS labName, IFNULL(SUM(fai.agreement_amount),0) AS amount
-        FROM finance_agreement_info fai
-        JOIN meter_organize mo ON (mo.dept_id = fai.dept_id AND mo.is_lab = 1)
-        WHERE fai.is_del = 0 AND fai.dept_name IS NOT NULL
-        <if test="dimension != null and dimension !='' and dimension == 'year'">
-            and YEAR(fai.create_time) = YEAR(CURDATE())
-        </if>
-        <if test="dimension != null and dimension !='' and dimension == 'quarter'">
-            and QUARTER(fai.create_time) = QUARTER(CURDATE()) AND YEAR(fai.create_time) = YEAR(CURDATE())
-        </if>
-        <if test="dimension != null and dimension !='' and dimension == 'month'">
-            and DATE_FORMAT(fai.create_time, '%Y%m') = DATE_FORMAT(CURDATE( ),'%Y%m')
-        </if>
-        GROUP BY fai.dept_name
+        SELECT mo.organize_name AS labName, IFNULL(SUM(faii.amount),0) AS amount
+        FROM meter_organize mo
+        LEFT JOIN
+            (SELECT fai.dept_id AS deptId, IFNULL(fai.agreement_amount,0) AS amount
+            FROM finance_agreement_info fai
+            WHERE fai.is_del = 0 AND fai.dept_name IS NOT NULL
+            <if test="dimension != null and dimension !='' and dimension == 'year'">
+                and YEAR(fai.create_time) = YEAR(CURDATE())
+            </if>
+            <if test="dimension != null and dimension !='' and dimension == 'quarter'">
+                and QUARTER(fai.create_time) = QUARTER(CURDATE()) AND YEAR(fai.create_time) = YEAR(CURDATE())
+            </if>
+            <if test="dimension != null and dimension !='' and dimension == 'month'">
+                and DATE_FORMAT(fai.create_time, '%Y%m') = DATE_FORMAT(CURDATE( ),'%Y%m')
+            </if>
+            ) faii ON (mo.dept_id = faii.deptId AND mo.is_lab = 1)
+        GROUP BY mo.organize_name
     </select>
 
     <select id="selectCustomerExcellentForCockpit" resultType="com.casic.missiles.dto.customer.CustomerExcellentResponse">
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/SampleOverdueTotalResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/SampleOverdueTotalResponse.java
new file mode 100644
index 0000000..5451369
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/SampleOverdueTotalResponse.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.dto.business.order;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 样品超期情况总数响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/13 11:44
+ */
+@ApiModel
+@Data
+public class SampleOverdueTotalResponse {
+    @ApiModelProperty(value = "数量", dataType = "Integer")
+    private Integer count = 0;
+}

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/HomepageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/HomepageController.java
index f54eaa7..fcabdca 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/HomepageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/HomepageController.java
@@ -95,6 +95,12 @@
         return ReturnUtil.success(homepageService.sampleOverdue());
     }
 
+    @ApiOperation("样品超期总数")
+    @GetMapping("/sampleOverdueTotal")
+    public ReturnDTO<SampleOverdueTotalResponse> sampleOverdueTotal() {
+        return ReturnUtil.success(homepageService.sampleOverdueTotal());
+    }
+
     @ApiOperation("优质客户")
     @GetMapping("/excellentList")
     public ReturnDTO<CustomerExcellentResponse> customerExcellentList() {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java
index 0d6f1e3..4b25bd6 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java
@@ -91,11 +91,11 @@
     }
 
     /**
-     * 本月调度工况，中间的各实验室样品超期数量在部门综合分析中有，建议直接放到工作分析中展示
+     * 本月调度工况，中间的各实验室样品超期数量在部门综合分析中有，放到工作分析中展示
      */
 
     /**
-     * 本月调度工况-合格信息，样品检测合格与否无该信息，待和产品确认
+     * 本月调度工况-合格信息，样品检测合格与否无该信息，不做
      */
 
     /**
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessBoardMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessBoardMapper.xml
index 9c4000b..68cbe19 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessBoardMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessBoardMapper.xml
@@ -194,11 +194,23 @@
     </select>
 
     <select id="selectDeptSamples" resultType="com.casic.missiles.dto.business.board.BoardDeptComprehensiveResponse">
-        SELECT <include refid="baseOutputParamThree"/> COUNT(blei.id) AS samples
+        SELECT <include refid="baseOutputParamThree"/> COUNT(bleii.id) AS samples
         FROM meter_organize mo
-        LEFT JOIN business_lab_executive_info blei ON blei.measure_dept_id = mo.dept_id AND blei.measure_status = 4
+        LEFT JOIN
+            (SELECT blei.id, blei.measure_dept_id
+            FROM business_lab_executive_info blei
+            WHERE blei.measure_status = 4
+            <if test="request.startTime != null and request.startTime !=''">
+                AND blei.end_time &gt;= #{request.startTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !=''">
+                AND blei.end_time &lt;= #{request.endTime}
+            </if>
+            ) bleii ON bleii.measure_dept_id = mo.dept_id
         WHERE mo.is_lab = 1 AND mo.is_del = 0
-        <include refid="baseQueryConditionTwo"/>
+        <if test="request.deptId != null and request.deptId !=''">
+            AND mo.dept_id = #{request.deptId}
+        </if>
         GROUP BY mo.id
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
index b5a7712..0ac2a54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
@@ -65,13 +65,13 @@
     </select>
 
     <select id="selectOrderCityRank" resultType="com.casic.missiles.dto.cockpit.CityTopResponse">
-        SELECT ci.address_city_name AS cityName, COUNT(bo.id) AS orderCount
+        SELECT ci.address_city_name AS cityName, COUNT(case when certifications=1 then 1 end) AS orderCount, COUNT(case when certifications=2 then 1 end) AS calibrationOrderCount
         FROM business_order bo
         JOIN customer_info ci ON bo.customer_id = ci.id
         WHERE bo.is_del = 0
         GROUP BY ci.address_city_name
         HAVING ci.address_city_name IS NOT NULL
-        ORDER BY orderCount
+        ORDER BY orderCount + calibrationOrderCount
     </select>
 
     <select id="selectPreMonthCountByYear" resultType="com.casic.missiles.dto.cockpit.BusTrendResponse">
diff --git a/casic-metering-dao/src/main/resources/mapper/finance/FinanceAgreementInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/finance/FinanceAgreementInfoMapper.xml
index ad529c8..f3b63d2 100644
--- a/casic-metering-dao/src/main/resources/mapper/finance/FinanceAgreementInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/finance/FinanceAgreementInfoMapper.xml
@@ -135,20 +135,23 @@
     </select>
 
     <select id="selectAmountByDept" resultType="com.casic.missiles.dto.business.order.labIncomeResponse">
-        SELECT fai.dept_name AS labName, IFNULL(SUM(fai.agreement_amount),0) AS amount
-        FROM finance_agreement_info fai
-        JOIN meter_organize mo ON (mo.dept_id = fai.dept_id AND mo.is_lab = 1)
-        WHERE fai.is_del = 0 AND fai.dept_name IS NOT NULL
-        <if test="dimension != null and dimension !='' and dimension == 'year'">
-            and YEAR(fai.create_time) = YEAR(CURDATE())
-        </if>
-        <if test="dimension != null and dimension !='' and dimension == 'quarter'">
-            and QUARTER(fai.create_time) = QUARTER(CURDATE()) AND YEAR(fai.create_time) = YEAR(CURDATE())
-        </if>
-        <if test="dimension != null and dimension !='' and dimension == 'month'">
-            and DATE_FORMAT(fai.create_time, '%Y%m') = DATE_FORMAT(CURDATE( ),'%Y%m')
-        </if>
-        GROUP BY fai.dept_name
+        SELECT mo.organize_name AS labName, IFNULL(SUM(faii.amount),0) AS amount
+        FROM meter_organize mo
+        LEFT JOIN
+            (SELECT fai.dept_id AS deptId, IFNULL(fai.agreement_amount,0) AS amount
+            FROM finance_agreement_info fai
+            WHERE fai.is_del = 0 AND fai.dept_name IS NOT NULL
+            <if test="dimension != null and dimension !='' and dimension == 'year'">
+                and YEAR(fai.create_time) = YEAR(CURDATE())
+            </if>
+            <if test="dimension != null and dimension !='' and dimension == 'quarter'">
+                and QUARTER(fai.create_time) = QUARTER(CURDATE()) AND YEAR(fai.create_time) = YEAR(CURDATE())
+            </if>
+            <if test="dimension != null and dimension !='' and dimension == 'month'">
+                and DATE_FORMAT(fai.create_time, '%Y%m') = DATE_FORMAT(CURDATE( ),'%Y%m')
+            </if>
+            ) faii ON (mo.dept_id = faii.deptId AND mo.is_lab = 1)
+        GROUP BY mo.organize_name
     </select>
 
     <select id="selectCustomerExcellentForCockpit" resultType="com.casic.missiles.dto.customer.CustomerExcellentResponse">
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/SampleOverdueTotalResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/SampleOverdueTotalResponse.java
new file mode 100644
index 0000000..5451369
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/SampleOverdueTotalResponse.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.dto.business.order;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 样品超期情况总数响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/13 11:44
+ */
+@ApiModel
+@Data
+public class SampleOverdueTotalResponse {
+    @ApiModelProperty(value = "数量", dataType = "Integer")
+    private Integer count = 0;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
index d5aa2dd..85de121 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
@@ -14,6 +14,8 @@
 public class CityTopResponse {
     @ApiModelProperty(value = "城市名称", dataType = "String")
     private String cityName;
-    @ApiModelProperty(value = "业务数量", dataType = "Long")
+    @ApiModelProperty(value = "检定业务数量", dataType = "Long")
     private Long orderCount;
+    @ApiModelProperty(value = "校准业务数量", dataType = "Long")
+    private Long calibrationOrderCount;
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/HomepageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/HomepageController.java
index f54eaa7..fcabdca 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/HomepageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/HomepageController.java
@@ -95,6 +95,12 @@
         return ReturnUtil.success(homepageService.sampleOverdue());
     }
 
+    @ApiOperation("样品超期总数")
+    @GetMapping("/sampleOverdueTotal")
+    public ReturnDTO<SampleOverdueTotalResponse> sampleOverdueTotal() {
+        return ReturnUtil.success(homepageService.sampleOverdueTotal());
+    }
+
     @ApiOperation("优质客户")
     @GetMapping("/excellentList")
     public ReturnDTO<CustomerExcellentResponse> customerExcellentList() {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java
index 0d6f1e3..4b25bd6 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java
@@ -91,11 +91,11 @@
     }
 
     /**
-     * 本月调度工况，中间的各实验室样品超期数量在部门综合分析中有，建议直接放到工作分析中展示
+     * 本月调度工况，中间的各实验室样品超期数量在部门综合分析中有，放到工作分析中展示
      */
 
     /**
-     * 本月调度工况-合格信息，样品检测合格与否无该信息，待和产品确认
+     * 本月调度工况-合格信息，样品检测合格与否无该信息，不做
      */
 
     /**
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessBoardMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessBoardMapper.xml
index 9c4000b..68cbe19 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessBoardMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessBoardMapper.xml
@@ -194,11 +194,23 @@
     </select>
 
     <select id="selectDeptSamples" resultType="com.casic.missiles.dto.business.board.BoardDeptComprehensiveResponse">
-        SELECT <include refid="baseOutputParamThree"/> COUNT(blei.id) AS samples
+        SELECT <include refid="baseOutputParamThree"/> COUNT(bleii.id) AS samples
         FROM meter_organize mo
-        LEFT JOIN business_lab_executive_info blei ON blei.measure_dept_id = mo.dept_id AND blei.measure_status = 4
+        LEFT JOIN
+            (SELECT blei.id, blei.measure_dept_id
+            FROM business_lab_executive_info blei
+            WHERE blei.measure_status = 4
+            <if test="request.startTime != null and request.startTime !=''">
+                AND blei.end_time &gt;= #{request.startTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !=''">
+                AND blei.end_time &lt;= #{request.endTime}
+            </if>
+            ) bleii ON bleii.measure_dept_id = mo.dept_id
         WHERE mo.is_lab = 1 AND mo.is_del = 0
-        <include refid="baseQueryConditionTwo"/>
+        <if test="request.deptId != null and request.deptId !=''">
+            AND mo.dept_id = #{request.deptId}
+        </if>
         GROUP BY mo.id
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
index b5a7712..0ac2a54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
@@ -65,13 +65,13 @@
     </select>
 
     <select id="selectOrderCityRank" resultType="com.casic.missiles.dto.cockpit.CityTopResponse">
-        SELECT ci.address_city_name AS cityName, COUNT(bo.id) AS orderCount
+        SELECT ci.address_city_name AS cityName, COUNT(case when certifications=1 then 1 end) AS orderCount, COUNT(case when certifications=2 then 1 end) AS calibrationOrderCount
         FROM business_order bo
         JOIN customer_info ci ON bo.customer_id = ci.id
         WHERE bo.is_del = 0
         GROUP BY ci.address_city_name
         HAVING ci.address_city_name IS NOT NULL
-        ORDER BY orderCount
+        ORDER BY orderCount + calibrationOrderCount
     </select>
 
     <select id="selectPreMonthCountByYear" resultType="com.casic.missiles.dto.cockpit.BusTrendResponse">
diff --git a/casic-metering-dao/src/main/resources/mapper/finance/FinanceAgreementInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/finance/FinanceAgreementInfoMapper.xml
index ad529c8..f3b63d2 100644
--- a/casic-metering-dao/src/main/resources/mapper/finance/FinanceAgreementInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/finance/FinanceAgreementInfoMapper.xml
@@ -135,20 +135,23 @@
     </select>
 
     <select id="selectAmountByDept" resultType="com.casic.missiles.dto.business.order.labIncomeResponse">
-        SELECT fai.dept_name AS labName, IFNULL(SUM(fai.agreement_amount),0) AS amount
-        FROM finance_agreement_info fai
-        JOIN meter_organize mo ON (mo.dept_id = fai.dept_id AND mo.is_lab = 1)
-        WHERE fai.is_del = 0 AND fai.dept_name IS NOT NULL
-        <if test="dimension != null and dimension !='' and dimension == 'year'">
-            and YEAR(fai.create_time) = YEAR(CURDATE())
-        </if>
-        <if test="dimension != null and dimension !='' and dimension == 'quarter'">
-            and QUARTER(fai.create_time) = QUARTER(CURDATE()) AND YEAR(fai.create_time) = YEAR(CURDATE())
-        </if>
-        <if test="dimension != null and dimension !='' and dimension == 'month'">
-            and DATE_FORMAT(fai.create_time, '%Y%m') = DATE_FORMAT(CURDATE( ),'%Y%m')
-        </if>
-        GROUP BY fai.dept_name
+        SELECT mo.organize_name AS labName, IFNULL(SUM(faii.amount),0) AS amount
+        FROM meter_organize mo
+        LEFT JOIN
+            (SELECT fai.dept_id AS deptId, IFNULL(fai.agreement_amount,0) AS amount
+            FROM finance_agreement_info fai
+            WHERE fai.is_del = 0 AND fai.dept_name IS NOT NULL
+            <if test="dimension != null and dimension !='' and dimension == 'year'">
+                and YEAR(fai.create_time) = YEAR(CURDATE())
+            </if>
+            <if test="dimension != null and dimension !='' and dimension == 'quarter'">
+                and QUARTER(fai.create_time) = QUARTER(CURDATE()) AND YEAR(fai.create_time) = YEAR(CURDATE())
+            </if>
+            <if test="dimension != null and dimension !='' and dimension == 'month'">
+                and DATE_FORMAT(fai.create_time, '%Y%m') = DATE_FORMAT(CURDATE( ),'%Y%m')
+            </if>
+            ) faii ON (mo.dept_id = faii.deptId AND mo.is_lab = 1)
+        GROUP BY mo.organize_name
     </select>
 
     <select id="selectCustomerExcellentForCockpit" resultType="com.casic.missiles.dto.customer.CustomerExcellentResponse">
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/SampleOverdueTotalResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/SampleOverdueTotalResponse.java
new file mode 100644
index 0000000..5451369
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/SampleOverdueTotalResponse.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.dto.business.order;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 样品超期情况总数响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/13 11:44
+ */
+@ApiModel
+@Data
+public class SampleOverdueTotalResponse {
+    @ApiModelProperty(value = "数量", dataType = "Integer")
+    private Integer count = 0;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
index d5aa2dd..85de121 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
@@ -14,6 +14,8 @@
 public class CityTopResponse {
     @ApiModelProperty(value = "城市名称", dataType = "String")
     private String cityName;
-    @ApiModelProperty(value = "业务数量", dataType = "Long")
+    @ApiModelProperty(value = "检定业务数量", dataType = "Long")
     private Long orderCount;
+    @ApiModelProperty(value = "校准业务数量", dataType = "Long")
+    private Long calibrationOrderCount;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java
index 9bc6551..92ee332 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java
@@ -24,10 +24,10 @@
     @ApiModelProperty(value = "出具证书数量", dataType = "Integer")
     private Integer certificates = 0;
     @ApiModelProperty(value = "产值总计(分)", dataType = "Integer")
-    private Integer outPut;
+    private Integer outPut = 0;
 
     @ApiModelProperty(value = "产值总计(元)", dataType = "String")
-    private String outPutYuan;
+    private String outPutYuan = "0.00";
 
     public String getOutPutYuan() {
         if(Objects.nonNull(outPut)) {

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/HomepageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/HomepageController.java
index f54eaa7..fcabdca 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/HomepageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/HomepageController.java
@@ -95,6 +95,12 @@
         return ReturnUtil.success(homepageService.sampleOverdue());
     }
 
+    @ApiOperation("样品超期总数")
+    @GetMapping("/sampleOverdueTotal")
+    public ReturnDTO<SampleOverdueTotalResponse> sampleOverdueTotal() {
+        return ReturnUtil.success(homepageService.sampleOverdueTotal());
+    }
+
     @ApiOperation("优质客户")
     @GetMapping("/excellentList")
     public ReturnDTO<CustomerExcellentResponse> customerExcellentList() {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java
index 0d6f1e3..4b25bd6 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java
@@ -91,11 +91,11 @@
     }
 
     /**
-     * 本月调度工况，中间的各实验室样品超期数量在部门综合分析中有，建议直接放到工作分析中展示
+     * 本月调度工况，中间的各实验室样品超期数量在部门综合分析中有，放到工作分析中展示
      */
 
     /**
-     * 本月调度工况-合格信息，样品检测合格与否无该信息，待和产品确认
+     * 本月调度工况-合格信息，样品检测合格与否无该信息，不做
      */
 
     /**
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessBoardMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessBoardMapper.xml
index 9c4000b..68cbe19 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessBoardMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessBoardMapper.xml
@@ -194,11 +194,23 @@
     </select>
 
     <select id="selectDeptSamples" resultType="com.casic.missiles.dto.business.board.BoardDeptComprehensiveResponse">
-        SELECT <include refid="baseOutputParamThree"/> COUNT(blei.id) AS samples
+        SELECT <include refid="baseOutputParamThree"/> COUNT(bleii.id) AS samples
         FROM meter_organize mo
-        LEFT JOIN business_lab_executive_info blei ON blei.measure_dept_id = mo.dept_id AND blei.measure_status = 4
+        LEFT JOIN
+            (SELECT blei.id, blei.measure_dept_id
+            FROM business_lab_executive_info blei
+            WHERE blei.measure_status = 4
+            <if test="request.startTime != null and request.startTime !=''">
+                AND blei.end_time &gt;= #{request.startTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !=''">
+                AND blei.end_time &lt;= #{request.endTime}
+            </if>
+            ) bleii ON bleii.measure_dept_id = mo.dept_id
         WHERE mo.is_lab = 1 AND mo.is_del = 0
-        <include refid="baseQueryConditionTwo"/>
+        <if test="request.deptId != null and request.deptId !=''">
+            AND mo.dept_id = #{request.deptId}
+        </if>
         GROUP BY mo.id
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
index b5a7712..0ac2a54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
@@ -65,13 +65,13 @@
     </select>
 
     <select id="selectOrderCityRank" resultType="com.casic.missiles.dto.cockpit.CityTopResponse">
-        SELECT ci.address_city_name AS cityName, COUNT(bo.id) AS orderCount
+        SELECT ci.address_city_name AS cityName, COUNT(case when certifications=1 then 1 end) AS orderCount, COUNT(case when certifications=2 then 1 end) AS calibrationOrderCount
         FROM business_order bo
         JOIN customer_info ci ON bo.customer_id = ci.id
         WHERE bo.is_del = 0
         GROUP BY ci.address_city_name
         HAVING ci.address_city_name IS NOT NULL
-        ORDER BY orderCount
+        ORDER BY orderCount + calibrationOrderCount
     </select>
 
     <select id="selectPreMonthCountByYear" resultType="com.casic.missiles.dto.cockpit.BusTrendResponse">
diff --git a/casic-metering-dao/src/main/resources/mapper/finance/FinanceAgreementInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/finance/FinanceAgreementInfoMapper.xml
index ad529c8..f3b63d2 100644
--- a/casic-metering-dao/src/main/resources/mapper/finance/FinanceAgreementInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/finance/FinanceAgreementInfoMapper.xml
@@ -135,20 +135,23 @@
     </select>
 
     <select id="selectAmountByDept" resultType="com.casic.missiles.dto.business.order.labIncomeResponse">
-        SELECT fai.dept_name AS labName, IFNULL(SUM(fai.agreement_amount),0) AS amount
-        FROM finance_agreement_info fai
-        JOIN meter_organize mo ON (mo.dept_id = fai.dept_id AND mo.is_lab = 1)
-        WHERE fai.is_del = 0 AND fai.dept_name IS NOT NULL
-        <if test="dimension != null and dimension !='' and dimension == 'year'">
-            and YEAR(fai.create_time) = YEAR(CURDATE())
-        </if>
-        <if test="dimension != null and dimension !='' and dimension == 'quarter'">
-            and QUARTER(fai.create_time) = QUARTER(CURDATE()) AND YEAR(fai.create_time) = YEAR(CURDATE())
-        </if>
-        <if test="dimension != null and dimension !='' and dimension == 'month'">
-            and DATE_FORMAT(fai.create_time, '%Y%m') = DATE_FORMAT(CURDATE( ),'%Y%m')
-        </if>
-        GROUP BY fai.dept_name
+        SELECT mo.organize_name AS labName, IFNULL(SUM(faii.amount),0) AS amount
+        FROM meter_organize mo
+        LEFT JOIN
+            (SELECT fai.dept_id AS deptId, IFNULL(fai.agreement_amount,0) AS amount
+            FROM finance_agreement_info fai
+            WHERE fai.is_del = 0 AND fai.dept_name IS NOT NULL
+            <if test="dimension != null and dimension !='' and dimension == 'year'">
+                and YEAR(fai.create_time) = YEAR(CURDATE())
+            </if>
+            <if test="dimension != null and dimension !='' and dimension == 'quarter'">
+                and QUARTER(fai.create_time) = QUARTER(CURDATE()) AND YEAR(fai.create_time) = YEAR(CURDATE())
+            </if>
+            <if test="dimension != null and dimension !='' and dimension == 'month'">
+                and DATE_FORMAT(fai.create_time, '%Y%m') = DATE_FORMAT(CURDATE( ),'%Y%m')
+            </if>
+            ) faii ON (mo.dept_id = faii.deptId AND mo.is_lab = 1)
+        GROUP BY mo.organize_name
     </select>
 
     <select id="selectCustomerExcellentForCockpit" resultType="com.casic.missiles.dto.customer.CustomerExcellentResponse">
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/SampleOverdueTotalResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/SampleOverdueTotalResponse.java
new file mode 100644
index 0000000..5451369
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/SampleOverdueTotalResponse.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.dto.business.order;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 样品超期情况总数响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/13 11:44
+ */
+@ApiModel
+@Data
+public class SampleOverdueTotalResponse {
+    @ApiModelProperty(value = "数量", dataType = "Integer")
+    private Integer count = 0;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
index d5aa2dd..85de121 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
@@ -14,6 +14,8 @@
 public class CityTopResponse {
     @ApiModelProperty(value = "城市名称", dataType = "String")
     private String cityName;
-    @ApiModelProperty(value = "业务数量", dataType = "Long")
+    @ApiModelProperty(value = "检定业务数量", dataType = "Long")
     private Long orderCount;
+    @ApiModelProperty(value = "校准业务数量", dataType = "Long")
+    private Long calibrationOrderCount;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java
index 9bc6551..92ee332 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java
@@ -24,10 +24,10 @@
     @ApiModelProperty(value = "出具证书数量", dataType = "Integer")
     private Integer certificates = 0;
     @ApiModelProperty(value = "产值总计(分)", dataType = "Integer")
-    private Integer outPut;
+    private Integer outPut = 0;
 
     @ApiModelProperty(value = "产值总计(元)", dataType = "String")
-    private String outPutYuan;
+    private String outPutYuan = "0.00";
 
     public String getOutPutYuan() {
         if(Objects.nonNull(outPut)) {
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/StaffAnalyseListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/StaffAnalyseListResponse.java
index 77fa9b8..643b1fc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/StaffAnalyseListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/StaffAnalyseListResponse.java
@@ -25,10 +25,10 @@
     @ApiModelProperty(value = "出具证书数量", dataType = "Integer")
     private Integer certificates = 0;
     @ApiModelProperty(value = "产值总计(单位分)", dataType = "Integer")
-    private Integer outPut;
+    private Integer outPut = 0;
 
     @ExcelProperty(value = "产值总计(元)", order = 10)
-    private String outPutYuan;
+    private String outPutYuan = "0.00";
 
     public String getOutPutYuan() {
         if(Objects.nonNull(outPut)) {

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/HomepageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/HomepageController.java
index f54eaa7..fcabdca 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/HomepageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/HomepageController.java
@@ -95,6 +95,12 @@
         return ReturnUtil.success(homepageService.sampleOverdue());
     }
 
+    @ApiOperation("样品超期总数")
+    @GetMapping("/sampleOverdueTotal")
+    public ReturnDTO<SampleOverdueTotalResponse> sampleOverdueTotal() {
+        return ReturnUtil.success(homepageService.sampleOverdueTotal());
+    }
+
     @ApiOperation("优质客户")
     @GetMapping("/excellentList")
     public ReturnDTO<CustomerExcellentResponse> customerExcellentList() {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java
index 0d6f1e3..4b25bd6 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java
@@ -91,11 +91,11 @@
     }
 
     /**
-     * 本月调度工况，中间的各实验室样品超期数量在部门综合分析中有，建议直接放到工作分析中展示
+     * 本月调度工况，中间的各实验室样品超期数量在部门综合分析中有，放到工作分析中展示
      */
 
     /**
-     * 本月调度工况-合格信息，样品检测合格与否无该信息，待和产品确认
+     * 本月调度工况-合格信息，样品检测合格与否无该信息，不做
      */
 
     /**
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessBoardMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessBoardMapper.xml
index 9c4000b..68cbe19 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessBoardMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessBoardMapper.xml
@@ -194,11 +194,23 @@
     </select>
 
     <select id="selectDeptSamples" resultType="com.casic.missiles.dto.business.board.BoardDeptComprehensiveResponse">
-        SELECT <include refid="baseOutputParamThree"/> COUNT(blei.id) AS samples
+        SELECT <include refid="baseOutputParamThree"/> COUNT(bleii.id) AS samples
         FROM meter_organize mo
-        LEFT JOIN business_lab_executive_info blei ON blei.measure_dept_id = mo.dept_id AND blei.measure_status = 4
+        LEFT JOIN
+            (SELECT blei.id, blei.measure_dept_id
+            FROM business_lab_executive_info blei
+            WHERE blei.measure_status = 4
+            <if test="request.startTime != null and request.startTime !=''">
+                AND blei.end_time &gt;= #{request.startTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !=''">
+                AND blei.end_time &lt;= #{request.endTime}
+            </if>
+            ) bleii ON bleii.measure_dept_id = mo.dept_id
         WHERE mo.is_lab = 1 AND mo.is_del = 0
-        <include refid="baseQueryConditionTwo"/>
+        <if test="request.deptId != null and request.deptId !=''">
+            AND mo.dept_id = #{request.deptId}
+        </if>
         GROUP BY mo.id
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
index b5a7712..0ac2a54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
@@ -65,13 +65,13 @@
     </select>
 
     <select id="selectOrderCityRank" resultType="com.casic.missiles.dto.cockpit.CityTopResponse">
-        SELECT ci.address_city_name AS cityName, COUNT(bo.id) AS orderCount
+        SELECT ci.address_city_name AS cityName, COUNT(case when certifications=1 then 1 end) AS orderCount, COUNT(case when certifications=2 then 1 end) AS calibrationOrderCount
         FROM business_order bo
         JOIN customer_info ci ON bo.customer_id = ci.id
         WHERE bo.is_del = 0
         GROUP BY ci.address_city_name
         HAVING ci.address_city_name IS NOT NULL
-        ORDER BY orderCount
+        ORDER BY orderCount + calibrationOrderCount
     </select>
 
     <select id="selectPreMonthCountByYear" resultType="com.casic.missiles.dto.cockpit.BusTrendResponse">
diff --git a/casic-metering-dao/src/main/resources/mapper/finance/FinanceAgreementInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/finance/FinanceAgreementInfoMapper.xml
index ad529c8..f3b63d2 100644
--- a/casic-metering-dao/src/main/resources/mapper/finance/FinanceAgreementInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/finance/FinanceAgreementInfoMapper.xml
@@ -135,20 +135,23 @@
     </select>
 
     <select id="selectAmountByDept" resultType="com.casic.missiles.dto.business.order.labIncomeResponse">
-        SELECT fai.dept_name AS labName, IFNULL(SUM(fai.agreement_amount),0) AS amount
-        FROM finance_agreement_info fai
-        JOIN meter_organize mo ON (mo.dept_id = fai.dept_id AND mo.is_lab = 1)
-        WHERE fai.is_del = 0 AND fai.dept_name IS NOT NULL
-        <if test="dimension != null and dimension !='' and dimension == 'year'">
-            and YEAR(fai.create_time) = YEAR(CURDATE())
-        </if>
-        <if test="dimension != null and dimension !='' and dimension == 'quarter'">
-            and QUARTER(fai.create_time) = QUARTER(CURDATE()) AND YEAR(fai.create_time) = YEAR(CURDATE())
-        </if>
-        <if test="dimension != null and dimension !='' and dimension == 'month'">
-            and DATE_FORMAT(fai.create_time, '%Y%m') = DATE_FORMAT(CURDATE( ),'%Y%m')
-        </if>
-        GROUP BY fai.dept_name
+        SELECT mo.organize_name AS labName, IFNULL(SUM(faii.amount),0) AS amount
+        FROM meter_organize mo
+        LEFT JOIN
+            (SELECT fai.dept_id AS deptId, IFNULL(fai.agreement_amount,0) AS amount
+            FROM finance_agreement_info fai
+            WHERE fai.is_del = 0 AND fai.dept_name IS NOT NULL
+            <if test="dimension != null and dimension !='' and dimension == 'year'">
+                and YEAR(fai.create_time) = YEAR(CURDATE())
+            </if>
+            <if test="dimension != null and dimension !='' and dimension == 'quarter'">
+                and QUARTER(fai.create_time) = QUARTER(CURDATE()) AND YEAR(fai.create_time) = YEAR(CURDATE())
+            </if>
+            <if test="dimension != null and dimension !='' and dimension == 'month'">
+                and DATE_FORMAT(fai.create_time, '%Y%m') = DATE_FORMAT(CURDATE( ),'%Y%m')
+            </if>
+            ) faii ON (mo.dept_id = faii.deptId AND mo.is_lab = 1)
+        GROUP BY mo.organize_name
     </select>
 
     <select id="selectCustomerExcellentForCockpit" resultType="com.casic.missiles.dto.customer.CustomerExcellentResponse">
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/SampleOverdueTotalResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/SampleOverdueTotalResponse.java
new file mode 100644
index 0000000..5451369
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/SampleOverdueTotalResponse.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.dto.business.order;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 样品超期情况总数响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/13 11:44
+ */
+@ApiModel
+@Data
+public class SampleOverdueTotalResponse {
+    @ApiModelProperty(value = "数量", dataType = "Integer")
+    private Integer count = 0;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
index d5aa2dd..85de121 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
@@ -14,6 +14,8 @@
 public class CityTopResponse {
     @ApiModelProperty(value = "城市名称", dataType = "String")
     private String cityName;
-    @ApiModelProperty(value = "业务数量", dataType = "Long")
+    @ApiModelProperty(value = "检定业务数量", dataType = "Long")
     private Long orderCount;
+    @ApiModelProperty(value = "校准业务数量", dataType = "Long")
+    private Long calibrationOrderCount;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java
index 9bc6551..92ee332 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java
@@ -24,10 +24,10 @@
     @ApiModelProperty(value = "出具证书数量", dataType = "Integer")
     private Integer certificates = 0;
     @ApiModelProperty(value = "产值总计(分)", dataType = "Integer")
-    private Integer outPut;
+    private Integer outPut = 0;
 
     @ApiModelProperty(value = "产值总计(元)", dataType = "String")
-    private String outPutYuan;
+    private String outPutYuan = "0.00";
 
     public String getOutPutYuan() {
         if(Objects.nonNull(outPut)) {
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/StaffAnalyseListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/StaffAnalyseListResponse.java
index 77fa9b8..643b1fc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/StaffAnalyseListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/StaffAnalyseListResponse.java
@@ -25,10 +25,10 @@
     @ApiModelProperty(value = "出具证书数量", dataType = "Integer")
     private Integer certificates = 0;
     @ApiModelProperty(value = "产值总计(单位分)", dataType = "Integer")
-    private Integer outPut;
+    private Integer outPut = 0;
 
     @ExcelProperty(value = "产值总计(元)", order = 10)
-    private String outPutYuan;
+    private String outPutYuan = "0.00";
 
     public String getOutPutYuan() {
         if(Objects.nonNull(outPut)) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/CustomerBusinessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/CustomerBusinessServiceImpl.java
index 5b345a2..f8cfcdf 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/CustomerBusinessServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/CustomerBusinessServiceImpl.java
@@ -195,7 +195,7 @@
 
     @Override
     public List<CityTopResponse> cityTop() {
-        //各城市订单数top10
+        //各城市订单数top10，分为检定和校准
         List<CityTopResponse> list = orderMapper.selectOrderCityRank();
         return list;
     }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/HomepageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/HomepageController.java
index f54eaa7..fcabdca 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/HomepageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/HomepageController.java
@@ -95,6 +95,12 @@
         return ReturnUtil.success(homepageService.sampleOverdue());
     }
 
+    @ApiOperation("样品超期总数")
+    @GetMapping("/sampleOverdueTotal")
+    public ReturnDTO<SampleOverdueTotalResponse> sampleOverdueTotal() {
+        return ReturnUtil.success(homepageService.sampleOverdueTotal());
+    }
+
     @ApiOperation("优质客户")
     @GetMapping("/excellentList")
     public ReturnDTO<CustomerExcellentResponse> customerExcellentList() {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java
index 0d6f1e3..4b25bd6 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java
@@ -91,11 +91,11 @@
     }
 
     /**
-     * 本月调度工况，中间的各实验室样品超期数量在部门综合分析中有，建议直接放到工作分析中展示
+     * 本月调度工况，中间的各实验室样品超期数量在部门综合分析中有，放到工作分析中展示
      */
 
     /**
-     * 本月调度工况-合格信息，样品检测合格与否无该信息，待和产品确认
+     * 本月调度工况-合格信息，样品检测合格与否无该信息，不做
      */
 
     /**
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessBoardMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessBoardMapper.xml
index 9c4000b..68cbe19 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessBoardMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessBoardMapper.xml
@@ -194,11 +194,23 @@
     </select>
 
     <select id="selectDeptSamples" resultType="com.casic.missiles.dto.business.board.BoardDeptComprehensiveResponse">
-        SELECT <include refid="baseOutputParamThree"/> COUNT(blei.id) AS samples
+        SELECT <include refid="baseOutputParamThree"/> COUNT(bleii.id) AS samples
         FROM meter_organize mo
-        LEFT JOIN business_lab_executive_info blei ON blei.measure_dept_id = mo.dept_id AND blei.measure_status = 4
+        LEFT JOIN
+            (SELECT blei.id, blei.measure_dept_id
+            FROM business_lab_executive_info blei
+            WHERE blei.measure_status = 4
+            <if test="request.startTime != null and request.startTime !=''">
+                AND blei.end_time &gt;= #{request.startTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !=''">
+                AND blei.end_time &lt;= #{request.endTime}
+            </if>
+            ) bleii ON bleii.measure_dept_id = mo.dept_id
         WHERE mo.is_lab = 1 AND mo.is_del = 0
-        <include refid="baseQueryConditionTwo"/>
+        <if test="request.deptId != null and request.deptId !=''">
+            AND mo.dept_id = #{request.deptId}
+        </if>
         GROUP BY mo.id
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
index b5a7712..0ac2a54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
@@ -65,13 +65,13 @@
     </select>
 
     <select id="selectOrderCityRank" resultType="com.casic.missiles.dto.cockpit.CityTopResponse">
-        SELECT ci.address_city_name AS cityName, COUNT(bo.id) AS orderCount
+        SELECT ci.address_city_name AS cityName, COUNT(case when certifications=1 then 1 end) AS orderCount, COUNT(case when certifications=2 then 1 end) AS calibrationOrderCount
         FROM business_order bo
         JOIN customer_info ci ON bo.customer_id = ci.id
         WHERE bo.is_del = 0
         GROUP BY ci.address_city_name
         HAVING ci.address_city_name IS NOT NULL
-        ORDER BY orderCount
+        ORDER BY orderCount + calibrationOrderCount
     </select>
 
     <select id="selectPreMonthCountByYear" resultType="com.casic.missiles.dto.cockpit.BusTrendResponse">
diff --git a/casic-metering-dao/src/main/resources/mapper/finance/FinanceAgreementInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/finance/FinanceAgreementInfoMapper.xml
index ad529c8..f3b63d2 100644
--- a/casic-metering-dao/src/main/resources/mapper/finance/FinanceAgreementInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/finance/FinanceAgreementInfoMapper.xml
@@ -135,20 +135,23 @@
     </select>
 
     <select id="selectAmountByDept" resultType="com.casic.missiles.dto.business.order.labIncomeResponse">
-        SELECT fai.dept_name AS labName, IFNULL(SUM(fai.agreement_amount),0) AS amount
-        FROM finance_agreement_info fai
-        JOIN meter_organize mo ON (mo.dept_id = fai.dept_id AND mo.is_lab = 1)
-        WHERE fai.is_del = 0 AND fai.dept_name IS NOT NULL
-        <if test="dimension != null and dimension !='' and dimension == 'year'">
-            and YEAR(fai.create_time) = YEAR(CURDATE())
-        </if>
-        <if test="dimension != null and dimension !='' and dimension == 'quarter'">
-            and QUARTER(fai.create_time) = QUARTER(CURDATE()) AND YEAR(fai.create_time) = YEAR(CURDATE())
-        </if>
-        <if test="dimension != null and dimension !='' and dimension == 'month'">
-            and DATE_FORMAT(fai.create_time, '%Y%m') = DATE_FORMAT(CURDATE( ),'%Y%m')
-        </if>
-        GROUP BY fai.dept_name
+        SELECT mo.organize_name AS labName, IFNULL(SUM(faii.amount),0) AS amount
+        FROM meter_organize mo
+        LEFT JOIN
+            (SELECT fai.dept_id AS deptId, IFNULL(fai.agreement_amount,0) AS amount
+            FROM finance_agreement_info fai
+            WHERE fai.is_del = 0 AND fai.dept_name IS NOT NULL
+            <if test="dimension != null and dimension !='' and dimension == 'year'">
+                and YEAR(fai.create_time) = YEAR(CURDATE())
+            </if>
+            <if test="dimension != null and dimension !='' and dimension == 'quarter'">
+                and QUARTER(fai.create_time) = QUARTER(CURDATE()) AND YEAR(fai.create_time) = YEAR(CURDATE())
+            </if>
+            <if test="dimension != null and dimension !='' and dimension == 'month'">
+                and DATE_FORMAT(fai.create_time, '%Y%m') = DATE_FORMAT(CURDATE( ),'%Y%m')
+            </if>
+            ) faii ON (mo.dept_id = faii.deptId AND mo.is_lab = 1)
+        GROUP BY mo.organize_name
     </select>
 
     <select id="selectCustomerExcellentForCockpit" resultType="com.casic.missiles.dto.customer.CustomerExcellentResponse">
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/SampleOverdueTotalResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/SampleOverdueTotalResponse.java
new file mode 100644
index 0000000..5451369
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/SampleOverdueTotalResponse.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.dto.business.order;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 样品超期情况总数响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/13 11:44
+ */
+@ApiModel
+@Data
+public class SampleOverdueTotalResponse {
+    @ApiModelProperty(value = "数量", dataType = "Integer")
+    private Integer count = 0;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
index d5aa2dd..85de121 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
@@ -14,6 +14,8 @@
 public class CityTopResponse {
     @ApiModelProperty(value = "城市名称", dataType = "String")
     private String cityName;
-    @ApiModelProperty(value = "业务数量", dataType = "Long")
+    @ApiModelProperty(value = "检定业务数量", dataType = "Long")
     private Long orderCount;
+    @ApiModelProperty(value = "校准业务数量", dataType = "Long")
+    private Long calibrationOrderCount;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java
index 9bc6551..92ee332 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java
@@ -24,10 +24,10 @@
     @ApiModelProperty(value = "出具证书数量", dataType = "Integer")
     private Integer certificates = 0;
     @ApiModelProperty(value = "产值总计(分)", dataType = "Integer")
-    private Integer outPut;
+    private Integer outPut = 0;
 
     @ApiModelProperty(value = "产值总计(元)", dataType = "String")
-    private String outPutYuan;
+    private String outPutYuan = "0.00";
 
     public String getOutPutYuan() {
         if(Objects.nonNull(outPut)) {
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/StaffAnalyseListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/StaffAnalyseListResponse.java
index 77fa9b8..643b1fc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/StaffAnalyseListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/StaffAnalyseListResponse.java
@@ -25,10 +25,10 @@
     @ApiModelProperty(value = "出具证书数量", dataType = "Integer")
     private Integer certificates = 0;
     @ApiModelProperty(value = "产值总计(单位分)", dataType = "Integer")
-    private Integer outPut;
+    private Integer outPut = 0;
 
     @ExcelProperty(value = "产值总计(元)", order = 10)
-    private String outPutYuan;
+    private String outPutYuan = "0.00";
 
     public String getOutPutYuan() {
         if(Objects.nonNull(outPut)) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/CustomerBusinessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/CustomerBusinessServiceImpl.java
index 5b345a2..f8cfcdf 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/CustomerBusinessServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/CustomerBusinessServiceImpl.java
@@ -195,7 +195,7 @@
 
     @Override
     public List<CityTopResponse> cityTop() {
-        //各城市订单数top10
+        //各城市订单数top10，分为检定和校准
         List<CityTopResponse> list = orderMapper.selectOrderCityRank();
         return list;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/HomepageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/HomepageServiceImpl.java
index 0f21eef..f2f7e5a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/HomepageServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/HomepageServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.service.Impl.cockpit;
 
 import com.casic.missiles.dto.business.order.SampleOverdueResponse;
+import com.casic.missiles.dto.business.order.SampleOverdueTotalResponse;
 import com.casic.missiles.dto.business.order.labIncomeResponse;
 import com.casic.missiles.dto.business.order.labIncomeTotalResponse;
 import com.casic.missiles.dto.cockpit.AnnualDataResponse;
@@ -143,6 +144,15 @@
     }
 
     @Override
+    public SampleOverdueTotalResponse sampleOverdueTotal() {
+        List<SampleOverdueResponse> list = this.sampleOverdue();
+        int sum = list.stream().mapToInt(SampleOverdueResponse::getCount).sum();
+        SampleOverdueTotalResponse response = new SampleOverdueTotalResponse();
+        response.setCount(sum);
+        return response;
+    }
+
+    @Override
     public List<CustomerExcellentResponse> customerExcellentList() {
         List<CustomerExcellentResponse> list = agreementInfoMapper.selectCustomerExcellentForCockpit();
         if(CollectionUtils.isEmpty(list)) {

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/HomepageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/HomepageController.java
index f54eaa7..fcabdca 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/HomepageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/HomepageController.java
@@ -95,6 +95,12 @@
         return ReturnUtil.success(homepageService.sampleOverdue());
     }
 
+    @ApiOperation("样品超期总数")
+    @GetMapping("/sampleOverdueTotal")
+    public ReturnDTO<SampleOverdueTotalResponse> sampleOverdueTotal() {
+        return ReturnUtil.success(homepageService.sampleOverdueTotal());
+    }
+
     @ApiOperation("优质客户")
     @GetMapping("/excellentList")
     public ReturnDTO<CustomerExcellentResponse> customerExcellentList() {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java
index 0d6f1e3..4b25bd6 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java
@@ -91,11 +91,11 @@
     }
 
     /**
-     * 本月调度工况，中间的各实验室样品超期数量在部门综合分析中有，建议直接放到工作分析中展示
+     * 本月调度工况，中间的各实验室样品超期数量在部门综合分析中有，放到工作分析中展示
      */
 
     /**
-     * 本月调度工况-合格信息，样品检测合格与否无该信息，待和产品确认
+     * 本月调度工况-合格信息，样品检测合格与否无该信息，不做
      */
 
     /**
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessBoardMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessBoardMapper.xml
index 9c4000b..68cbe19 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessBoardMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessBoardMapper.xml
@@ -194,11 +194,23 @@
     </select>
 
     <select id="selectDeptSamples" resultType="com.casic.missiles.dto.business.board.BoardDeptComprehensiveResponse">
-        SELECT <include refid="baseOutputParamThree"/> COUNT(blei.id) AS samples
+        SELECT <include refid="baseOutputParamThree"/> COUNT(bleii.id) AS samples
         FROM meter_organize mo
-        LEFT JOIN business_lab_executive_info blei ON blei.measure_dept_id = mo.dept_id AND blei.measure_status = 4
+        LEFT JOIN
+            (SELECT blei.id, blei.measure_dept_id
+            FROM business_lab_executive_info blei
+            WHERE blei.measure_status = 4
+            <if test="request.startTime != null and request.startTime !=''">
+                AND blei.end_time &gt;= #{request.startTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !=''">
+                AND blei.end_time &lt;= #{request.endTime}
+            </if>
+            ) bleii ON bleii.measure_dept_id = mo.dept_id
         WHERE mo.is_lab = 1 AND mo.is_del = 0
-        <include refid="baseQueryConditionTwo"/>
+        <if test="request.deptId != null and request.deptId !=''">
+            AND mo.dept_id = #{request.deptId}
+        </if>
         GROUP BY mo.id
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
index b5a7712..0ac2a54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
@@ -65,13 +65,13 @@
     </select>
 
     <select id="selectOrderCityRank" resultType="com.casic.missiles.dto.cockpit.CityTopResponse">
-        SELECT ci.address_city_name AS cityName, COUNT(bo.id) AS orderCount
+        SELECT ci.address_city_name AS cityName, COUNT(case when certifications=1 then 1 end) AS orderCount, COUNT(case when certifications=2 then 1 end) AS calibrationOrderCount
         FROM business_order bo
         JOIN customer_info ci ON bo.customer_id = ci.id
         WHERE bo.is_del = 0
         GROUP BY ci.address_city_name
         HAVING ci.address_city_name IS NOT NULL
-        ORDER BY orderCount
+        ORDER BY orderCount + calibrationOrderCount
     </select>
 
     <select id="selectPreMonthCountByYear" resultType="com.casic.missiles.dto.cockpit.BusTrendResponse">
diff --git a/casic-metering-dao/src/main/resources/mapper/finance/FinanceAgreementInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/finance/FinanceAgreementInfoMapper.xml
index ad529c8..f3b63d2 100644
--- a/casic-metering-dao/src/main/resources/mapper/finance/FinanceAgreementInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/finance/FinanceAgreementInfoMapper.xml
@@ -135,20 +135,23 @@
     </select>
 
     <select id="selectAmountByDept" resultType="com.casic.missiles.dto.business.order.labIncomeResponse">
-        SELECT fai.dept_name AS labName, IFNULL(SUM(fai.agreement_amount),0) AS amount
-        FROM finance_agreement_info fai
-        JOIN meter_organize mo ON (mo.dept_id = fai.dept_id AND mo.is_lab = 1)
-        WHERE fai.is_del = 0 AND fai.dept_name IS NOT NULL
-        <if test="dimension != null and dimension !='' and dimension == 'year'">
-            and YEAR(fai.create_time) = YEAR(CURDATE())
-        </if>
-        <if test="dimension != null and dimension !='' and dimension == 'quarter'">
-            and QUARTER(fai.create_time) = QUARTER(CURDATE()) AND YEAR(fai.create_time) = YEAR(CURDATE())
-        </if>
-        <if test="dimension != null and dimension !='' and dimension == 'month'">
-            and DATE_FORMAT(fai.create_time, '%Y%m') = DATE_FORMAT(CURDATE( ),'%Y%m')
-        </if>
-        GROUP BY fai.dept_name
+        SELECT mo.organize_name AS labName, IFNULL(SUM(faii.amount),0) AS amount
+        FROM meter_organize mo
+        LEFT JOIN
+            (SELECT fai.dept_id AS deptId, IFNULL(fai.agreement_amount,0) AS amount
+            FROM finance_agreement_info fai
+            WHERE fai.is_del = 0 AND fai.dept_name IS NOT NULL
+            <if test="dimension != null and dimension !='' and dimension == 'year'">
+                and YEAR(fai.create_time) = YEAR(CURDATE())
+            </if>
+            <if test="dimension != null and dimension !='' and dimension == 'quarter'">
+                and QUARTER(fai.create_time) = QUARTER(CURDATE()) AND YEAR(fai.create_time) = YEAR(CURDATE())
+            </if>
+            <if test="dimension != null and dimension !='' and dimension == 'month'">
+                and DATE_FORMAT(fai.create_time, '%Y%m') = DATE_FORMAT(CURDATE( ),'%Y%m')
+            </if>
+            ) faii ON (mo.dept_id = faii.deptId AND mo.is_lab = 1)
+        GROUP BY mo.organize_name
     </select>
 
     <select id="selectCustomerExcellentForCockpit" resultType="com.casic.missiles.dto.customer.CustomerExcellentResponse">
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/SampleOverdueTotalResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/SampleOverdueTotalResponse.java
new file mode 100644
index 0000000..5451369
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/SampleOverdueTotalResponse.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.dto.business.order;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 样品超期情况总数响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/13 11:44
+ */
+@ApiModel
+@Data
+public class SampleOverdueTotalResponse {
+    @ApiModelProperty(value = "数量", dataType = "Integer")
+    private Integer count = 0;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
index d5aa2dd..85de121 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
@@ -14,6 +14,8 @@
 public class CityTopResponse {
     @ApiModelProperty(value = "城市名称", dataType = "String")
     private String cityName;
-    @ApiModelProperty(value = "业务数量", dataType = "Long")
+    @ApiModelProperty(value = "检定业务数量", dataType = "Long")
     private Long orderCount;
+    @ApiModelProperty(value = "校准业务数量", dataType = "Long")
+    private Long calibrationOrderCount;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java
index 9bc6551..92ee332 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java
@@ -24,10 +24,10 @@
     @ApiModelProperty(value = "出具证书数量", dataType = "Integer")
     private Integer certificates = 0;
     @ApiModelProperty(value = "产值总计(分)", dataType = "Integer")
-    private Integer outPut;
+    private Integer outPut = 0;
 
     @ApiModelProperty(value = "产值总计(元)", dataType = "String")
-    private String outPutYuan;
+    private String outPutYuan = "0.00";
 
     public String getOutPutYuan() {
         if(Objects.nonNull(outPut)) {
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/StaffAnalyseListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/StaffAnalyseListResponse.java
index 77fa9b8..643b1fc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/StaffAnalyseListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/StaffAnalyseListResponse.java
@@ -25,10 +25,10 @@
     @ApiModelProperty(value = "出具证书数量", dataType = "Integer")
     private Integer certificates = 0;
     @ApiModelProperty(value = "产值总计(单位分)", dataType = "Integer")
-    private Integer outPut;
+    private Integer outPut = 0;
 
     @ExcelProperty(value = "产值总计(元)", order = 10)
-    private String outPutYuan;
+    private String outPutYuan = "0.00";
 
     public String getOutPutYuan() {
         if(Objects.nonNull(outPut)) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/CustomerBusinessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/CustomerBusinessServiceImpl.java
index 5b345a2..f8cfcdf 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/CustomerBusinessServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/CustomerBusinessServiceImpl.java
@@ -195,7 +195,7 @@
 
     @Override
     public List<CityTopResponse> cityTop() {
-        //各城市订单数top10
+        //各城市订单数top10，分为检定和校准
         List<CityTopResponse> list = orderMapper.selectOrderCityRank();
         return list;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/HomepageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/HomepageServiceImpl.java
index 0f21eef..f2f7e5a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/HomepageServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/HomepageServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.service.Impl.cockpit;
 
 import com.casic.missiles.dto.business.order.SampleOverdueResponse;
+import com.casic.missiles.dto.business.order.SampleOverdueTotalResponse;
 import com.casic.missiles.dto.business.order.labIncomeResponse;
 import com.casic.missiles.dto.business.order.labIncomeTotalResponse;
 import com.casic.missiles.dto.cockpit.AnnualDataResponse;
@@ -143,6 +144,15 @@
     }
 
     @Override
+    public SampleOverdueTotalResponse sampleOverdueTotal() {
+        List<SampleOverdueResponse> list = this.sampleOverdue();
+        int sum = list.stream().mapToInt(SampleOverdueResponse::getCount).sum();
+        SampleOverdueTotalResponse response = new SampleOverdueTotalResponse();
+        response.setCount(sum);
+        return response;
+    }
+
+    @Override
     public List<CustomerExcellentResponse> customerExcellentList() {
         List<CustomerExcellentResponse> list = agreementInfoMapper.selectCustomerExcellentForCockpit();
         if(CollectionUtils.isEmpty(list)) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/MeasureTaskServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/MeasureTaskServiceImpl.java
index e572716..71fe302 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/MeasureTaskServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/MeasureTaskServiceImpl.java
@@ -11,9 +11,12 @@
 import com.casic.missiles.mapper.equipment.EquipmentStandardEquipmentMapper;
 import com.casic.missiles.mapper.finance.FinanceAgreementInfoMapper;
 import com.casic.missiles.mapper.meter.MeterOrganizeMapper;
+import com.casic.missiles.mapper.meter.MeterStaffMapper;
 import com.casic.missiles.model.business.BusinessOrder;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.model.equipment.EquipmentStandardEquipment;
+import com.casic.missiles.model.meter.MeterOrganize;
+import com.casic.missiles.model.meter.MeterStaff;
 import com.casic.missiles.service.business.IBusinessBoardService;
 import com.casic.missiles.service.cockpit.IMeasureTaskService;
 import com.casic.missiles.service.finance.IFinanceBusinessSettlementInfoService;
@@ -23,6 +26,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
+import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -49,6 +53,8 @@
     private MeterFixedAssetsMapper fixedAssetsMapper;
     @Autowired
     private MeterOrganizeMapper organizeMapper;
+    @Resource
+    private MeterStaffMapper meterStaffMapper;
     @Autowired
     private IBusinessBoardService boardService;
     @Autowired
@@ -101,7 +107,18 @@
         BoardDeptOutputListResponse response = boardService.deptOutputList(request);
         List<BoardDeptOutputResponse> list = response.getList();
         if(CollectionUtils.isEmpty(list)){
-            return new ArrayList<>();
+            QueryWrapper<MeterOrganize> wrapper = new QueryWrapper<>();
+            List<MeterOrganize> meterOrganizes = organizeMapper.selectList(wrapper);
+            wrapper.eq("is_del", 0);
+            wrapper.eq("is_lab", 1);
+            List<CockpitDeptOutputListResponse> lists = new ArrayList<>();
+            meterOrganizes.forEach(organize -> {
+                CockpitDeptOutputListResponse cockpitDeptOutputListResponse = new CockpitDeptOutputListResponse();
+                cockpitDeptOutputListResponse.setDeptId(organize.getDeptId());
+                cockpitDeptOutputListResponse.setDeptName(organize.getOrganizeName());
+                lists.add(cockpitDeptOutputListResponse);
+            });
+            return lists;
         }
         List<CockpitDeptOutputListResponse> outputDTOs = ConvertUtils.sourceToTarget(list, CockpitDeptOutputListResponse.class);
         List<CockpitDeptOutputListResponse> resultList = outputDTOs.stream().collect(Collectors.toMap(CockpitDeptOutputListResponse::getDeptId, a -> a, (o1, o2) -> {
@@ -238,7 +255,17 @@
         BoardDeptOutputListResponse response = boardService.deptOutputList(request);
         List<BoardDeptOutputResponse> list = response.getList();
         if(CollectionUtils.isEmpty(list)){
-            return new ArrayList<>();
+            QueryWrapper<MeterStaff> wrapper = new QueryWrapper<>();
+            wrapper.eq("is_del", 0);
+            List<MeterStaff> meterStaffs = meterStaffMapper.selectList(wrapper);
+            List<StaffAnalyseListResponse> lists = new ArrayList<>();
+            meterStaffs.forEach(staff -> {
+                StaffAnalyseListResponse staffAnalyseListResponse = new StaffAnalyseListResponse();
+                staffAnalyseListResponse.setStaffId(staff.getId());
+                staffAnalyseListResponse.setStaffName(staff.getName());
+                lists.add(staffAnalyseListResponse);
+            });
+            return lists;
         }
         List<StaffAnalyseListResponse> resultList = ConvertUtils.sourceToTarget(list, StaffAnalyseListResponse.class);
         return resultList;

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/HomepageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/HomepageController.java
index f54eaa7..fcabdca 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/HomepageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/HomepageController.java
@@ -95,6 +95,12 @@
         return ReturnUtil.success(homepageService.sampleOverdue());
     }
 
+    @ApiOperation("样品超期总数")
+    @GetMapping("/sampleOverdueTotal")
+    public ReturnDTO<SampleOverdueTotalResponse> sampleOverdueTotal() {
+        return ReturnUtil.success(homepageService.sampleOverdueTotal());
+    }
+
     @ApiOperation("优质客户")
     @GetMapping("/excellentList")
     public ReturnDTO<CustomerExcellentResponse> customerExcellentList() {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java
index 0d6f1e3..4b25bd6 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java
@@ -91,11 +91,11 @@
     }
 
     /**
-     * 本月调度工况，中间的各实验室样品超期数量在部门综合分析中有，建议直接放到工作分析中展示
+     * 本月调度工况，中间的各实验室样品超期数量在部门综合分析中有，放到工作分析中展示
      */
 
     /**
-     * 本月调度工况-合格信息，样品检测合格与否无该信息，待和产品确认
+     * 本月调度工况-合格信息，样品检测合格与否无该信息，不做
      */
 
     /**
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessBoardMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessBoardMapper.xml
index 9c4000b..68cbe19 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessBoardMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessBoardMapper.xml
@@ -194,11 +194,23 @@
     </select>
 
     <select id="selectDeptSamples" resultType="com.casic.missiles.dto.business.board.BoardDeptComprehensiveResponse">
-        SELECT <include refid="baseOutputParamThree"/> COUNT(blei.id) AS samples
+        SELECT <include refid="baseOutputParamThree"/> COUNT(bleii.id) AS samples
         FROM meter_organize mo
-        LEFT JOIN business_lab_executive_info blei ON blei.measure_dept_id = mo.dept_id AND blei.measure_status = 4
+        LEFT JOIN
+            (SELECT blei.id, blei.measure_dept_id
+            FROM business_lab_executive_info blei
+            WHERE blei.measure_status = 4
+            <if test="request.startTime != null and request.startTime !=''">
+                AND blei.end_time &gt;= #{request.startTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !=''">
+                AND blei.end_time &lt;= #{request.endTime}
+            </if>
+            ) bleii ON bleii.measure_dept_id = mo.dept_id
         WHERE mo.is_lab = 1 AND mo.is_del = 0
-        <include refid="baseQueryConditionTwo"/>
+        <if test="request.deptId != null and request.deptId !=''">
+            AND mo.dept_id = #{request.deptId}
+        </if>
         GROUP BY mo.id
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
index b5a7712..0ac2a54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
@@ -65,13 +65,13 @@
     </select>
 
     <select id="selectOrderCityRank" resultType="com.casic.missiles.dto.cockpit.CityTopResponse">
-        SELECT ci.address_city_name AS cityName, COUNT(bo.id) AS orderCount
+        SELECT ci.address_city_name AS cityName, COUNT(case when certifications=1 then 1 end) AS orderCount, COUNT(case when certifications=2 then 1 end) AS calibrationOrderCount
         FROM business_order bo
         JOIN customer_info ci ON bo.customer_id = ci.id
         WHERE bo.is_del = 0
         GROUP BY ci.address_city_name
         HAVING ci.address_city_name IS NOT NULL
-        ORDER BY orderCount
+        ORDER BY orderCount + calibrationOrderCount
     </select>
 
     <select id="selectPreMonthCountByYear" resultType="com.casic.missiles.dto.cockpit.BusTrendResponse">
diff --git a/casic-metering-dao/src/main/resources/mapper/finance/FinanceAgreementInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/finance/FinanceAgreementInfoMapper.xml
index ad529c8..f3b63d2 100644
--- a/casic-metering-dao/src/main/resources/mapper/finance/FinanceAgreementInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/finance/FinanceAgreementInfoMapper.xml
@@ -135,20 +135,23 @@
     </select>
 
     <select id="selectAmountByDept" resultType="com.casic.missiles.dto.business.order.labIncomeResponse">
-        SELECT fai.dept_name AS labName, IFNULL(SUM(fai.agreement_amount),0) AS amount
-        FROM finance_agreement_info fai
-        JOIN meter_organize mo ON (mo.dept_id = fai.dept_id AND mo.is_lab = 1)
-        WHERE fai.is_del = 0 AND fai.dept_name IS NOT NULL
-        <if test="dimension != null and dimension !='' and dimension == 'year'">
-            and YEAR(fai.create_time) = YEAR(CURDATE())
-        </if>
-        <if test="dimension != null and dimension !='' and dimension == 'quarter'">
-            and QUARTER(fai.create_time) = QUARTER(CURDATE()) AND YEAR(fai.create_time) = YEAR(CURDATE())
-        </if>
-        <if test="dimension != null and dimension !='' and dimension == 'month'">
-            and DATE_FORMAT(fai.create_time, '%Y%m') = DATE_FORMAT(CURDATE( ),'%Y%m')
-        </if>
-        GROUP BY fai.dept_name
+        SELECT mo.organize_name AS labName, IFNULL(SUM(faii.amount),0) AS amount
+        FROM meter_organize mo
+        LEFT JOIN
+            (SELECT fai.dept_id AS deptId, IFNULL(fai.agreement_amount,0) AS amount
+            FROM finance_agreement_info fai
+            WHERE fai.is_del = 0 AND fai.dept_name IS NOT NULL
+            <if test="dimension != null and dimension !='' and dimension == 'year'">
+                and YEAR(fai.create_time) = YEAR(CURDATE())
+            </if>
+            <if test="dimension != null and dimension !='' and dimension == 'quarter'">
+                and QUARTER(fai.create_time) = QUARTER(CURDATE()) AND YEAR(fai.create_time) = YEAR(CURDATE())
+            </if>
+            <if test="dimension != null and dimension !='' and dimension == 'month'">
+                and DATE_FORMAT(fai.create_time, '%Y%m') = DATE_FORMAT(CURDATE( ),'%Y%m')
+            </if>
+            ) faii ON (mo.dept_id = faii.deptId AND mo.is_lab = 1)
+        GROUP BY mo.organize_name
     </select>
 
     <select id="selectCustomerExcellentForCockpit" resultType="com.casic.missiles.dto.customer.CustomerExcellentResponse">
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/SampleOverdueTotalResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/SampleOverdueTotalResponse.java
new file mode 100644
index 0000000..5451369
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/SampleOverdueTotalResponse.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.dto.business.order;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 样品超期情况总数响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/13 11:44
+ */
+@ApiModel
+@Data
+public class SampleOverdueTotalResponse {
+    @ApiModelProperty(value = "数量", dataType = "Integer")
+    private Integer count = 0;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
index d5aa2dd..85de121 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
@@ -14,6 +14,8 @@
 public class CityTopResponse {
     @ApiModelProperty(value = "城市名称", dataType = "String")
     private String cityName;
-    @ApiModelProperty(value = "业务数量", dataType = "Long")
+    @ApiModelProperty(value = "检定业务数量", dataType = "Long")
     private Long orderCount;
+    @ApiModelProperty(value = "校准业务数量", dataType = "Long")
+    private Long calibrationOrderCount;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java
index 9bc6551..92ee332 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java
@@ -24,10 +24,10 @@
     @ApiModelProperty(value = "出具证书数量", dataType = "Integer")
     private Integer certificates = 0;
     @ApiModelProperty(value = "产值总计(分)", dataType = "Integer")
-    private Integer outPut;
+    private Integer outPut = 0;
 
     @ApiModelProperty(value = "产值总计(元)", dataType = "String")
-    private String outPutYuan;
+    private String outPutYuan = "0.00";
 
     public String getOutPutYuan() {
         if(Objects.nonNull(outPut)) {
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/StaffAnalyseListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/StaffAnalyseListResponse.java
index 77fa9b8..643b1fc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/StaffAnalyseListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/StaffAnalyseListResponse.java
@@ -25,10 +25,10 @@
     @ApiModelProperty(value = "出具证书数量", dataType = "Integer")
     private Integer certificates = 0;
     @ApiModelProperty(value = "产值总计(单位分)", dataType = "Integer")
-    private Integer outPut;
+    private Integer outPut = 0;
 
     @ExcelProperty(value = "产值总计(元)", order = 10)
-    private String outPutYuan;
+    private String outPutYuan = "0.00";
 
     public String getOutPutYuan() {
         if(Objects.nonNull(outPut)) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/CustomerBusinessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/CustomerBusinessServiceImpl.java
index 5b345a2..f8cfcdf 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/CustomerBusinessServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/CustomerBusinessServiceImpl.java
@@ -195,7 +195,7 @@
 
     @Override
     public List<CityTopResponse> cityTop() {
-        //各城市订单数top10
+        //各城市订单数top10，分为检定和校准
         List<CityTopResponse> list = orderMapper.selectOrderCityRank();
         return list;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/HomepageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/HomepageServiceImpl.java
index 0f21eef..f2f7e5a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/HomepageServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/HomepageServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.service.Impl.cockpit;
 
 import com.casic.missiles.dto.business.order.SampleOverdueResponse;
+import com.casic.missiles.dto.business.order.SampleOverdueTotalResponse;
 import com.casic.missiles.dto.business.order.labIncomeResponse;
 import com.casic.missiles.dto.business.order.labIncomeTotalResponse;
 import com.casic.missiles.dto.cockpit.AnnualDataResponse;
@@ -143,6 +144,15 @@
     }
 
     @Override
+    public SampleOverdueTotalResponse sampleOverdueTotal() {
+        List<SampleOverdueResponse> list = this.sampleOverdue();
+        int sum = list.stream().mapToInt(SampleOverdueResponse::getCount).sum();
+        SampleOverdueTotalResponse response = new SampleOverdueTotalResponse();
+        response.setCount(sum);
+        return response;
+    }
+
+    @Override
     public List<CustomerExcellentResponse> customerExcellentList() {
         List<CustomerExcellentResponse> list = agreementInfoMapper.selectCustomerExcellentForCockpit();
         if(CollectionUtils.isEmpty(list)) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/MeasureTaskServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/MeasureTaskServiceImpl.java
index e572716..71fe302 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/MeasureTaskServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/MeasureTaskServiceImpl.java
@@ -11,9 +11,12 @@
 import com.casic.missiles.mapper.equipment.EquipmentStandardEquipmentMapper;
 import com.casic.missiles.mapper.finance.FinanceAgreementInfoMapper;
 import com.casic.missiles.mapper.meter.MeterOrganizeMapper;
+import com.casic.missiles.mapper.meter.MeterStaffMapper;
 import com.casic.missiles.model.business.BusinessOrder;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.model.equipment.EquipmentStandardEquipment;
+import com.casic.missiles.model.meter.MeterOrganize;
+import com.casic.missiles.model.meter.MeterStaff;
 import com.casic.missiles.service.business.IBusinessBoardService;
 import com.casic.missiles.service.cockpit.IMeasureTaskService;
 import com.casic.missiles.service.finance.IFinanceBusinessSettlementInfoService;
@@ -23,6 +26,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
+import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -49,6 +53,8 @@
     private MeterFixedAssetsMapper fixedAssetsMapper;
     @Autowired
     private MeterOrganizeMapper organizeMapper;
+    @Resource
+    private MeterStaffMapper meterStaffMapper;
     @Autowired
     private IBusinessBoardService boardService;
     @Autowired
@@ -101,7 +107,18 @@
         BoardDeptOutputListResponse response = boardService.deptOutputList(request);
         List<BoardDeptOutputResponse> list = response.getList();
         if(CollectionUtils.isEmpty(list)){
-            return new ArrayList<>();
+            QueryWrapper<MeterOrganize> wrapper = new QueryWrapper<>();
+            List<MeterOrganize> meterOrganizes = organizeMapper.selectList(wrapper);
+            wrapper.eq("is_del", 0);
+            wrapper.eq("is_lab", 1);
+            List<CockpitDeptOutputListResponse> lists = new ArrayList<>();
+            meterOrganizes.forEach(organize -> {
+                CockpitDeptOutputListResponse cockpitDeptOutputListResponse = new CockpitDeptOutputListResponse();
+                cockpitDeptOutputListResponse.setDeptId(organize.getDeptId());
+                cockpitDeptOutputListResponse.setDeptName(organize.getOrganizeName());
+                lists.add(cockpitDeptOutputListResponse);
+            });
+            return lists;
         }
         List<CockpitDeptOutputListResponse> outputDTOs = ConvertUtils.sourceToTarget(list, CockpitDeptOutputListResponse.class);
         List<CockpitDeptOutputListResponse> resultList = outputDTOs.stream().collect(Collectors.toMap(CockpitDeptOutputListResponse::getDeptId, a -> a, (o1, o2) -> {
@@ -238,7 +255,17 @@
         BoardDeptOutputListResponse response = boardService.deptOutputList(request);
         List<BoardDeptOutputResponse> list = response.getList();
         if(CollectionUtils.isEmpty(list)){
-            return new ArrayList<>();
+            QueryWrapper<MeterStaff> wrapper = new QueryWrapper<>();
+            wrapper.eq("is_del", 0);
+            List<MeterStaff> meterStaffs = meterStaffMapper.selectList(wrapper);
+            List<StaffAnalyseListResponse> lists = new ArrayList<>();
+            meterStaffs.forEach(staff -> {
+                StaffAnalyseListResponse staffAnalyseListResponse = new StaffAnalyseListResponse();
+                staffAnalyseListResponse.setStaffId(staff.getId());
+                staffAnalyseListResponse.setStaffName(staff.getName());
+                lists.add(staffAnalyseListResponse);
+            });
+            return lists;
         }
         List<StaffAnalyseListResponse> resultList = ConvertUtils.sourceToTarget(list, StaffAnalyseListResponse.class);
         return resultList;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/cockpit/IHomepageService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/cockpit/IHomepageService.java
index 0305827..dde2b6b 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/cockpit/IHomepageService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/cockpit/IHomepageService.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.service.cockpit;
 
 import com.casic.missiles.dto.business.order.SampleOverdueResponse;
+import com.casic.missiles.dto.business.order.SampleOverdueTotalResponse;
 import com.casic.missiles.dto.business.order.labIncomeResponse;
 import com.casic.missiles.dto.business.order.labIncomeTotalResponse;
 import com.casic.missiles.dto.cockpit.AnnualDataResponse;
@@ -28,6 +29,7 @@
 
     List<SampleOverdueResponse> sampleOverdue();
 
-    List<CustomerExcellentResponse> customerExcellentList();
+    SampleOverdueTotalResponse sampleOverdueTotal();
 
+    List<CustomerExcellentResponse> customerExcellentList();
 }