diff --git a/order-management-common/src/main/java/com/dxhy/order/utils/CommonUtils.java b/order-management-common/src/main/java/com/dxhy/order/utils/CommonUtils.java
index 78773925..ac055846 100644
--- a/order-management-common/src/main/java/com/dxhy/order/utils/CommonUtils.java
+++ b/order-management-common/src/main/java/com/dxhy/order/utils/CommonUtils.java
@@ -1132,17 +1132,16 @@ public class CommonUtils {
      * @date 2021-09-07
      */
     public static boolean judgeIsFgTerminalNew(String terminalCode, String fgSkKpShList, String sh) {
-        boolean isSkQd = true;
-//        if (StringUtils.isNotBlank(fgSkKpShList) && StringUtils.isNotBlank(sh)) {
-//            String[] fgSkKpList = fgSkKpShList.split(ConfigureConstant.STRING_POINT2);
-//            for (String fgSkKp : fgSkKpList) {
-//                if (sh.equals(fgSkKp)) {
-//                    isSkQd = true;
-//                    break;
-//                }
-//            }
-//        }
+        if (StringUtils.isNotBlank(fgSkKpShList) && StringUtils.isNotBlank(sh)) {
+            String[] fgSkKpList = fgSkKpShList.split(ConfigureConstant.STRING_POINT2);
+            for (String fgSkKp : fgSkKpList) {
+                if (sh.equals(fgSkKp)) {
+                    return true;
+                }
+            }
+        }
 
+        boolean isSkQd = true;
         return (OrderInfoEnum.TAX_EQUIPMENT_FGBW.getKey().equals(terminalCode) ||
                 OrderInfoEnum.TAX_EQUIPMENT_FGHX.getKey().equals(terminalCode) ||
                 OrderInfoEnum.TAX_EQUIPMENT_FGUKEY.getKey().equals(terminalCode) ||
@@ -1158,17 +1157,15 @@ public class CommonUtils {
      * @date 2021-09-07
      */
     public static boolean judgeIsFgTerminalOld(String terminalCode, String fgSkKpShList, String sh) {
+        if (StringUtils.isNotBlank(fgSkKpShList) && StringUtils.isNotBlank(sh)) {
+            String[] fgSkKpList = fgSkKpShList.split(ConfigureConstant.STRING_POINT2);
+            for (String fgSkKp : fgSkKpList) {
+                if (sh.equals(fgSkKp)) {
+                    return  true;
+                }
+            }
+        }
         boolean isSkQd = false;
-//        if (StringUtils.isNotBlank(fgSkKpShList) && StringUtils.isNotBlank(sh)) {
-//            String[] fgSkKpList = fgSkKpShList.split(ConfigureConstant.STRING_POINT2);
-//            for (String fgSkKp : fgSkKpList) {
-//                if (sh.equals(fgSkKp)) {
-//                    isSkQd = true;
-//                    break;
-//                }
-//            }
-//        }
-
         return (OrderInfoEnum.TAX_EQUIPMENT_FGBW.getKey().equals(terminalCode) ||
                 OrderInfoEnum.TAX_EQUIPMENT_FGHX.getKey().equals(terminalCode) ||
                 OrderInfoEnum.TAX_EQUIPMENT_FGUKEY.getKey().equals(terminalCode) ||
diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/FangGeInterfaceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/FangGeInterfaceServiceImpl.java
index 9eee1c09..5a4cc5e7 100644
--- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/FangGeInterfaceServiceImpl.java
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/FangGeInterfaceServiceImpl.java
@@ -3021,17 +3021,7 @@ public class FangGeInterfaceServiceImpl implements FangGeInterfaceService {
             log.info("{}请求税控设备类型为:{}", LOGGER_MSG, terminalCode);
             FgEnterpriseInfoBo fgEnterpriseInfoBo = new FgEnterpriseInfoBo();
             fgEnterpriseInfoBo.setSKSBCODE(terminalCode);
-            boolean isSkQd = false;
-            if (StringUtils.isNotBlank(fgSkKpShList) && StringUtils.isNotBlank(sh)) {
-                String[] fgSkKpList = fgSkKpShList.split(ConfigureConstant.STRING_POINT2);
-                for (String fgSkKp : fgSkKpList) {
-                    if (sh.equals(fgSkKp)) {
-                        isSkQd = true;
-                        break;
-                    }
-                }
-            }
-            fgEnterpriseInfoBo.setKPFS(!isSkQd? FANGGE_INVOICE_TYPE_1.getKey():FANGGE_INVOICE_TYPE_0.getKey());
+            fgEnterpriseInfoBo.setKPFS(CommonUtils.judgeIsFgTerminalNew(terminalCode,fgSkKpShList,sh)? FANGGE_INVOICE_TYPE_1.getKey():FANGGE_INVOICE_TYPE_0.getKey());
             fgOrderResponse.setData(fgEnterpriseInfoBo);
         } catch (Exception e) {
             fgOrderResponse.setSTATUS_CODE(OrderInfoContentEnum.INVOICE_STAT_ERROR.getKey());