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 { * @Description 【核酸】本辖区核酸检测信息列表 * * @param formDTO*/ - List getIcVaccineList(VaccineListFormDTO formDTO); + List getIcVaccineList(VaccineListFormDTO formDTO); /** * @Author sun * @Description 【核酸】客户下核酸检测信息列表 * * @param formDTO*/ - List getCustomerIcVaccineList(VaccineListFormDTO formDTO); + List 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 a.IC_VACCINE_ID AS vaccineId, a.agency_id, @@ -64,7 +64,7 @@ ORDER BY b.INOCULATE_TIME DESC, b.id ASC - SELECT id vaccineId, is_resi_user isResiUser,