From d37b2cbecd3ff7141450a1329668d920ac08d015 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 21 Sep 2022 18:44:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=8C=E7=A8=8B=E4=B8=8A=E6=8A=A5-=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8huifu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/IcTripReportRecordDao.xml         | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml
index 13c42a47d7..fae60824fe 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml
@@ -26,9 +26,11 @@
     <select id="pageList" parameterType="com.epmet.dto.form.PageTripReportFormDTO" resultType="com.epmet.dto.IcTripReportRecordDTO">
         SELECT
             r.*,
+            a.ID AS epidemicId,
             r.CREATED_TIME AS reportTime,
             r.ID_CARD as realIdCard
         FROM ic_trip_report_record r
+        LEFT JOIN ic_epidemic_special_attention a ON (a.ID_CARD = r.ID_CARD AND a.DEL_FLAG = 0 AND a.IS_ATTENTION = 1 AND a.ATTENTION_TYPE = 2)
         WHERE
             r.DEL_FLAG = '0'
             AND r.CUSTOMER_ID = #{customerId}