diff --git a/ETCLaneMonitoringEvaluation/src/main/java/com/nmggs/query/mapper/GantryMapper.xml b/ETCLaneMonitoringEvaluation/src/main/java/com/nmggs/query/mapper/GantryMapper.xml
index b3512a5..5c112db 100644
--- a/ETCLaneMonitoringEvaluation/src/main/java/com/nmggs/query/mapper/GantryMapper.xml
+++ b/ETCLaneMonitoringEvaluation/src/main/java/com/nmggs/query/mapper/GantryMapper.xml
@@ -6,12 +6,13 @@
 
 
     <select id="queryGantryTable" resultType="java.util.Map">
-        SELECT  a.*,s.SUBCOMNAME from
-            (SELECT g.ID,g.NAME,g.GANTRYHEX,n.STANO,n.ROADNO,n.ROADNAME,n.SUBCOMNO FROM GANTRY_TABLE g
-                                                                       LEFT JOIN NAME_TABLE n on n.STANO=g.STANO) a
-                LEFT JOIN SUBCOMPANY_TABLE s on s.SUBCOMNO=a.SUBCOMNO
+        SELECT a.*, s.SUBCOMNAME
+        from (SELECT g.ID, g.NAME, g.GANTRYHEX, n.STANO, n.ROADNO, n.ROADNAME, n.SUBCOMNO
+              FROM GANTRY_TABLE g
+                       LEFT JOIN NAME_TABLE n on n.STANO = g.STANO) a
+                 LEFT JOIN SUBCOMPANY_TABLE s on s.SUBCOMNO = a.SUBCOMNO
         WHERE a.STANO IS NOT NULL
