diff --git a/backend/lpg/src/main/java/com/hotent/lpg/controller/pt/PtQpxxConroller.java b/backend/lpg/src/main/java/com/hotent/lpg/controller/pt/PtQpxxConroller.java
index fed8ed6..b1810ed 100644
--- a/backend/lpg/src/main/java/com/hotent/lpg/controller/pt/PtQpxxConroller.java
+++ b/backend/lpg/src/main/java/com/hotent/lpg/controller/pt/PtQpxxConroller.java
@@ -22,14 +22,14 @@ public class PtQpxxConroller {
 
 
     /**
-     * 根据id获取订单数据详情
+     * 气瓶地图：查询所有气瓶并分为三种状态：1.属于本厂站并在本厂站的气瓶 2.属于本厂站在会员或其他厂站的气瓶 3.不属于本厂站在本厂站的气瓶
      *
      * @param qyId 企业ID，用于指定需要查询的企业
      * @param qzId 证件ID，用于指定需要查询的证件
      * @return 返回一个CommonResult对象，其中包含查询结果或错误信息
      */
     @GetMapping(value = "/qpMap")
-    @ApiOperation(value = "根据id获取订单数据详情", httpMethod = "GET", notes = "根据id获取订单数据详情")
+    @ApiOperation(value = "气瓶地图", httpMethod = "GET", notes = "气瓶地图")
     public CommonResult<Object> qpMap(String qyId, String qzId) {
         Object result = null;
         try {
diff --git a/backend/lpg/src/main/java/com/hotent/lpg/dao/WQpssxxDao.java b/backend/lpg/src/main/java/com/hotent/lpg/dao/WQpssxxDao.java
index 9601955..bfb2d8d 100644
--- a/backend/lpg/src/main/java/com/hotent/lpg/dao/WQpssxxDao.java
+++ b/backend/lpg/src/main/java/com/hotent/lpg/dao/WQpssxxDao.java
@@ -5,8 +5,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hotent.lpg.common.model.WQpssxx;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hotent.lpg.common.model.WQpxx;
+import com.hotent.lpg.model.vo.QpdtVo;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 气瓶实时信息 Mapper 接口
  *
@@ -17,4 +20,6 @@ import org.apache.ibatis.annotations.Param;
 public interface WQpssxxDao extends BaseMapper<WQpssxx> {
 
     IPage<WQpssxx> inHandQpPage(Page page, @Param("query") WQpxx wQpxx);
+
+    List<QpdtVo> getTypethree(String czId);
 }
diff --git a/backend/lpg/src/main/java/com/hotent/lpg/manager/WQpssxxManager.java b/backend/lpg/src/main/java/com/hotent/lpg/manager/WQpssxxManager.java
index ab72b02..ac6e9c8 100644
--- a/backend/lpg/src/main/java/com/hotent/lpg/manager/WQpssxxManager.java
+++ b/backend/lpg/src/main/java/com/hotent/lpg/manager/WQpssxxManager.java
@@ -6,6 +6,9 @@ import com.hotent.lpg.common.model.WQpssxx;
 import com.hotent.base.manager.BaseManager;
 import com.hotent.lpg.common.model.WQpxx;
 import com.hotent.lpg.model.dto.QpssxxDto;
+import com.hotent.lpg.model.vo.QpdtVo;
+
+import java.util.List;
 
 /**
  * 气瓶实时信息 服务类
@@ -50,4 +53,6 @@ public interface WQpssxxManager extends BaseManager<WQpssxx> {
 	 * @return
 	 */
     IPage<WQpssxx> inHandQpPage(Page page, WQpxx wQpxx);
+
+    List<QpdtVo> getTypethree(String czId);
 }
diff --git a/backend/lpg/src/main/java/com/hotent/lpg/manager/WQpxxManager.java b/backend/lpg/src/main/java/com/hotent/lpg/manager/WQpxxManager.java
index 395f10c..95224c8 100644
--- a/backend/lpg/src/main/java/com/hotent/lpg/manager/WQpxxManager.java
+++ b/backend/lpg/src/main/java/com/hotent/lpg/manager/WQpxxManager.java
@@ -66,7 +66,8 @@ public interface WQpxxManager extends BaseManager<WQpxx> {
 
 	/**
 	 * 气瓶地图
-	 * @param qzmc
+	 * @param qyId
+	 * @param qzId
 	 * @return
 	 */
     Object qpMap(String qyId, String qzId);
diff --git a/backend/lpg/src/main/java/com/hotent/lpg/manager/impl/WQpssxxManagerImpl.java b/backend/lpg/src/main/java/com/hotent/lpg/manager/impl/WQpssxxManagerImpl.java
index dd83783..c156f22 100644
--- a/backend/lpg/src/main/java/com/hotent/lpg/manager/impl/WQpssxxManagerImpl.java
+++ b/backend/lpg/src/main/java/com/hotent/lpg/manager/impl/WQpssxxManagerImpl.java
@@ -17,6 +17,7 @@ import com.hotent.lpg.common.model.*;
 import com.hotent.lpg.dao.WQpssxxDao;
 import com.hotent.lpg.manager.*;
 import com.hotent.lpg.model.dto.QpssxxDto;
+import com.hotent.lpg.model.vo.QpdtVo;
 import com.hotent.lpg.model.vo.QpxxVo;
 import com.hotent.lpg.util.SynQpxxUtil;
 import com.hotent.uc.util.ContextUtil;
@@ -183,6 +184,11 @@ public class WQpssxxManagerImpl extends BaseManagerImpl<WQpssxxDao, WQpssxx> imp
         return baseMapper.inHandQpPage(page, wQpxx);
     }
 
+    @Override
+    public List<QpdtVo> getTypethree(String czId) {
+        return baseMapper.getTypethree(czId);
+    }
+
     /**
      * 构造充装信息
      *
diff --git a/backend/lpg/src/main/java/com/hotent/lpg/manager/impl/WQpxxManagerImpl.java b/backend/lpg/src/main/java/com/hotent/lpg/manager/impl/WQpxxManagerImpl.java
index a5d2cfd..96afa87 100644
--- a/backend/lpg/src/main/java/com/hotent/lpg/manager/impl/WQpxxManagerImpl.java
+++ b/backend/lpg/src/main/java/com/hotent/lpg/manager/impl/WQpxxManagerImpl.java
@@ -529,10 +529,10 @@ public class WQpxxManagerImpl extends BaseManagerImpl<WQpxxDao, WQpxx> implement
                 map.put("qzmc", v.get(0).getFSsczmc());
                 map.put("qzid", v.get(0).getFSsczid());
                 //本厂站气瓶还在本厂站的气瓶
-                List<QpdtVo> typeone_collect = v.stream().filter(a -> a.getFSsczid().equals(a.getFCyczID()) && "厂站".equals(a.getFCyzlx())).collect(Collectors.toList());
+                List<QpdtVo> typeone_collect = v.stream().filter(a -> k.equals(a.getFCyczID()) && "厂站".equals(a.getFCyzlx())).collect(Collectors.toList());
                 //本厂站气瓶不在本厂站的气瓶（在会员手中或者在其他厂站中）
-                List<QpdtVo> typetwo_collect = v.stream().filter(a -> "会员".equals(a.getFCyzlx()) || !a.getFSsczid().equals(a.getFCyczID())).collect(Collectors.toList());
-                typetwoHandler(typetwo_collect);
+                List<QpdtVo> typetwo_collect = v.stream().filter(a -> "会员".equals(a.getFCyzlx()) || !k.equals(a.getFCyczID())).collect(Collectors.toList());
+//                typetwoHandler(typetwo_collect);
                 //其他厂站在本厂站的气瓶
                 List<QpdtVo> typethree_collect = getTypethreeCollect(k);
                 map.put("typeone", typeone_collect);
@@ -1045,31 +1045,33 @@ public class WQpxxManagerImpl extends BaseManagerImpl<WQpxxDao, WQpxx> implement
      * @return
      */
     private List<QpdtVo> getTypethreeCollect(String k) {
-        List<WQpssxx> wQpssxxList = wQpssxxManager.list(Wrappers.<WQpssxx>lambdaQuery().eq(WQpssxx::getFCyzlx, "厂站").eq(WQpssxx::getFCyczid, k));
-        List<QpdtVo> typethree_collect = new ArrayList<>();
-        for (WQpssxx wQpssxx : wQpssxxList) {
-            WQpxx wQpxx = baseMapper.selectById(wQpssxx.getFQpid());
-            if (wQpxx == null || k.equals(wQpxx.getFSsczid())) {
-                log.info("气瓶信息不存在或者气瓶属于本厂站，气瓶id={}，气瓶条码={}", wQpssxx.getFQpid(), wQpssxx.getFQptm());
-                continue;
-            }
-            QpdtVo qpdtVo = new QpdtVo();
-            qpdtVo.setId(wQpssxx.getFQpid());
-            qpdtVo.setFQptm(wQpssxx.getFQptm());
-            qpdtVo.setFQpgslx(wQpxx.getFQpgslx());
-            qpdtVo.setFSsqyID(wQpxx.getFSsqyid());
-            qpdtVo.setFSsczid(wQpxx.getFSsczid());
-            qpdtVo.setFSsqymc(wQpxx.getFSsqymc());
-            qpdtVo.setFSsczmc(wQpxx.getFSsczmc());
-            qpdtVo.setFCyzlx(wQpssxx.getFCyzlx());
-            qpdtVo.setFCyczID(wQpssxx.getFCyczid());
-            qpdtVo.setFCyyhID(wQpssxx.getFCyyhid());
-            qpdtVo.setFJd(wQpssxx.getFJd());
-            qpdtVo.setFWd(wQpssxx.getFWd());
-            qpdtVo.setFDz(wQpssxx.getFDqsf() + wQpssxx.getFDqs() + wQpssxx.getFDqq() + wQpssxx.getFDqjd() + wQpssxx.getFDqxxdz());
-            typethree_collect.add(qpdtVo);
-        }
-        return typethree_collect;
+        List<QpdtVo> list = wQpssxxManager.getTypethree(k);
+        return list;
+//        List<WQpssxx> wQpssxxList = wQpssxxManager.list(Wrappers.<WQpssxx>lambdaQuery().eq(WQpssxx::getFCyzlx, "厂站").eq(WQpssxx::getFCyczid, k));
+//        List<QpdtVo> typethree_collect = new ArrayList<>();
+//        for (WQpssxx wQpssxx : wQpssxxList) {
+//            WQpxx wQpxx = baseMapper.selectById(wQpssxx.getFQpid());
+//            if (wQpxx == null || k.equals(wQpxx.getFSsczid())) {
+////                log.info("气瓶信息不存在或者气瓶属于本厂站，气瓶id={}，气瓶条码={}", wQpssxx.getFQpid(), wQpssxx.getFQptm());
+//                continue;
+//            }
+//            QpdtVo qpdtVo = new QpdtVo();
+//            qpdtVo.setId(wQpssxx.getFQpid());
+//            qpdtVo.setFQptm(wQpssxx.getFQptm());
+//            qpdtVo.setFQpgslx(wQpxx.getFQpgslx());
+//            qpdtVo.setFSsqyID(wQpxx.getFSsqyid());
+//            qpdtVo.setFSsczid(wQpxx.getFSsczid());
+//            qpdtVo.setFSsqymc(wQpxx.getFSsqymc());
+//            qpdtVo.setFSsczmc(wQpxx.getFSsczmc());
+//            qpdtVo.setFCyzlx(wQpssxx.getFCyzlx());
+//            qpdtVo.setFCyczID(wQpssxx.getFCyczid());
+//            qpdtVo.setFCyyhID(wQpssxx.getFCyyhid());
+//            qpdtVo.setFJd(wQpssxx.getFJd());
+//            qpdtVo.setFWd(wQpssxx.getFWd());
+//            qpdtVo.setFDz(wQpssxx.getFDqsf() + wQpssxx.getFDqs() + wQpssxx.getFDqq() + wQpssxx.getFDqjd() + wQpssxx.getFDqxxdz());
+//            typethree_collect.add(qpdtVo);
+//        }
+//        return typethree_collect;
     }
 
     /**
diff --git a/backend/lpg/src/main/resources/mapper/WQpssxxMapper.xml b/backend/lpg/src/main/resources/mapper/WQpssxxMapper.xml
index 5530db1..17a40bb 100644
--- a/backend/lpg/src/main/resources/mapper/WQpssxxMapper.xml
+++ b/backend/lpg/src/main/resources/mapper/WQpssxxMapper.xml
@@ -191,4 +191,27 @@
         </if>
         ) temp ORDER BY temp.orderType ASC
     </select>
+
+    <select id="getTypethree" resultType="com.hotent.lpg.model.vo.QpdtVo">
+        select
+            w_qpxx.id_ AS id,
+            w_qpxx.f_qptm AS fQptm,
+            w_qpxx.F_qpgslx AS fQpgslx,
+            w_qpxx.F_ssqyID AS fSsqyID,
+            w_qpxx.f_ssczid AS fSsczid,
+            w_qpxx.F_ssqymc AS fSsqymc,
+            w_qpxx.F_ssczmc AS fSsczmc,
+            w_qpssxx.F_cyzlx AS fCyzlx,
+            w_qpssxx.F_cyyhID AS fCyyhID,
+            w_qpssxx.F_cyczID AS fCyczID,
+            w_qpssxx.F_jd AS fJd,
+            w_qpssxx.F_wd AS fWd,
+            concat (F_dqsf,F_dqs,F_dqq,F_dqjd,F_dqxxdz) as fDz,
+            w_czxx.F_czmc as fXzczmc,
+            w_qpssxx.F_qplzID as fQplzId
+                from w_qpssxx w_qpssxx
+                inner join w_qpxx w_qpxx on w_qpxx.ID_  = w_qpssxx.F_qpID
+                left join w_czxx w_czxx on w_czxx.ID_ = w_qpssxx.F_cyczID and w_qpssxx.F_cyzlx = '厂站'
+                where w_qpssxx.F_cyczID = #{czId} and w_qpssxx.F_cyczID != w_qpxx.F_ssczID
+    </select>
 </mapper>
diff --git a/backend/lpg/src/main/resources/mapper/WQpxxMapper.xml b/backend/lpg/src/main/resources/mapper/WQpxxMapper.xml
index 8536611..13b8e06 100644
--- a/backend/lpg/src/main/resources/mapper/WQpxxMapper.xml
+++ b/backend/lpg/src/main/resources/mapper/WQpxxMapper.xml
@@ -148,30 +148,38 @@
 
     <select id="qpMap" resultType="com.hotent.lpg.model.vo.QpdtVo">
         select
-            wq.id_ AS id,
-            wq.f_qptm AS fQptm,
-            wq.F_qpgslx AS fQpgslx,
-            wq.F_ssqyID AS fSsqyID,
-            wq.f_ssczid AS fSsczid,
-            wq.F_ssqymc AS fSsqymc,
-            wq.F_ssczmc AS fSsczmc,
-            wq2.F_cyzlx AS fCyzlx,
-            wq2.F_cyyhID AS fCyyhID,
-            wq2.F_cyczID AS fCyczID,
-            wq2.F_jd AS fJd,
-            wq2.F_wd AS fWd,
+            w_qpxx.id_ AS id,
+            w_qpxx.f_qptm AS fQptm,
+            w_qpxx.F_qpgslx AS fQpgslx,
+            w_qpxx.F_ssqyID AS fSsqyID,
+            w_qpxx.f_ssczid AS fSsczid,
+            w_qpxx.F_ssqymc AS fSsqymc,
+            w_qpxx.F_ssczmc AS fSsczmc,
+            w_qpssxx.F_cyzlx AS fCyzlx,
+            w_qpssxx.F_cyyhID AS fCyyhID,
+            w_qpssxx.F_cyczID AS fCyczID,
+            w_qpssxx.F_jd AS fJd,
+            w_qpssxx.F_wd AS fWd,
             concat (F_dqsf,F_dqs,F_dqq,F_dqjd,F_dqxxdz) as fDz,
-            wc.F_czmc as fXzczmc,
-            wq2.F_qplzID as fQplzId
-                from w_qpxx wq
-                inner join w_qpssxx wq2 on wq.ID_  = wq2.F_qpID
-                left join w_czxx wc on wc.ID_ = wq2.F_cyczID and wq2.F_cyzlx = '厂站'
+            w_czxx.F_czmc as fXzczmc,
+            w_qpssxx.F_qplzID as fQplzId,
+            w_dd.F_hymc as hymc,
+            w_dd.F_hydh as hydh,
+            w_dd.F_psrmc as psy,
+            w_dd.F_dddh as dddh,
+            w_dd.F_cjsj as xdsj
+                from w_qpxx w_qpxx
+                inner join w_qpssxx w_qpssxx on w_qpxx.ID_  = w_qpssxx.F_qpID
+                left join w_czxx w_czxx on w_czxx.ID_ = w_qpxx.F_ssczID
+                left join w_ddpsxq w_ddpsxq on w_ddpsxq.F_qplzID = w_qpssxx.F_qplzID
+                left join w_dd w_dd on w_dd.id_ = w_ddpsxq.F_ddID
+
             <where>
                 <if test="qyId != null and qyId != ''">
-                    and wq.F_ssqyID = #{qyId}
+                    and w_qpxx.F_ssqyID = #{qyId}
                 </if>
                 <if test="qzId != null and qzId != ''">
-                    and wq.F_ssczID = #{qzId}
+                    and w_qpxx.F_ssczID = #{qzId}
                 </if>
             </where>
     </select>
--
libgit2 0.21.2