From ba5abbaa723e67104714a9a329774d9638e2dc4f Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Thu, 20 Jan 2022 10:02:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E8=BA=AB=E4=BB=BD=E8=AF=81?=
 =?UTF-8?q?=E5=8F=B7=E6=9F=A5=E8=AF=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc/vaccine/epidemic/dao/EpidemicUserInfoDao.java   | 9 +++++++++
 .../service/impl/EpidemicUserInfoServiceImpl.java        | 2 +-
 .../resources/mapper/epidemic/EpidemicUserInfoDao.xml    | 7 +++++++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dao/EpidemicUserInfoDao.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dao/EpidemicUserInfoDao.java
index 1b3a7be..6c1362f 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dao/EpidemicUserInfoDao.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dao/EpidemicUserInfoDao.java
@@ -215,4 +215,13 @@ public interface EpidemicUserInfoDao extends BaseDao<EpidemicUserInfoEntity> {
     * @return void
     */
     void updateSysInfo(EpidemicUserInfoEntity eu);
+
+    /**
+    * @describe: 根据身份证号查询未删除的最新的一条数据
+    * @author wangtong
+    * @date 2022/1/20 9:30
+    * @params [idcard]
+    * @return com.elink.esua.epdc.vaccine.epidemic.entity.EpidemicUserInfoEntity
+    */
+    EpidemicUserInfoEntity selectUserByIdCard(@Param("idcard") String idcard);
 }
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 5f695ae..14ea882 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
@@ -750,7 +750,7 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
         if(null != dto &&  !CollectionUtils.isEmpty(dto.getList())){
             updateDictColumn(dto);
             for(EpidemicUserInfoEntity eu : dto.getList()){
-                EpidemicUserInfoEntity check = epidemicUserInfoService.selectInfoByIdCard(eu.getIdCard());
+                EpidemicUserInfoEntity check = epidemicUserInfoDao.selectUserByIdCard(eu.getIdCard());
                 if (null == check) {
                     if(null != eu.getDeptId()){
                         setDeptInfo(eu.getDeptId().toString(),eu);
diff --git a/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoDao.xml b/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoDao.xml
index 8684312..57644ab 100644
--- a/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoDao.xml
+++ b/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoDao.xml
@@ -592,4 +592,11 @@
             UPDATED_TIME = #{updatedTime}
         where ID_CARD = #{idCard}
     </update>
+    <select id="selectUserByIdCard" resultType="com.elink.esua.epdc.vaccine.epidemic.entity.EpidemicUserInfoEntity">
+        SELECT *
+        FROM `epidemic_user_info`
+        where ID_CARD=#{idcard}
+        order by DEL_FLAG asc,UPDATED_TIME desc
+        limit 1
+    </select>
 </mapper>