From 727ef0c7e35d5d391b845b4d8e2ae1d3d8919648 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Fri, 1 Jul 2022 09:37:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=9A=E5=8A=A1=E9=A1=BA?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epidemic/service/impl/EpidemicUserInfoServiceImpl.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java
index 041c833..fdd80ec 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java
@@ -749,11 +749,11 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
 //                } else if (numSheet == 1) {
             // 检验和新增居住人信息
             excelData = ExcelImportUtil.importExcel(f, BaseResidentInformationUpdateExcel.class, importParams);
-            excelData.forEach(item -> item.setSelfIdentityNo(item.getSelfIdentityNo().toUpperCase()));
             excelDataError = ExcelImportUtil.importExcel(f, BaseResidentInformationUpdateExcel.class, importParams);
             // 校验数据
             errorData = this.checkResidentsExcel(excelData, excelDataError, sysPopulationSimpleDictDTOS, addList, addErrorList);
-//                }
+            excelData.forEach(item -> item.setSelfIdentityNo(item.getSelfIdentityNo().toUpperCase()));
+            //                }
 //            }
             // 校验户主和房屋信息
 //            if (epdcHouseAndHouseHeadErrorResultDTOS != null && epdcHouseAndHouseHeadErrorResultDTOS.size() > 0) {