diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
index 6dd13e1..0be07d0 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
@@ -6906,4 +6906,64 @@ public class WmsEnumUtil {
             return null;
         }
     }
+
+    /**
+     * 仓库健康指标等级
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum HEALTH_INDICATOR_LEVEL {
+        HEALTH(10, "HEALTH", "健康"),
+        SUB_HEALTH(20, "SUB_HEALTH", "亚健康"),
+        NO_HEALTH(30, "NO_HEALTH", "不健康");
+        private int value;
+        private String code;
+        private String description;
+
+        HEALTH_INDICATOR_LEVEL(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
+
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
 }
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsHealthIndicatorReportModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsHealthIndicatorReportModel.java
index 5e0d8f8..e408474 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsHealthIndicatorReportModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsHealthIndicatorReportModel.java
@@ -7,6 +7,7 @@ import lombok.NoArgsConstructor;
 import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * @Description : Wms健康指标报表模型
@@ -25,10 +26,10 @@ public class WmsHealthIndicatorReportModel implements Serializable {
     public String titleName;
 
     @ApiParam(value = "图例集合")
-    public List<String> legendList;
+    public Set<String> legendList;
 
     @ApiParam(value = "X轴数据集合")
-    public List<String> xAxisList;
+    public Set<String> xAxisList;
 
     @ApiParam(value = "图表数据集合")
     public List<Map<String, Object>> seriesDataList;
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicator.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicator.java
index e82b4f0..2ef602d 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicator.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicator.java
@@ -62,4 +62,9 @@ public class WmsHealthIndicator extends BaseBean {
     @ApiParam(value = "指标颜色")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String indicatorColor;
+
+    @Transient
+    @ApiParam(value = "指标测算值")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
+    private Double indicatorCalcValue;
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthVariable.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthVariable.java
index 831993b..d3572e5 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthVariable.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthVariable.java
@@ -56,7 +56,7 @@ public class WmsHealthVariable extends BaseBean {
     @Column(name = "LAST_CALC_TIME")
     @ApiParam(value = "末次计算时间")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
-    private String LastCalcTime;
+    private String lastCalcTime;
 
     @Column(name = "NEXT_CALC_TIME")
     @ApiParam(value = "下次计算时间")
@@ -99,4 +99,9 @@ public class WmsHealthVariable extends BaseBean {
     @ApiParam(value = "脚本编号")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String scriptNo;
+
+    @Column(name = "CALC_WAYS")
+    @ApiParam(value = "测算方式")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String calcWays;
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
index 104f22f..d7ad228 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
@@ -3259,7 +3259,8 @@ public class WmsHqlPack {
     public static DdlPackBean packHqlWmsHealthIndicator(WmsHealthIndicator healthIndicator) {
         DdlPackBean result = new DdlPackBean();
         DdlPreparedPack.getStringEqualPack(healthIndicator.getIndicatorCode(), "indicatorCode", result);
-        DdlPreparedPack.getStringEqualPack(healthIndicator.getGroupName(), "groupName", result);
+        DdlPreparedPack.getStringLikerPack(healthIndicator.getIndicatorName(), "indicatorName", result);
+        DdlPreparedPack.getStringLikerPack(healthIndicator.getGroupName(), "groupName", result);
         getStringBuilderPack(healthIndicator, result);
         return result;
     }
@@ -3284,6 +3285,7 @@ public class WmsHqlPack {
     public static DdlPackBean packHqlWmsHealthVariable(WmsHealthVariable wmsHealthVariable) {
         DdlPackBean result = new DdlPackBean();
         DdlPreparedPack.getStringEqualPack(wmsHealthVariable.getVariableCode(), "variableCode", result);
+        DdlPreparedPack.getStringLikerPack(wmsHealthVariable.getVariableName(), "variableName", result);
         getStringBuilderPack(wmsHealthVariable, result);
         return result;
     }