From 44ac0b4692d749b8b024197d143ef5f9585a3f34 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 30 Jun 2022 17:27:52 +0800
Subject: [PATCH] =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E7=82=B9?=
 =?UTF-8?q?=EF=BC=8C=E6=A0=B8=E9=85=B8=E6=A3=80=E6=B5=8B=E7=82=B9=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...IcPointVaccinesInoculationServiceImpl.java | 55 ++++++++++---------
 1 file changed, 30 insertions(+), 25 deletions(-)

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));