From 26dba93399e42b30f1b7bcafc3fe0b43e76dd123 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 7 Apr 2022 10:49:31 +0800
Subject: [PATCH] emm

---
 .../src/main/java/com/epmet/dao/IcVaccineDao.java            | 5 +++--
 .../src/main/resources/mapper/IcVaccineDao.xml               | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineDao.java
index b99c5d1000..3868760fab 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineDao.java
@@ -4,6 +4,7 @@ import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.IcNatDTO;
 import com.epmet.dto.form.MyNatListFormDTO;
 import com.epmet.dto.form.VaccineListFormDTO;
+import com.epmet.dto.result.IcVaccineListResultDTO;
 import com.epmet.dto.result.MyNatListResultDTO;
 import com.epmet.dto.result.NatListResultDTO;
 import com.epmet.entity.IcVaccineEntity;
@@ -31,14 +32,14 @@ public interface IcVaccineDao extends BaseDao<IcVaccineEntity> {
      * @Description 【核酸】本辖区核酸检测信息列表
      *
      * @param formDTO*/
-    List<NatListResultDTO> getIcVaccineList(VaccineListFormDTO formDTO);
+    List<IcVaccineListResultDTO> getIcVaccineList(VaccineListFormDTO formDTO);
 
     /**
      * @Author sun
      * @Description 【核酸】客户下核酸检测信息列表
      *
      * @param formDTO*/
-    List<NatListResultDTO> getCustomerIcVaccineList(VaccineListFormDTO formDTO);
+    List<IcVaccineListResultDTO> getCustomerIcVaccineList(VaccineListFormDTO formDTO);
 
     /**
      * @Author sun
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineDao.xml
index 835f3c64b6..9eb104ad06 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineDao.xml
@@ -30,7 +30,7 @@
         ORDER BY nat_time DESC
     </select>
 
-    <select id="getIcVaccineList" resultType="com.epmet.dto.result.NatListResultDTO">
+    <select id="getIcVaccineList" resultType="com.epmet.dto.result.IcVaccineListResultDTO">
         SELECT
             a.IC_VACCINE_ID AS vaccineId,
             a.agency_id,
@@ -64,7 +64,7 @@
         ORDER BY b.INOCULATE_TIME DESC, b.id ASC
     </select>
 
-    <select id="getCustomerIcVaccineList" resultType="com.epmet.dto.result.NatListResultDTO">
+    <select id="getCustomerIcVaccineList" resultType="com.epmet.dto.result.IcVaccineListResultDTO">
         SELECT
             id vaccineId,
             is_resi_user isResiUser,