diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointVaccinesInoculationServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointVaccinesInoculationServiceImpl.java
index d46e87b23d..148e487bbc 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointVaccinesInoculationServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointVaccinesInoculationServiceImpl.java
@@ -187,35 +187,40 @@ public class IcPointVaccinesInoculationServiceImpl extends BaseServiceImpl<IcPoi
                     list.get(i).setAddStatus(true);
                     continue;
                 }
-                if (StringUtils.isBlank(list.get(i).getInoculationDate()) && !list.get(i).getAddStatus()){
-                    errorInfo.add(getErrorInfo(list.get(i), "接种日期不能为空",i+1));
-                    list.get(i).setAddStatus(true);
-                    continue;
-                }
-                if (StringUtils.isBlank(list.get(i).getMoStartTime()) && !list.get(i).getAddStatus()){
-                    errorInfo.add(getErrorInfo(list.get(i), "接种上午开始时间不能为空",i+1));
-                    list.get(i).setAddStatus(true);
-                    continue;
-                }
-                if (StringUtils.isBlank(list.get(i).getMoEndTime()) && !list.get(i).getAddStatus()){
-                    errorInfo.add(getErrorInfo(list.get(i), "接种上午结束时间不能为空",i+1));
-                    list.get(i).setAddStatus(true);
-                    continue;
-                }
-                if (StringUtils.isBlank(list.get(i).getAfStartTime()) && !list.get(i).getAddStatus()){
-                    errorInfo.add(getErrorInfo(list.get(i), "接种下午开始时间不能为空",i+1));
-                    list.get(i).setAddStatus(true);
-                    continue;
-                }
-                if (StringUtils.isBlank(list.get(i).getAfEndTime()) && !list.get(i).getAddStatus()){
-                    errorInfo.add(getErrorInfo(list.get(i), "接种下午结束时间不能为空",i+1));
-                    list.get(i).setAddStatus(true);
-                    continue;
-                }
                 if (list.get(i).getNoAvailableVaccines() == null && !list.get(i).getAddStatus()){
                     errorInfo.add(getErrorInfo(list.get(i), "暂无疫苗不能为空",i+1));
                     list.get(i).setAddStatus(true);
                     continue;
+                }else{
+                    // 暂无疫苗为否，才校验日期
+                    if("1".equals(list.get(i).getNoAvailableVaccines()) || "否".equals(list.get(i).getNoAvailableVaccines())){
+                        if (StringUtils.isBlank(list.get(i).getInoculationDate()) && !list.get(i).getAddStatus()){
+                            errorInfo.add(getErrorInfo(list.get(i), "接种日期不能为空",i+1));
+                            list.get(i).setAddStatus(true);
+                            continue;
+                        }
+                        if (StringUtils.isBlank(list.get(i).getMoStartTime()) && !list.get(i).getAddStatus()){
+                            errorInfo.add(getErrorInfo(list.get(i), "接种上午开始时间不能为空",i+1));
+                            list.get(i).setAddStatus(true);
+                            continue;
+                        }
+                        if (StringUtils.isBlank(list.get(i).getMoEndTime()) && !list.get(i).getAddStatus()){
+                            errorInfo.add(getErrorInfo(list.get(i), "接种上午结束时间不能为空",i+1));
+                            list.get(i).setAddStatus(true);
+                            continue;
+                        }
+                        if (StringUtils.isBlank(list.get(i).getAfStartTime()) && !list.get(i).getAddStatus()){
+                            errorInfo.add(getErrorInfo(list.get(i), "接种下午开始时间不能为空",i+1));
+                            list.get(i).setAddStatus(true);
+                            continue;
+                        }
+                        if (StringUtils.isBlank(list.get(i).getAfEndTime()) && !list.get(i).getAddStatus()){
+                            errorInfo.add(getErrorInfo(list.get(i), "接种下午结束时间不能为空",i+1));
+                            list.get(i).setAddStatus(true);
+                            continue;
+                        }
+                    }
+
                 }
                 if (StringUtils.isBlank(list.get(i).getMobile()) && !list.get(i).getAddStatus()){
                     errorInfo.add(getErrorInfo(list.get(i), "咨询电话不能为空",i+1));