diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditPlacePatrolReviewRecordFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditPlacePatrolReviewRecordFormDTO.java
index 4ac48b29a6..28ead867fe 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditPlacePatrolReviewRecordFormDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditPlacePatrolReviewRecordFormDTO.java
@@ -73,13 +73,11 @@ public class EditPlacePatrolReviewRecordFormDTO implements Serializable {
     /**
      * 安全隐患类型
      */
-    @NotBlank(message = "安全隐患类型不能为空", groups = {EditPlacePatrolReviewRecordFormDTO.Edit.class})
     private String dangerType;
 
     /**
      * 安全隐患名称
      */
-    @NotBlank(message = "安全隐患名称不能为空", groups = {EditPlacePatrolReviewRecordFormDTO.Edit.class})
     private String dangerName;
 
     public interface Edit { }
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GetListPlaceOrgFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GetListPlaceOrgFormDTO.java
index 5b2d05a486..06eb92ebd9 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GetListPlaceOrgFormDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GetListPlaceOrgFormDTO.java
@@ -56,5 +56,9 @@ public class GetListPlaceOrgFormDTO implements Serializable {
     private String staffId;
     //token中userId所属组织
     private String agencyId;
+    //是否存在隐患  0 消除隐患  1 存在隐患  该参数可不传
+    private Integer danger;
+    //是否是重点企业
+    private Boolean securityFlag;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPlaceOrgController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPlaceOrgController.java
index 135365b8b0..57a1013773 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPlaceOrgController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPlaceOrgController.java
@@ -133,15 +133,16 @@ public class IcPlaceOrgController {
     }
 
     /**
-    * @description 灵山大屏存在隐患获取企业信息
-    * @throws
-    * @author yan Lu
-    * @date 2023/5/30 17:21
-    */
+     * @throws
+     * @description 灵山大屏存在隐患获取企业信息
+     * @author yan Lu
+     * @date 2023/5/30 17:21
+     */
     @GetMapping("getPlaceOrgByDanger")
     public Result<List<PlaceOrgDetailResultDTO>> getPlaceOrgByDanger(@RequestParam("orgId") String orgId,
-                                                           @RequestParam("orgType") String orgType){
-        return new Result().ok(placeOrgService.getPlaceOrgByDanger(orgId, orgType));
+                                                                     @RequestParam("orgType") String orgType,
+                                                                     @RequestParam("danger") Integer danger) {
+        return new Result().ok(placeOrgService.getPlaceOrgByDanger(orgId, orgType, danger));
     }
 
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPlaceOrgDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPlaceOrgDao.java
index fab9b10d17..54b6995f47 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPlaceOrgDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPlaceOrgDao.java
@@ -43,9 +43,9 @@ public interface IcPlaceOrgDao extends BaseDao<IcPlaceOrgEntity> {
      **/
     List<PlaceOrgDetailResultDTO> getList(GetListPlaceOrgFormDTO formDTO);
 
-    List<PlaceOrgByTypeResultDTO> getPlaceOrgByType(@Param("orgId")String orgId,@Param("orgType")String orgType);
+    List<PlaceOrgByTypeResultDTO> getPlaceOrgByType(@Param("orgId") String orgId, @Param("orgType") String orgType);
 
-    IcPlaceOrgStatistics countPlaceOrgByDangerType(@Param("orgId")String orgId,@Param("orgType")String orgType);
+    IcPlaceOrgStatistics countPlaceOrgByDangerType(@Param("orgId") String orgId, @Param("orgType") String orgType);
 
-    List<PlaceOrgDetailResultDTO> getPlaceOrgByDanger(@Param("orgId")String orgId,@Param("orgType")String orgType);
+    List<PlaceOrgDetailResultDTO> getPlaceOrgByDanger(@Param("orgId") String orgId, @Param("orgType") String orgType, @Param("danger") Integer danger);
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPlaceOrgService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPlaceOrgService.java
index f1d663705e..b112a75290 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPlaceOrgService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPlaceOrgService.java
@@ -71,5 +71,5 @@ public interface IcPlaceOrgService extends BaseService<IcPlaceOrgEntity> {
 
     IcPlaceOrgStatistics countPlaceOrgByDangerType(String orgId, String orgType);
 
-    List<PlaceOrgDetailResultDTO> getPlaceOrgByDanger(String orgId, String orgType);
+    List<PlaceOrgDetailResultDTO> getPlaceOrgByDanger(String orgId, String orgType, Integer danger);
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlaceOrgServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlaceOrgServiceImpl.java
index 09e495b245..3ddacf02f7 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlaceOrgServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlaceOrgServiceImpl.java
@@ -216,8 +216,8 @@ public class IcPlaceOrgServiceImpl extends BaseServiceImpl<IcPlaceOrgDao, IcPlac
     }
 
     @Override
-    public List<PlaceOrgDetailResultDTO> getPlaceOrgByDanger(String orgId, String orgType) {
-        return baseDao.getPlaceOrgByDanger(orgId, orgType);
+    public List<PlaceOrgDetailResultDTO> getPlaceOrgByDanger(String orgId, String orgType, Integer danger) {
+        return baseDao.getPlaceOrgByDanger(orgId, orgType, danger);
     }
 
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlaceOrgDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlaceOrgDao.xml
index 3e9eb503af..78d72dfe4a 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlaceOrgDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlaceOrgDao.xml
@@ -26,6 +26,9 @@
         FROM
         ic_place_org a
         LEFT JOIN customer_grid b ON a.GRID_ID = b.ID
+        <if test="null != danger">
+            LEFT JOIN ic_place_patrol_record ppr ON ppr.PLACE_ORG_ID = a.ID
+        </if>
         WHERE
         a.del_flag = '0'
         <if test="placeOrgId != null and placeOrgId.trim() != ''">
@@ -52,6 +55,17 @@
         <if test="scale != null and scale.trim() != ''">
             AND a.scale = #{scale}
         </if>
+        <if test="securityFlag != null and securityFlag == true">
+            AND a.SECURITY_FLAG = #{securityFlag}
+        </if>
+        <if test="null != danger">
+            <if test="danger == 1">
+                AND ppr.FIRST_RESULT = 1
+            </if>
+            <if test="danger == 0">
+                AND ppr.FINAL_RESULT = 0
+            </if>
+        </if>
         ORDER BY a.created_time DESC
     </select>
 
@@ -101,8 +115,8 @@
         (
             SELECT
                 count(r.id) as ridCount,
-                sum(case when r.FIRST_RESULT = 1 then 1 else 0 end) as dangerCount,
-                sum(case when r.FINAL_RESULT = 0 then 1 else 0 end) as removeCount
+                sum(case when r.FINAL_RESULT = 1 then 1 else 0 end) as dangerCount,
+                sum(case when (r.FINAL_RESULT = 0 and r.FINAL_RESULT = 0) then 1 else 0 end) as removeCount
             FROM
                 ic_place_patrol_record r
             <where>
@@ -150,9 +164,15 @@
             AND p.id IN (
                 SELECT r.PLACE_ORG_ID FROM ic_place_patrol_record r
                 <where>
-                    r.FINAL_RESULT = 1 and r.DEL_FLAG = 0
+                    r.DEL_FLAG = 0
+                    <if test="null != danger and danger == 0">
+                        AND r.FINAL_RESULT = 0
+                    </if>
+                    <if test="null != danger and danger == 1">
+                        AND r.FIRST_RESULT = 1
+                    </if>
                     <if test="null != orgType and orgType !=''">
-                        <if test="null != orgId and orgId != '' and orgType == 'agancy'">
+                        <if test="null != orgId and orgId != '' and orgType == 'agency'">
                             AND r.agency_id = #{orgId}
                         </if>
                         <if test="null != orgId and orgId != '' and orgType == 'grid'">
@@ -160,9 +180,10 @@
                         </if>
                     </if>
                 </where>
+                GROUP BY r.PLACE_ORG_ID
             )
             <if test="null != orgType and orgType !=''">
-                <if test="null != orgId and orgId != '' and orgType == 'agancy'">
+                <if test="null != orgId and orgId != '' and orgType == 'agency'">
                     AND p.agency_id = #{orgId}
                 </if>
                 <if test="null != orgId and orgId != '' and orgType == 'grid'">
@@ -170,7 +191,7 @@
                 </if>
             </if>
         </where>
-
+        GROUP BY p.id
 
     </select>
 
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/lingshan/LingshanHelpCrowdSaveFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/lingshan/LingshanHelpCrowdSaveFormDTO.java
index d3e826eb2f..23b01177a7 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/lingshan/LingshanHelpCrowdSaveFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/lingshan/LingshanHelpCrowdSaveFormDTO.java
@@ -139,8 +139,8 @@ public class LingshanHelpCrowdSaveFormDTO {
         /**
          * 最初享受月份
          */
-        @JsonFormat(pattern = "yyyy-MM-dd")
-        @DateTimeFormat(pattern = "yyyy-MM-dd")
+        @JsonFormat(pattern = "yyyy-MM")
+        @DateTimeFormat(pattern = "yyyy-MM")
         private Date zcxsyf;
 
         /**
@@ -381,8 +381,8 @@ public class LingshanHelpCrowdSaveFormDTO {
         /**
          * 最初享受月份
          */
-        @JsonFormat(pattern = "yyyy-MM-dd")
-        @DateTimeFormat(pattern = "yyyy-MM-dd")
+        @JsonFormat(pattern = "yyyy-MM")
+        @DateTimeFormat(pattern = "yyyy-MM")
         private Date zcxsyf;
 
         /**
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/lingshan/LingshanHelpCrowdDetailRstDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/lingshan/LingshanHelpCrowdDetailRstDTO.java
index 1ccd52e753..2f0e1ee621 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/lingshan/LingshanHelpCrowdDetailRstDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/lingshan/LingshanHelpCrowdDetailRstDTO.java
@@ -143,7 +143,7 @@ public class LingshanHelpCrowdDetailRstDTO {
         /**
          * 最初享受月份
          */
-        @JsonFormat(pattern = "yyyy-MM-dd")
+        @JsonFormat(pattern = "yyyy-MM")
         private Date zcxsyf;
 
         /**
@@ -384,7 +384,7 @@ public class LingshanHelpCrowdDetailRstDTO {
         /**
          * 最初享受月份
          */
-        @JsonFormat(pattern = "yyyy-MM-dd")
+        @JsonFormat(pattern = "yyyy-MM")
         private Date zcxsyf;
 
         /**
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdCanjiExcelData.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdCanjiExcelData.java
index f2b6569385..c59ef12347 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdCanjiExcelData.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdCanjiExcelData.java
@@ -9,6 +9,7 @@ import com.epmet.excel.converter.LingShanSpecialCrowdYesOrNoConverter;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import javax.validation.constraints.NotBlank;
 import java.util.Date;
 
 /**
@@ -24,18 +25,21 @@ public class LingshanHelpCrowdCanjiExcelData extends LingShanHelpCrowdBaseExcelD
      * 残疾证号
      */
 	@ExcelProperty(value = "*残疾证号")
+    @NotBlank(message = "残疾证号必填")
     private String cjzh;
 
     /**
      * 残疾类别，字典
      */
 	@ExcelProperty(value = "*残疾类型", converter = LingShanHelpCrowdExcelConverter.class)
+    @NotBlank(message = "残疾类型必填")
     private String cjlb;
 
     /**
      * 残疾登记（状况）  字典
      */
 	@ExcelProperty(value = "*残疾等级", converter = LingShanHelpCrowdExcelConverter.class)
+    @NotBlank(message = "残疾等级必填")
     private String cjzk;
 
     /**
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdDabingExcelData.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdDabingExcelData.java
index 93e0dd353b..3a8fba9b4e 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdDabingExcelData.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdDabingExcelData.java
@@ -6,6 +6,8 @@ import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.util.Date;
 
 /**
@@ -21,12 +23,14 @@ public class LingshanHelpCrowdDabingExcelData extends LingShanHelpCrowdBaseExcel
      * 所患病种（大病）
      */
 	@ExcelProperty(value = "*患病病种")
+	@NotBlank(message = "患病病种必填")
 	private String shbz;
 
     /**
      * 患病时间
      */
 	@ExcelProperty(value = "*患病时间")
+	@NotNull(message = "患病时间必填")
 	private Date hbsj;
 
     /**
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdDibaoExcelData.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdDibaoExcelData.java
index beb96e2e27..58137b7ae9 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdDibaoExcelData.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdDibaoExcelData.java
@@ -1,6 +1,7 @@
 package com.epmet.excel.data;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import com.epmet.excel.converter.LingShanHelpCrowdExcelConverter;
@@ -8,6 +9,8 @@ import com.epmet.excel.converter.LingShanSpecialCrowdYesOrNoConverter;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -30,12 +33,14 @@ public class LingshanHelpCrowdDibaoExcelData extends LingShanHelpCrowdBaseExcelD
      * 低保类型。200农村低保，201城镇低保
      */
 	@ExcelProperty(value = "*低保类型", converter = LingShanHelpCrowdExcelConverter.class)
+	@NotNull(message = "低保类型必填")
 	private Integer dblx;
 
     /**
      * 低保（特困）证号
      */
 	@ExcelProperty(value = "*低保（特困）证号")
+	@NotBlank(message = "低保（特困）证号必填")
 	private String dbzh;
 
     /**
@@ -90,6 +95,7 @@ public class LingshanHelpCrowdDibaoExcelData extends LingShanHelpCrowdBaseExcelD
      * 最初享受月份
      */
 	@ExcelProperty(value = "最初享受月份")
+	@DateTimeFormat("yyyy-MM")
 	private Date zcxsyf;
 
     /**
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdDujuExcelData.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdDujuExcelData.java
index d4587a9b98..59a7ff7406 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdDujuExcelData.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdDujuExcelData.java
@@ -4,6 +4,8 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.epmet.excel.converter.LingShanHelpCrowdExcelConverter;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+
 /**
  * 重点帮扶-独居老人
  *
@@ -17,12 +19,14 @@ public class LingshanHelpCrowdDujuExcelData extends LingShanHelpCrowdBaseExcelDa
      * 监护人姓名
      */
 	@ExcelProperty(value = "*监护人姓名")
+	@NotBlank(message = "监护人姓名必填")
 	private String jhrxm;
 
     /**
      * 监护人电话
      */
 	@ExcelProperty(value = "*监护人电话")
+	@NotBlank(message = "监护人电话必填")
 	private String jhrdh;
 
     /**
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdGaolingExcelData.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdGaolingExcelData.java
index 95f261caf0..9b1edc5645 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdGaolingExcelData.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdGaolingExcelData.java
@@ -7,6 +7,8 @@ import com.epmet.excel.converter.LingShanHelpCrowdExcelConverter;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 
 /**
@@ -28,6 +30,7 @@ public class LingshanHelpCrowdGaolingExcelData extends LingShanHelpCrowdBaseExce
      * 津贴金额（元）
      */
     @ExcelProperty(value = "*津贴金额（元）")
+    @NotNull(message = "津贴金额（元）必填")
     private BigDecimal jtje;
 
     /**
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdKongchaoExcelData.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdKongchaoExcelData.java
index 70fa06a071..3379d5ab2a 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdKongchaoExcelData.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdKongchaoExcelData.java
@@ -7,6 +7,8 @@ import com.epmet.excel.converter.LingShanHelpCrowdExcelConverter;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import javax.validation.constraints.NotBlank;
+
 /**
  * 重点帮扶-独居老人
  *
@@ -20,12 +22,14 @@ public class LingshanHelpCrowdKongchaoExcelData extends LingShanHelpCrowdBaseExc
      * 监护人姓名
      */
 	@ExcelProperty(value = "*监护人姓名")
+	@NotBlank(message = "监护人姓名必填")
 	private String jhrxm;
 
     /**
      * 监护人电话
      */
 	@ExcelProperty(value = "*监护人电话")
+	@NotBlank(message = "监护人电话必填")
 	private String jhrdh;
 
     /**
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdLiushouExcelData.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdLiushouExcelData.java
index 88a2c7e33b..d3935e4e57 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdLiushouExcelData.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdLiushouExcelData.java
@@ -6,6 +6,8 @@ import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import javax.validation.constraints.NotBlank;
+
 /**
  * 重点帮扶-留守儿童
  *
@@ -19,24 +21,28 @@ public class LingshanHelpCrowdLiushouExcelData extends LingShanHelpCrowdBaseExce
      * 监护人姓名
      */
 	@ExcelProperty(value = "*监护人姓名")
+	@NotBlank(message = "监护人姓名必填")
 	private String jhrxm;
 
     /**
      * 监护人电话
      */
 	@ExcelProperty(value = "*监护人电话")
+	@NotBlank(message = "监护人电话必填")
 	private String jhrdh;
 
     /**
      * 与监护人关系
      */
 	@ExcelProperty(value = "*与监护人关系")
+	@NotBlank(message = "与监护人关系必填")
 	private String yjhrgx;
 
     /**
      * 所在学校及班级
      */
 	@ExcelProperty(value = "*所在学校及班级")
+	@NotBlank(message = "所在学校及班级必填")
 	private String szxxjbj;
 
     /**
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdTekunExcelData.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdTekunExcelData.java
index 44c96f1c06..f2aec63f15 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdTekunExcelData.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdTekunExcelData.java
@@ -1,6 +1,7 @@
 package com.epmet.excel.data;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import com.epmet.excel.converter.LingShanHelpCrowdExcelConverter;
@@ -8,6 +9,7 @@ import com.epmet.excel.converter.LingShanSpecialCrowdYesOrNoConverter;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import javax.validation.constraints.NotBlank;
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -30,6 +32,7 @@ public class LingshanHelpCrowdTekunExcelData extends LingShanHelpCrowdBaseExcelD
      * 低保（特困）证号
      */
 	@ExcelProperty(value = "*低保（特困）证号")
+	@NotBlank(message = "低保（特困）证号必填")
 	private String dbzh;
 
     /**
@@ -84,6 +87,7 @@ public class LingshanHelpCrowdTekunExcelData extends LingShanHelpCrowdBaseExcelD
      * 最初享受月份
      */
 	@ExcelProperty(value = "最初享受月份")
+	@DateTimeFormat("yyyy-MM")
 	private Date zcxsyf;
 
     /**