身份证合法性校验

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/PersonTestingServiceImpl.java

@@ -505,10 +505,15 @@ public class PersonTestingServiceImpl extends BaseServiceImpl<PersonTestingDao,
                 errorLineinfoList.add(packageErrorInfo(i, "身份证号为空"));
             } else {
                 data.setIdcard(data.getIdcard().trim());
-                // 是否存在
-                List<PersonTestingDTO> details = baseDao.getDetailByIdCardOrName(data.getIdcard(), null);
-                if (NumConstant.ZERO < details.size()) {
-                    errorLineinfoList.add(packageErrorInfo(i, "身份证号已存在"));
+                String verification = IdentityNoUtils.IdentityNoVerification(data.getIdcard());
+                if (null != verification) {
+                    errorLineinfoList.add(packageErrorInfo(i, verification));
+                } else {
+                    // 是否存在
+                    List<PersonTestingDTO> details = baseDao.getDetailByIdCardOrName(data.getIdcard(), null);
+                    if (NumConstant.ZERO < details.size()) {
+                        errorLineinfoList.add(packageErrorInfo(i, "身份证号已存在"));
+                    }
                 }
             }
             if (StringUtils.isBlank(data.getTestingTimeStr())) {