diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index 8236dc7..8172c41 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -701,7 +701,7 @@
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceService.getH2slist(dataScope, page, keywords, beginTime, endTime, deptid);
         super.exportExcel(H2SDataDto.class, page.getRecords(), DeviceExportEnum.H2S_EXPORT.getFileName());
     }
 

diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index 8236dc7..8172c41 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -701,7 +701,7 @@
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceService.getH2slist(dataScope, page, keywords, beginTime, endTime, deptid);
         super.exportExcel(H2SDataDto.class, page.getRecords(), DeviceExportEnum.H2S_EXPORT.getFileName());
     }
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index 53bb6bd..b0dd8a8 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -687,7 +687,7 @@
                     h2sDataDto -> {
                         h2sDataDto.setDeptName(permissionService.getDeptService().getDeptName(h2sDataDto.getDeptid()));
                         h2sDataDto.setStrength(!StringUtils.isEmpty(h2sDataDto.getStrength()) &&
-                                Float.valueOf(h2sDataDto.getStrength()) >= 100 ? "浓度溢出" : h2sDataDto.getStrength());
+                                Float.parseFloat(h2sDataDto.getStrength()) >= 100 ? "浓度溢出" : h2sDataDto.getStrength());
                     }
             );
             page.setRecords(h2sDataDtoList);
@@ -696,7 +696,7 @@
             responseData.setMessage("查询成功");
         } catch (DataAccessException dex) {
             log.error("主题：硫化氢数据库异常，关键字{}，开始时间{}，结束时间{}，部门编号{}，异常信息{}",
-                    keywords, beginTime, endTime, deptid, dex);
+                    keywords, beginTime, endTime, deptid, dex.getMessage());
             responseData.setCode(500);
             responseData.setMessage("数据库查询异常");
         }