-          AND NOT EXISTS (
+          AND NOT EXISTS(
                 SELECT 1
                 FROM FOLLOW_GANTRY_TABLE f
                 WHERE f.ID = a.ID
@@ -20,48 +21,54 @@
     </select>
     <select id="selectJoinPage" resultType="java.util.Map">
         SELECT
-            b.CLASSDATE,
-            f.GANTRYHEX,
-            b.MEDIATYPE,
-            f.ROADNAME,
-            f.SUBCOMNAME,
-            f.NAME,
-            f.FXPOINTNAME,
-            f.ID,
-            SUM(CASE WHEN b.VEHICLETYPE = 1 THEN b.CARCOUNT ELSE 0 END) AS VEHICLETYPE_1_TOTAL,
-            SUM(CASE WHEN b.VEHICLETYPE = 2 THEN b.CARCOUNT ELSE 0 END) AS VEHICLETYPE_2_TOTAL,
-            SUM(CASE WHEN b.VEHICLETYPE = 3 THEN b.CARCOUNT ELSE 0 END) AS VEHICLETYPE_3_TOTAL,
-            SUM(CASE WHEN b.VEHICLETYPE = 4 THEN b.CARCOUNT ELSE 0 END) AS VEHICLETYPE_4_TOTAL,
-            SUM(CASE WHEN b.VEHICLETYPE = 11 THEN b.CARCOUNT ELSE 0 END) AS VEHICLETYPE_11_TOTAL,
-            SUM(CASE WHEN b.VEHICLETYPE = 12 THEN b.CARCOUNT ELSE 0 END) AS VEHICLETYPE_12_TOTAL,
-            SUM(CASE WHEN b.VEHICLETYPE = 13 THEN b.CARCOUNT ELSE 0 END) AS VEHICLETYPE_13_TOTAL,
-            SUM(CASE WHEN b.VEHICLETYPE = 14 THEN b.CARCOUNT ELSE 0 END) AS VEHICLETYPE_14_TOTAL,
-            SUM(CASE WHEN b.VEHICLETYPE = 15 THEN b.CARCOUNT ELSE 0 END) AS VEHICLETYPE_15_TOTAL,
-            SUM(CASE WHEN b.VEHICLETYPE = 16 THEN b.CARCOUNT ELSE 0 END) AS VEHICLETYPE_16_TOTAL,
-            SUM(CASE WHEN b.VEHICLETYPE IN (1, 2, 3, 4) THEN b.CARCOUNT ELSE 0 END) AS KECHE_TOTAL,
-            SUM(CASE WHEN b.VEHICLETYPE IN (11, 12, 13, 14, 15, 16) THEN b.CARCOUNT ELSE 0 END) AS HUOCHE_TOTAL,
-            SUM(CASE WHEN b.VEHICLETYPE IN (1, 2, 3, 4,11, 12, 13, 14, 15, 16) THEN b.CARCOUNT ELSE 0 END) AS KEHUO_TOTAL,
-            SUM(b.CARCOUNT) AS TOTAL_CARCOUNT
+        b.CLASSDATE,
+        f.GANTRYHEX,
+        f.ROADNAME,
+        f.SUBCOMNAME,
+        f.NAME,
+        f.FXPOINTNAME,
+        f.ID,
+        SUM(CASE WHEN b.VEHICLETYPE = 1 THEN b.CARCOUNT ELSE 0 END) AS VEHICLETYPE_1_TOTAL,
+        SUM(CASE WHEN b.VEHICLETYPE = 2 THEN b.CARCOUNT ELSE 0 END) AS VEHICLETYPE_2_TOTAL,
+        SUM(CASE WHEN b.VEHICLETYPE = 3 THEN b.CARCOUNT ELSE 0 END) AS VEHICLETYPE_3_TOTAL,
+        SUM(CASE WHEN b.VEHICLETYPE = 4 THEN b.CARCOUNT ELSE 0 END) AS VEHICLETYPE_4_TOTAL,
+        SUM(CASE WHEN b.VEHICLETYPE IN (11,21) THEN b.CARCOUNT ELSE 0 END) AS VEHICLETYPE_11_TOTAL,
+        SUM(CASE WHEN b.VEHICLETYPE IN (12,22) THEN b.CARCOUNT ELSE 0 END) AS VEHICLETYPE_12_TOTAL,
+        SUM(CASE WHEN b.VEHICLETYPE IN (13,23) THEN b.CARCOUNT ELSE 0 END) AS VEHICLETYPE_13_TOTAL,
+        SUM(CASE WHEN b.VEHICLETYPE IN (14,24) THEN b.CARCOUNT ELSE 0 END) AS VEHICLETYPE_14_TOTAL,
+        SUM(CASE WHEN b.VEHICLETYPE IN (15,25) THEN b.CARCOUNT ELSE 0 END) AS VEHICLETYPE_15_TOTAL,
+        SUM(CASE WHEN b.VEHICLETYPE IN (16,26) THEN b.CARCOUNT ELSE 0 END) AS VEHICLETYPE_16_TOTAL,
+        SUM(CASE WHEN b.VEHICLETYPE IN (1, 2, 3, 4) THEN b.CARCOUNT ELSE 0 END) AS KECHE_TOTAL,
+        SUM(CASE WHEN b.VEHICLETYPE IN (11, 12, 13, 14, 15, 16,21,22,23,24,25,26) THEN b.CARCOUNT ELSE 0 END) AS HUOCHE_TOTAL,
+        SUM(CASE WHEN b.VEHICLETYPE IN (1, 2, 3, 4,11, 12, 13, 14, 15, 16,21,22,23,24,25,26) THEN b.CARCOUNT ELSE 0 END) AS KEHUO_TOTAL,
+        SUM(b.CARCOUNT) AS TOTAL_CARCOUNT
         FROM bb_gantry_stat b
-                 INNER JOIN FOLLOW_GANTRY_TABLE f ON b.GANTRYHEX = f.GANTRYHEX
+        INNER JOIN FOLLOW_GANTRY_TABLE f ON b.GANTRYHEX = f.GANTRYHEX
 
         <where>
             <if test="params.dT != null and params.dT != ''">
                 AND b.CLASSDATE =TO_DATE(#{params.dT}, 'yyyy-MM-dd')
 
             </if>
-            <if test="params.upOrDown != null and params.upOrDown != ''">
-                AND b.MEDIATYPE =#{params.upOrDown}
-            </if>
+            <!--            <if test="params.upOrDown != null and params.upOrDown != ''">-->
+            <!--                AND b.MEDIATYPE =#{params.upOrDown}-->
+            <!--            </if>-->
 
-            AND (
-            (b.MEDIATYPE = 1 AND SUBSTR(f.ID, -5,1) = '1')
-            OR (b.MEDIATYPE = 2 AND SUBSTR(f.ID, -5,1) = '2')
-            )
+            <!--            AND (-->
+            <!--            (b.MEDIATYPE = 1 AND SUBSTR(f.ID, -5,1) = '1')-->
+            <!--            OR (b.MEDIATYPE = 2 AND SUBSTR(f.ID, -5,1) = '2')-->
+            <!--            )-->
+
+            <if test="params.upOrDown != null and params.upOrDown != '' and params.upOrDown ==1">
+                AND SUBSTR(f.ID, -5,1) = '1'
+            </if>
+            <if test="params.upOrDown != null and params.upOrDown != '' and params.upOrDown ==2">
+                AND SUBSTR(f.ID, -5,1) = '2'
+            </if>
 
         </where>
 
-        GROUP BY b.CLASSDATE, f.GANTRYHEX, b.MEDIATYPE, f.ROADNAME, f.SUBCOMNAME, f.NAME, f.ID,f.FXPOINTNAME
+        GROUP BY b.CLASSDATE, f.GANTRYHEX,  f.ROADNAME, f.SUBCOMNAME, f.NAME, f.ID,f.FXPOINTNAME
         ORDER BY f.SUBCOMNAME ASC
     </select>
 </mapper>
diff --git a/ETCLaneMonitoringEvaluation/src/main/resources/version/1.0.5.txt b/ETCLaneMonitoringEvaluation/src/main/resources/version/1.0.6.txt
similarity index 81%
rename from ETCLaneMonitoringEvaluation/src/main/resources/version/1.0.5.txt
rename to ETCLaneMonitoringEvaluation/src/main/resources/version/1.0.6.txt
index 4b0a55c..604a1cd 100644
--- a/ETCLaneMonitoringEvaluation/src/main/resources/version/1.0.5.txt
+++ b/ETCLaneMonitoringEvaluation/src/main/resources/version/1.0.6.txt
@@ -5,3 +5,4 @@
 4     2024年09月10日     1.0.3       增加重点关注门架车流量统计页面查询
 5     2024年09月12日     1.0.4       重点关注门架车流量统计页面增加相关联非现点位
 6     2024年09月14日     1.0.5       ETC车辆通行成功率统计查询默认查询三天前数据（汇总数据为保证精准）
+7     2024年09月18日     1.0.6       重点关注门架车流量统计页面将专项作业车车流量，分别加载货车的对应车型中，如21型，加在11型中，以此类推
diff --git a/ETCLaneMonitoringEvaluation/target/ETCLaneMonitoringEvaluation.war b/ETCLaneMonitoringEvaluation/target/ETCLaneMonitoringEvaluation.war
index 5f5cdd8..f5e2a38 100644
Binary files a/ETCLaneMonitoringEvaluation/target/ETCLaneMonitoringEvaluation.war and b/ETCLaneMonitoringEvaluation/target/ETCLaneMonitoringEvaluation.war differ
diff --git a/ETCLaneMonitoringEvaluation/target/ETCLaneMonitoringEvaluation.war.original b/ETCLaneMonitoringEvaluation/target/ETCLaneMonitoringEvaluation.war.original
index 431f924..7892867 100644
Binary files a/ETCLaneMonitoringEvaluation/target/ETCLaneMonitoringEvaluation.war.original and b/ETCLaneMonitoringEvaluation/target/ETCLaneMonitoringEvaluation.war.original differ
diff --git a/ETCLaneMonitoringEvaluation/target/ETCLaneMonitoringEvaluation/META-INF/MANIFEST.MF b/ETCLaneMonitoringEvaluation/target/ETCLaneMonitoringEvaluation/META-INF/MANIFEST.MF
deleted file mode 100644
index 6cb5cdd..0000000
--- a/ETCLaneMonitoringEvaluation/target/ETCLaneMonitoringEvaluation/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,9 +0,0 @@
-Manifest-Version: 1.0
-Created-By: IntelliJ IDEA
-Built-By: shuguang
-Build-Jdk: version 1.8.0_121
-Implementation-Title: ETCLaneMonitoringEvaluation
-Implementation-Version: 0.0.1-SNAPSHOT
-Implementation-Vendor-Id: com.nmggs
-Main-Class: ${start-class}
-
diff --git a/ETCLaneMonitoringEvaluation/target/ETCLaneMonitoringEvaluation/WEB-INF/classes/com/nmggs/query/mapper/GantryMapper.xml b/ETCLaneMonitoringEvaluation/target/ETCLaneMonitoringEvaluation/WEB-INF/classes/com/nmggs/query/mapper/GantryMapper.xml
index b3512a5..5c112db 100644
--- a/ETCLaneMonitoringEvaluation/target/ETCLaneMonitoringEvaluation/WEB-INF/classes/com/nmggs/query/mapper/GantryMapper.xml
+++ b/ETCLaneMonitoringEvaluation/target/ETCLaneMonitoringEvaluation/WEB-INF/classes/com/nmggs/query/mapper/GantryMapper.xml
@@ -6,12 +6,13 @@
 
 
     <select id="queryGantryTable" resultType="java.util.Map">
-        SELECT  a.*,s.SUBCOMNAME from
-            (SELECT g.ID,g.NAME,g.GANTRYHEX,n.STANO,n.ROADNO,n.ROADNAME,n.SUBCOMNO FROM GANTRY_TABLE g
-                                                                       LEFT JOIN NAME_TABLE n on n.STANO=g.STANO) a
-                LEFT JOIN SUBCOMPANY_TABLE s on s.SUBCOMNO=a.SUBCOMNO
+        SELECT a.*, s.SUBCOMNAME
+        from (SELECT g.ID, g.NAME, g.GANTRYHEX, n.STANO, n.ROADNO, n.ROADNAME, n.SUBCOMNO
+              FROM GANTRY_TABLE g
+                       LEFT JOIN NAME_TABLE n on n.STANO = g.STANO) a
+                 LEFT JOIN SUBCOMPANY_TABLE s on s.SUBCOMNO = a.SUBCOMNO
         WHERE a.STANO IS NOT NULL
-          AND NOT EXISTS (
+          AND NOT EXISTS(
                 SELECT 1
                 FROM FOLLOW_GANTRY_TABLE f
                 WHERE f.ID = a.ID
@@ -20,48 +21,54 @@
     </select>
     <select id="selectJoinPage" resultType="java.util.Map">
         SELECT
-            b.CLASSDATE,
-            f.GANTRYHEX,
-            b.MEDIATYPE,
-            f.ROADNAME,
-            f.SUBCOMNAME,
-            f.NAME,
-            f.FXPOINTNAME,
-            f.ID,
-            SUM(CASE WHEN b.VEHICLETYPE = 1 THEN b.CARCOUNT ELSE 0 END) AS VEHICLETYPE_1_TOTAL,
-            SUM(CASE WHEN b.VEHICLETYPE = 2 THEN b.CARCOUNT ELSE 0 END) AS VEHICLETYPE_2_TOTAL,
-            SUM(CASE WHEN b.VEHICLETYPE = 3 THEN b.CARCOUNT ELSE 0 END) AS VEHICLETYPE_3_TOTAL,
-            SUM(CASE WHEN b.VEHICLETYPE = 4 THEN b.CARCOUNT ELSE 0 END) AS VEHICLETYPE_4_TOTAL,
-            SUM(CASE WHEN b.VEHICLETYPE = 11 THEN b.CARCOUNT ELSE 0 END) AS VEHICLETYPE_11_TOTAL,
-            SUM(CASE WHEN b.VEHICLETYPE = 12 THEN b.CARCOUNT ELSE 0 END) AS VEHICLETYPE_12_TOTAL,
-            SUM(CASE WHEN b.VEHICLETYPE = 13 THEN b.CARCOUNT ELSE 0 END) AS VEHICLETYPE_13_TOTAL,
-            SUM(CASE WHEN b.VEHICLETYPE = 14 THEN b.CARCOUNT ELSE 0 END) AS VEHICLETYPE_14_TOTAL,
-            SUM(CASE WHEN b.VEHICLETYPE = 15 THEN b.CARCOUNT ELSE 0 END) AS VEHICLETYPE_15_TOTAL,
-            SUM(CASE WHEN b.VEHICLETYPE = 16 THEN b.CARCOUNT ELSE 0 END) AS VEHICLETYPE_16_TOTAL,
-            SUM(CASE WHEN b.VEHICLETYPE IN (1, 2, 3, 4) THEN b.CARCOUNT ELSE 0 END) AS KECHE_TOTAL,
-            SUM(CASE WHEN b.VEHICLETYPE IN (11, 12, 13, 14, 15, 16) THEN b.CARCOUNT ELSE 0 END) AS HUOCHE_TOTAL,
-            SUM(CASE WHEN b.VEHICLETYPE IN (1, 2, 3, 4,11, 12, 13, 14, 15, 16) THEN b.CARCOUNT ELSE 0 END) AS KEHUO_TOTAL,
-            SUM(b.CARCOUNT) AS TOTAL_CARCOUNT
+        b.CLASSDATE,
+        f.GANTRYHEX,
+        f.ROADNAME,
+        f.SUBCOMNAME,
+        f.NAME,
+        f.FXPOINTNAME,
+        f.ID,
+        SUM(CASE WHEN b.VEHICLETYPE = 1 THEN b.CARCOUNT ELSE 0 END) AS VEHICLETYPE_1_TOTAL,
+        SUM(CASE WHEN b.VEHICLETYPE = 2 THEN b.CARCOUNT ELSE 0 END) AS VEHICLETYPE_2_TOTAL,
+        SUM(CASE WHEN b.VEHICLETYPE = 3 THEN b.CARCOUNT ELSE 0 END) AS VEHICLETYPE_3_TOTAL,
+        SUM(CASE WHEN b.VEHICLETYPE = 4 THEN b.CARCOUNT ELSE 0 END) AS VEHICLETYPE_4_TOTAL,
+        SUM(CASE WHEN b.VEHICLETYPE IN (11,21) THEN b.CARCOUNT ELSE 0 END) AS VEHICLETYPE_11_TOTAL,
+        SUM(CASE WHEN b.VEHICLETYPE IN (12,22) THEN b.CARCOUNT ELSE 0 END) AS VEHICLETYPE_12_TOTAL,
+        SUM(CASE WHEN b.VEHICLETYPE IN (13,23) THEN b.CARCOUNT ELSE 0 END) AS VEHICLETYPE_13_TOTAL,
+        SUM(CASE WHEN b.VEHICLETYPE IN (14,24) THEN b.CARCOUNT ELSE 0 END) AS VEHICLETYPE_14_TOTAL,
+        SUM(CASE WHEN b.VEHICLETYPE IN (15,25) THEN b.CARCOUNT ELSE 0 END) AS VEHICLETYPE_15_TOTAL,
+        SUM(CASE WHEN b.VEHICLETYPE IN (16,26) THEN b.CARCOUNT ELSE 0 END) AS VEHICLETYPE_16_TOTAL,
+        SUM(CASE WHEN b.VEHICLETYPE IN (1, 2, 3, 4) THEN b.CARCOUNT ELSE 0 END) AS KECHE_TOTAL,
+        SUM(CASE WHEN b.VEHICLETYPE IN (11, 12, 13, 14, 15, 16,21,22,23,24,25,26) THEN b.CARCOUNT ELSE 0 END) AS HUOCHE_TOTAL,
+        SUM(CASE WHEN b.VEHICLETYPE IN (1, 2, 3, 4,11, 12, 13, 14, 15, 16,21,22,23,24,25,26) THEN b.CARCOUNT ELSE 0 END) AS KEHUO_TOTAL,
+        SUM(b.CARCOUNT) AS TOTAL_CARCOUNT
         FROM bb_gantry_stat b
-                 INNER JOIN FOLLOW_GANTRY_TABLE f ON b.GANTRYHEX = f.GANTRYHEX
+        INNER JOIN FOLLOW_GANTRY_TABLE f ON b.GANTRYHEX = f.GANTRYHEX
 
         <where>
             <if test="params.dT != null and params.dT != ''">
                 AND b.CLASSDATE =TO_DATE(#{params.dT}, 'yyyy-MM-dd')
 
             </if>
-            <if test="params.upOrDown != null and params.upOrDown != ''">
-                AND b.MEDIATYPE =#{params.upOrDown}
-            </if>
+            <!--            <if test="params.upOrDown != null and params.upOrDown != ''">-->
+            <!--                AND b.MEDIATYPE =#{params.upOrDown}-->
+            <!--            </if>-->
 
-            AND (
-            (b.MEDIATYPE = 1 AND SUBSTR(f.ID, -5,1) = '1')
-            OR (b.MEDIATYPE = 2 AND SUBSTR(f.ID, -5,1) = '2')
-            )
+            <!--            AND (-->
+            <!--            (b.MEDIATYPE = 1 AND SUBSTR(f.ID, -5,1) = '1')-->
+            <!--            OR (b.MEDIATYPE = 2 AND SUBSTR(f.ID, -5,1) = '2')-->
+            <!--            )-->
+
+            <if test="params.upOrDown != null and params.upOrDown != '' and params.upOrDown ==1">
+                AND SUBSTR(f.ID, -5,1) = '1'
+            </if>
+            <if test="params.upOrDown != null and params.upOrDown != '' and params.upOrDown ==2">
+                AND SUBSTR(f.ID, -5,1) = '2'
+            </if>
 
         </where>
 
-        GROUP BY b.CLASSDATE, f.GANTRYHEX, b.MEDIATYPE, f.ROADNAME, f.SUBCOMNAME, f.NAME, f.ID,f.FXPOINTNAME
+        GROUP BY b.CLASSDATE, f.GANTRYHEX,  f.ROADNAME, f.SUBCOMNAME, f.NAME, f.ID,f.FXPOINTNAME
         ORDER BY f.SUBCOMNAME ASC
     </select>
 </mapper>
diff --git a/ETCLaneMonitoringEvaluation/target/ETCLaneMonitoringEvaluation/WEB-INF/classes/version/1.0.5.txt b/ETCLaneMonitoringEvaluation/target/ETCLaneMonitoringEvaluation/WEB-INF/classes/version/1.0.6.txt
similarity index 81%
rename from ETCLaneMonitoringEvaluation/target/ETCLaneMonitoringEvaluation/WEB-INF/classes/version/1.0.5.txt
rename to ETCLaneMonitoringEvaluation/target/ETCLaneMonitoringEvaluation/WEB-INF/classes/version/1.0.6.txt
index 4b0a55c..604a1cd 100644
--- a/ETCLaneMonitoringEvaluation/target/ETCLaneMonitoringEvaluation/WEB-INF/classes/version/1.0.5.txt
+++ b/ETCLaneMonitoringEvaluation/target/ETCLaneMonitoringEvaluation/WEB-INF/classes/version/1.0.6.txt
@@ -5,3 +5,4 @@
 4     2024年09月10日     1.0.3       增加重点关注门架车流量统计页面查询
 5     2024年09月12日     1.0.4       重点关注门架车流量统计页面增加相关联非现点位
 6     2024年09月14日     1.0.5       ETC车辆通行成功率统计查询默认查询三天前数据（汇总数据为保证精准）
+7     2024年09月18日     1.0.6       重点关注门架车流量统计页面将专项作业车车流量，分别加载货车的对应车型中，如21型，加在11型中，以此类推
diff --git a/ETCLaneMonitoringEvaluation/target/classes/com/nmggs/query/mapper/GantryMapper.xml b/ETCLaneMonitoringEvaluation/target/classes/com/nmggs/query/mapper/GantryMapper.xml
index b3512a5..5c112db 100644
--- a/ETCLaneMonitoringEvaluation/target/classes/com/nmggs/query/mapper/GantryMapper.xml
+++ b/ETCLaneMonitoringEvaluation/target/classes/com/nmggs/query/mapper/GantryMapper.xml
@@ -6,12 +6,13 @@
 
 
     <select id="queryGantryTable" resultType="java.util.Map">
-        SELECT  a.*,s.SUBCOMNAME from
-            (SELECT g.ID,g.NAME,g.GANTRYHEX,n.STANO,n.ROADNO,n.ROADNAME,n.SUBCOMNO FROM GANTRY_TABLE g
-                                                                       LEFT JOIN NAME_TABLE n on n.STANO=g.STANO) a
-                LEFT JOIN SUBCOMPANY_TABLE s on s.SUBCOMNO=a.SUBCOMNO
+        SELECT a.*, s.SUBCOMNAME
+        from (SELECT g.ID, g.NAME, g.GANTRYHEX, n.STANO, n.ROADNO, n.ROADNAME, n.SUBCOMNO
+              FROM GANTRY_TABLE g
+                       LEFT JOIN NAME_TABLE n on n.STANO = g.STANO) a
+                 LEFT JOIN SUBCOMPANY_TABLE s on s.SUBCOMNO = a.SUBCOMNO
         WHERE a.STANO IS NOT NULL
-          AND NOT EXISTS (
+          AND NOT EXISTS(
                 SELECT 1
                 FROM FOLLOW_GANTRY_TABLE f
                 WHERE f.ID = a.ID
@@ -20,48 +21,54 @@
     </select>
     <select id="selectJoinPage" resultType="java.util.Map">
         SELECT
-            b.CLASSDATE,
-            f.GANTRYHEX,
-            b.MEDIATYPE,
-            f.ROADNAME,
-            f.SUBCOMNAME,
-            f.NAME,
-            f.FXPOINTNAME,
-            f.ID,
-            SUM(CASE WHEN b.VEHICLETYPE = 1 THEN b.CARCOUNT ELSE 0 END) AS VEHICLETYPE_1_TOTAL,
-            SUM(CASE WHEN b.VEHICLETYPE = 2 THEN b.CARCOUNT ELSE 0 END) AS VEHICLETYPE_2_TOTAL,
-            SUM(CASE WHEN b.VEHICLETYPE = 3 THEN b.CARCOUNT ELSE 0 END) AS VEHICLETYPE_3_TOTAL,
-            SUM(CASE WHEN b.VEHICLETYPE = 4 THEN b.CARCOUNT ELSE 0 END) AS VEHICLETYPE_4_TOTAL,
-            SUM(CASE WHEN b.VEHICLETYPE = 11 THEN b.CARCOUNT ELSE 0 END) AS VEHICLETYPE_11_TOTAL,
-            SUM(CASE WHEN b.VEHICLETYPE = 12 THEN b.CARCOUNT ELSE 0 END) AS VEHICLETYPE_12_TOTAL,
-            SUM(CASE WHEN b.VEHICLETYPE = 13 THEN b.CARCOUNT ELSE 0 END) AS VEHICLETYPE_13_TOTAL,
-            SUM(CASE WHEN b.VEHICLETYPE = 14 THEN b.CARCOUNT ELSE 0 END) AS VEHICLETYPE_14_TOTAL,
-            SUM(CASE WHEN b.VEHICLETYPE = 15 THEN b.CARCOUNT ELSE 0 END) AS VEHICLETYPE_15_TOTAL,
-            SUM(CASE WHEN b.VEHICLETYPE = 16 THEN b.CARCOUNT ELSE 0 END) AS VEHICLETYPE_16_TOTAL,
-            SUM(CASE WHEN b.VEHICLETYPE IN (1, 2, 3, 4) THEN b.CARCOUNT ELSE 0 END) AS KECHE_TOTAL,
-            SUM(CASE WHEN b.VEHICLETYPE IN (11, 12, 13, 14, 15, 16) THEN b.CARCOUNT ELSE 0 END) AS HUOCHE_TOTAL,
-            SUM(CASE WHEN b.VEHICLETYPE IN (1, 2, 3, 4,11, 12, 13, 14, 15, 16) THEN b.CARCOUNT ELSE 0 END) AS KEHUO_TOTAL,
-            SUM(b.CARCOUNT) AS TOTAL_CARCOUNT
+        b.CLASSDATE,
+        f.GANTRYHEX,
+        f.ROADNAME,
+        f.SUBCOMNAME,
+        f.NAME,
+        f.FXPOINTNAME,
+        f.ID,
+        SUM(CASE WHEN b.VEHICLETYPE = 1 THEN b.CARCOUNT ELSE 0 END) AS VEHICLETYPE_1_TOTAL,
+        SUM(CASE WHEN b.VEHICLETYPE = 2 THEN b.CARCOUNT ELSE 0 END) AS VEHICLETYPE_2_TOTAL,
+        SUM(CASE WHEN b.VEHICLETYPE = 3 THEN b.CARCOUNT ELSE 0 END) AS VEHICLETYPE_3_TOTAL,
+        SUM(CASE WHEN b.VEHICLETYPE = 4 THEN b.CARCOUNT ELSE 0 END) AS VEHICLETYPE_4_TOTAL,
+        SUM(CASE WHEN b.VEHICLETYPE IN (11,21) THEN b.CARCOUNT ELSE 0 END) AS VEHICLETYPE_11_TOTAL,
+        SUM(CASE WHEN b.VEHICLETYPE IN (12,22) THEN b.CARCOUNT ELSE 0 END) AS VEHICLETYPE_12_TOTAL,
+        SUM(CASE WHEN b.VEHICLETYPE IN (13,23) THEN b.CARCOUNT ELSE 0 END) AS VEHICLETYPE_13_TOTAL,
+        SUM(CASE WHEN b.VEHICLETYPE IN (14,24) THEN b.CARCOUNT ELSE 0 END) AS VEHICLETYPE_14_TOTAL,
+        SUM(CASE WHEN b.VEHICLETYPE IN (15,25) THEN b.CARCOUNT ELSE 0 END) AS VEHICLETYPE_15_TOTAL,
+        SUM(CASE WHEN b.VEHICLETYPE IN (16,26) THEN b.CARCOUNT ELSE 0 END) AS VEHICLETYPE_16_TOTAL,
+        SUM(CASE WHEN b.VEHICLETYPE IN (1, 2, 3, 4) THEN b.CARCOUNT ELSE 0 END) AS KECHE_TOTAL,
+        SUM(CASE WHEN b.VEHICLETYPE IN (11, 12, 13, 14, 15, 16,21,22,23,24,25,26) THEN b.CARCOUNT ELSE 0 END) AS HUOCHE_TOTAL,
+        SUM(CASE WHEN b.VEHICLETYPE IN (1, 2, 3, 4,11, 12, 13, 14, 15, 16,21,22,23,24,25,26) THEN b.CARCOUNT ELSE 0 END) AS KEHUO_TOTAL,
+        SUM(b.CARCOUNT) AS TOTAL_CARCOUNT
         FROM bb_gantry_stat b
-                 INNER JOIN FOLLOW_GANTRY_TABLE f ON b.GANTRYHEX = f.GANTRYHEX
+        INNER JOIN FOLLOW_GANTRY_TABLE f ON b.GANTRYHEX = f.GANTRYHEX
 
         <where>
             <if test="params.dT != null and params.dT != ''">
                 AND b.CLASSDATE =TO_DATE(#{params.dT}, 'yyyy-MM-dd')
 
             </if>
-            <if test="params.upOrDown != null and params.upOrDown != ''">
-                AND b.MEDIATYPE =#{params.upOrDown}
-            </if>
+            <!--            <if test="params.upOrDown != null and params.upOrDown != ''">-->
+            <!--                AND b.MEDIATYPE =#{params.upOrDown}-->
+            <!--            </if>-->
 
-            AND (
-            (b.MEDIATYPE = 1 AND SUBSTR(f.ID, -5,1) = '1')
-            OR (b.MEDIATYPE = 2 AND SUBSTR(f.ID, -5,1) = '2')
-            )
+            <!--            AND (-->
+            <!--            (b.MEDIATYPE = 1 AND SUBSTR(f.ID, -5,1) = '1')-->
+            <!--            OR (b.MEDIATYPE = 2 AND SUBSTR(f.ID, -5,1) = '2')-->
+            <!--            )-->
+
+            <if test="params.upOrDown != null and params.upOrDown != '' and params.upOrDown ==1">
+                AND SUBSTR(f.ID, -5,1) = '1'
+            </if>
+            <if test="params.upOrDown != null and params.upOrDown != '' and params.upOrDown ==2">
+                AND SUBSTR(f.ID, -5,1) = '2'
+            </if>
 
         </where>
 
-        GROUP BY b.CLASSDATE, f.GANTRYHEX, b.MEDIATYPE, f.ROADNAME, f.SUBCOMNAME, f.NAME, f.ID,f.FXPOINTNAME
+        GROUP BY b.CLASSDATE, f.GANTRYHEX,  f.ROADNAME, f.SUBCOMNAME, f.NAME, f.ID,f.FXPOINTNAME
         ORDER BY f.SUBCOMNAME ASC
     </select>
 </mapper>
diff --git a/ETCLaneMonitoringEvaluation/target/classes/version/1.0.5.txt b/ETCLaneMonitoringEvaluation/target/classes/version/1.0.6.txt
similarity index 81%
rename from ETCLaneMonitoringEvaluation/target/classes/version/1.0.5.txt
rename to ETCLaneMonitoringEvaluation/target/classes/version/1.0.6.txt
index 4b0a55c..604a1cd 100644
--- a/ETCLaneMonitoringEvaluation/target/classes/version/1.0.5.txt
+++ b/ETCLaneMonitoringEvaluation/target/classes/version/1.0.6.txt
@@ -5,3 +5,4 @@
 4     2024年09月10日     1.0.3       增加重点关注门架车流量统计页面查询
 5     2024年09月12日     1.0.4       重点关注门架车流量统计页面增加相关联非现点位
 6     2024年09月14日     1.0.5       ETC车辆通行成功率统计查询默认查询三天前数据（汇总数据为保证精准）
+7     2024年09月18日     1.0.6       重点关注门架车流量统计页面将专项作业车车流量，分别加载货车的对应车型中，如21型，加在11型中，以此类推