diff --git a/src/main/java/com/whdc/zhdbaqapi/model/entity/DeviceInfo.java b/src/main/java/com/whdc/zhdbaqapi/model/entity/DeviceInfo.java
index d7852be..626c98c 100644
--- a/src/main/java/com/whdc/zhdbaqapi/model/entity/DeviceInfo.java
+++ b/src/main/java/com/whdc/zhdbaqapi/model/entity/DeviceInfo.java
@@ -344,6 +344,7 @@ public class DeviceInfo implements Serializable {
     @ApiParam(value = "埋设高程（m）")
     @ApiModelProperty(value = "埋设高程（m）", dataType = "java.math.BigDecimal")
     @Excel(name = "埋设高程（m）")
+    @NotNull(message = "埋设高程必填")
     @TableField("EMBEDDING_ELEVATION")
     private BigDecimal embeddingElevation;
 
@@ -530,4 +531,14 @@ public class DeviceInfo implements Serializable {
     @Excel(name = "埋设示意图说明", type = 2, savePath = "img")
     @TableField(exist = false)
     private String picPath;
+
+    @ApiParam(value = "管口高程")
+    @ApiModelProperty(value = "管口高程", dataType = "java.lang.Double")
+    @TableField("PIPE_TOP_HEIGHT")
+    private Double pipeTopHeight;
+
+    @ApiParam(value = "管底高程")
+    @ApiModelProperty(value = "管底高程", dataType = "java.lang.Double")
+    @TableField("PIPE_BOTTOM_HEIGHT")
+    private Double pipeBottomHeight;
 }
diff --git a/src/main/java/com/whdc/zhdbaqapi/service/impl/DeviceDataServiceImpl.java b/src/main/java/com/whdc/zhdbaqapi/service/impl/DeviceDataServiceImpl.java
index 9bed68b..57d4ea7 100644
--- a/src/main/java/com/whdc/zhdbaqapi/service/impl/DeviceDataServiceImpl.java
+++ b/src/main/java/com/whdc/zhdbaqapi/service/impl/DeviceDataServiceImpl.java
@@ -155,7 +155,12 @@ public class DeviceDataServiceImpl extends ServiceImpl<DeviceDataMapper, DeviceD
 //                        dd.setPipeZ(decimal.multiply(BigDecimal.valueOf(o_z_modulus)));
                         //加“渗压计到孔底距离”，浮点（三位小数）同步数据时计算出的管水位加上这个数值
                         // 2022-10-08 lyf
-                        dd.setPipeZ(decimal.multiply(BigDecimal.valueOf(o_z_modulus)).add(BigDecimal.valueOf(di.getDistFromOsmosisMeterToBottom())));
+//                        dd.setPipeZ(decimal.multiply(BigDecimal.valueOf(o_z_modulus)).add(BigDecimal.valueOf(di.getDistFromOsmosisMeterToBottom())));
+                        // 2022-10-27 lyf
+                        //修改渗压入库公式：在计算时，用“埋设高程”代替“渗压计到孔底距离”字段
+                        System.out.println("修改渗压入库公式：在计算时，用“埋设高程”代替“渗压计到孔底距离”字段");
+                        System.out.println(di.getStationCode() + "---" + di.getEmbeddingElevation());
+                        dd.setPipeZ(decimal.multiply(BigDecimal.valueOf(o_z_modulus)).add(di.getEmbeddingElevation()));
                     }
 
                     if (super.save(dd)) {
diff --git a/src/main/resources/mapper/DeviceInfoMapper.xml b/src/main/resources/mapper/DeviceInfoMapper.xml
index 7de48c6..e96a96a 100644
--- a/src/main/resources/mapper/DeviceInfoMapper.xml
+++ b/src/main/resources/mapper/DeviceInfoMapper.xml
@@ -21,7 +21,7 @@
 
     <select id="listAll" resultType="com.whdc.zhdbaqapi.model.entity.DeviceInfo">
         SELECT ID, DEVICE_ID, STATION_CODE, CHANNEL_NUM, LATEST_REPORTING_TIME, TEMPERATURE_K, START_TEMPERATURE,
-        CALIBRATION_COEFFICIENT, INITIAL_READING, DIST_FROM_OSMOSIS_METER_TO_BOTTOM
+        CALIBRATION_COEFFICIENT, INITIAL_READING, DIST_FROM_OSMOSIS_METER_TO_BOTTOM, EMBEDDING_ELEVATION
         FROM DEVICE_INFO
         WHERE DEL = 0
     </select>
@@ -43,6 +43,8 @@
         <if test="obj.stationCode != null and obj.stationCode != '' ">
             AND STATION_CODE LIKE CONCAT('%', #{obj.stationCode}, '%')
         </if>
+
+        ORDER BY STATION_CODE ASC
     </select>
 
     <select id="listBySC" resultType="com.whdc.zhdbaqapi.model.entity.DeviceInfo">