diff --git a/cds-fontend-2025.V1/src/views/mps/detail-entry/modules/detail-entry-search.vue b/cds-fontend-2025.V1/src/views/mps/detail-entry/modules/detail-entry-search.vue
index bc4c957..584676e 100644
--- a/cds-fontend-2025.V1/src/views/mps/detail-entry/modules/detail-entry-search.vue
+++ b/cds-fontend-2025.V1/src/views/mps/detail-entry/modules/detail-entry-search.vue
@@ -35,7 +35,7 @@ async function getSubcategoryOptions() {
   if (!error) {
     subcategoryIdOptions.value = data.map(item => ({
       label: item.name,
-      value: item.id
+      value: item.typeId
     }));
   }
 }
diff --git a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/original/domain/vo/OriginalWaterImportVo.java b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/original/domain/vo/OriginalWaterImportVo.java
index d7431ba..7b1c69a 100644
--- a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/original/domain/vo/OriginalWaterImportVo.java
+++ b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/original/domain/vo/OriginalWaterImportVo.java
@@ -4,6 +4,7 @@ import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Pattern;
 import org.dromara.common.excel.annotation.ExcelDictFormat;
 import org.dromara.common.excel.annotation.ExcelRequired;
@@ -168,7 +169,8 @@ public class OriginalWaterImportVo implements Serializable {
      * 缴费日期
      */
     @ExcelProperty(value = "缴费日期")
-    @Pattern(message = "缴费日期错误", regexp = "^\\d{4}(-?)(0[1-9]|1[0-2])\\1(0[1-9]|[12][0-9]|3[01])$")
+//    @Pattern(message = "缴费日期错误", regexp = "^\\d{4}(-?)(0[1-9]|1[0-2])\\1(0[1-9]|[12][0-9]|3[01])$")
+    @NotNull(message = "缴费日期不能为空")
     private String paymentDate;
 
     /**
@@ -189,6 +191,7 @@ public class OriginalWaterImportVo implements Serializable {
      * 计价月份
      */
     @ExcelProperty(value = "计价月份")
+    @NotBlank(message = "计价月份不能为空")
     private String importTime;