From 199abb1970d8601c7a719eb0b86faa7b5abe659b Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Mon, 13 Sep 2021 11:15:03 +0800
Subject: [PATCH] =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E5=8D=95=E8=A1=A8=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/result/EpidemicPageResultDTO.java     |  1 +
 .../mapper/epidemic/EpidemicUserInfoDao.xml   | 24 ++++---------------
 2 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dto/result/EpidemicPageResultDTO.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dto/result/EpidemicPageResultDTO.java
index c70d313..78259c2 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dto/result/EpidemicPageResultDTO.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dto/result/EpidemicPageResultDTO.java
@@ -16,6 +16,7 @@ public class EpidemicPageResultDTO implements Serializable {
     /**
      *
      */
+    private String id;
     private String infoId;
 
     /**
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 8c53b5a..94aef8a 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
@@ -223,38 +223,22 @@
         </foreach>
     </select>
     <select id="selectInfo" resultType="com.elink.esua.epdc.vaccine.epidemic.dto.result.VaccinationInfoResultDTO">
-        select r.id        AS inoutId,
+        select i.id,i.id        AS inoutId,
                '平阴县'       AS county,
                '榆山街道'      AS street,
                '370124001' AS streetId,
                i.GENDER       sex,
-               r.COMMUNITY    community,
-               r.GRID_NAME    grid,
-               r.PLOT         villageName,
-               CONCAT(
-                       r.BUILDING_NO,
-                       r.UNIT,
-                       '单元',
-                       r.ROOM_NO
-                   )          dwellingPlace,
                i.USER_NAME    realName,
                i.ID_CARD      identityNo,
-               r.MOBILE       mobile,
+               i.MOBILE       mobile,
                i.GENDER,
                i.BIRTHDAY,
-               r.CREATED_TIME,
+               i.CREATED_TIME,
                i.PEOPLE_CATEGORIES,
                i.SPECIAL_CROWD,
                i.HUSHAI_STATUS,
                i.VACCINATION_STATE
-        from epidemic_user_info i
-                 left join (select *
-                            from epidemic_user_inout_record as b
-                            where DEL_FLAG = '0'
-                              and not exists(select 1
-                                             from epidemic_user_inout_record
-                                             where ID_CARD = b.ID_CARD
-                                               and b.CREATED_TIME &lt; CREATED_TIME)) r on r.ID_CARD = i.ID_CARD
+               from epidemic_user_info i
         where i.DEL_FLAG = '0'
           and i.id = #{id}
     </select>