From ecb1a27d70089a6e86eab3be7678ad5bd16b9b86 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Wed, 6 Apr 2022 17:04:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/IcVaccineService.java   |  9 ----
 .../service/impl/IcVaccineServiceImpl.java    | 47 ++++---------------
 2 files changed, 10 insertions(+), 46 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcVaccineService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcVaccineService.java
index 3d04c02d99..c57de776d2 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcVaccineService.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcVaccineService.java
@@ -2,14 +2,11 @@ package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
-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.entity.IcVaccineEntity;
 
 import java.nio.file.Path;
-import java.util.List;
 
 /**
  * 疫苗接种记录
@@ -19,12 +16,6 @@ import java.util.List;
  */
 public interface IcVaccineService extends BaseService<IcVaccineEntity> {
 
-    /**
-     * @Author sun
-     * @Description 核酸检测-居民端我的上报
-     **/
-    List<MyNatListResultDTO> myNatList(MyNatListFormDTO formDTO);
-
     /**
      * @Author sun
      * @Description 【核酸】核酸检测信息列表
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java
index 661b9298b5..1e6e849dc8 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java
@@ -13,19 +13,18 @@ import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.feign.ResultDataResolver;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
-import com.epmet.commons.tools.utils.*;
+import com.epmet.commons.tools.utils.EpmetRequestHolder;
+import com.epmet.commons.tools.utils.FileUtils;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.constants.ImportTaskConstants;
-import com.epmet.dao.*;
-import com.epmet.dto.form.*;
-import com.epmet.dao.*;
-import com.epmet.dto.IcNatDTO;
-import com.epmet.dto.IcNoticeDTO;
-import com.epmet.dto.form.AddIcNatFormDTO;
+import com.epmet.dao.IcResiUserDao;
+import com.epmet.dao.IcVaccineDao;
+import com.epmet.dao.IcVaccineRelationDao;
 import com.epmet.dto.form.ImportTaskCommonFormDTO;
-import com.epmet.dto.form.MyNatListFormDTO;
-import com.epmet.dto.form.SendNoticeFormDTO;
-import com.epmet.dto.result.*;
-import com.epmet.entity.IcNatRelationEntity;
+import com.epmet.dto.form.VaccineListFormDTO;
+import com.epmet.dto.result.IcVaccineListResultDTO;
+import com.epmet.dto.result.LoginUserDetailsResultDTO;
+import com.epmet.dto.result.UploadImgResultDTO;
 import com.epmet.entity.IcResiUserEntity;
 import com.epmet.entity.IcVaccineEntity;
 import com.epmet.entity.IcVaccineRelationEntity;
@@ -33,9 +32,7 @@ import com.epmet.excel.data.IcNatImportExcelData;
 import com.epmet.excel.data.IcVaccineImportExcelData;
 import com.epmet.excel.handler.IcVaccineExcelImportListener;
 import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
-import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.feign.OssFeignClient;
-import com.epmet.service.IcNoticeService;
 import com.epmet.service.IcVaccineService;
 import com.epmet.service.UserService;
 import com.github.pagehelper.PageHelper;
@@ -70,38 +67,14 @@ public class IcVaccineServiceImpl extends BaseServiceImpl<IcVaccineDao, IcVaccin
     @Autowired
     private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient;
     @Autowired
-    private IcNoticeService icNoticeService;
-    @Autowired
     private OssFeignClient ossFeignClient;
     @Autowired
-    private UserBaseInfoDao userBaseInfoDao;
-    @Autowired
-    private IcNatRelationDao icNatRelationDao;
-    @Autowired
-    private IcVaccineDao icVaccineDao;
-    @Autowired
     private IcVaccineRelationDao icVaccineRelationDao;
     @Autowired
     private IcResiUserDao icResiUserDao;
     @Autowired
     private UserService userService;
 
-    /**
-     * @Author sun
-     * @Description 疫苗接种-居民端我的上报
-     **/
-    @Override
-    public List<MyNatListResultDTO> myNatList(MyNatListFormDTO formDTO) {
-        //1.根据token信息查询居民身份证号
-        UserBaseInfoResultDTO dto = userBaseInfoDao.selectListByUserIdList(formDTO.getUserId());
-        if (null != dto) {
-            formDTO.setIdCard(dto.getIdNum());
-        }
-        //2.查询当前人员创建的或该身份证号录入的核算检测数据(居民端录入、数字平台录入、数字平台导入、数字平台同步的)
-        List<MyNatListResultDTO> resultList = baseDao.getMyNatList(formDTO);
-        return resultList;
-    }
-
     /**
      * @Author sun
      * @Description 【疫苗】本组织及下级疫苗接种信息列表