From b69ea120e5a191ab8dff67c34cc5faee99f51d30 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 29 Sep 2022 17:36:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92=E7=96=AB?=
 =?UTF-8?q?=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=8F=B0=E8=B4=A6----=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/IcVaccinePrarmeterServiceImpl.java   | 29 ++++++++-----------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java
index 1f3e85df9e..e56c8d5a0a 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java
@@ -324,23 +324,7 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl<IcVaccinePrar
                 list.get(i).setAddStatus(true);
                 continue;
             }
-            if("0".equals(list.get(i).getIsVaccination())){
-                // 未接种 判断是否填写原因
-                if (StringUtils.isBlank(list.get(i).getReason()) && !list.get(i).getAddStatus()){
-                    errorInfo.add(getErrorInfo(list.get(i), "选择未接种时，原因不能为空",i+1));
-                    list.get(i).setAddStatus(true);
-                    continue;
-                }
-                if("其他原因".equals(list.get(i).getReason())){
-                    // 未接种原因选择其他，判断是否填写备注
-                    if (StringUtils.isBlank(list.get(i).getNote()) && !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).getIsVaccination())){
                 // 已接种 判断是否填写接种时间地点
                 if (StringUtils.isBlank(list.get(i).getFirstVacTime()) && !list.get(i).getAddStatus()){
                     errorInfo.add(getErrorInfo(list.get(i), "第一次接种时间不能为空",i+1));
@@ -372,6 +356,17 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl<IcVaccinePrar
 //                    list.get(i).setAddStatus(true);
 //                    continue;
 //                }
+
+
+            }
+
+            if("其他原因".equals(list.get(i).getReason())){
+                // 未接种原因选择其他，判断是否填写备注
+                if (StringUtils.isBlank(list.get(i).getNote()) && !list.get(i).getAddStatus()){
+                    errorInfo.add(getErrorInfo(list.get(i), "选择其他原因时，备注不能为空",i+1));
+                    list.get(i).setAddStatus(true);
+                    continue;
+                }
             }
 
             // 校验所属网格通过名称能否匹配到ID