疫苗接种 方法提交

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccineController.java

@@ -103,7 +103,7 @@ public class IcVaccineController  implements ResultDataResolver {
     public Result<PageData<IcVaccineListResultDTO>> natList(@LoginUser TokenDto tokenDto, @RequestBody VaccineListFormDTO formDTO) {
         formDTO.setCustomerId(tokenDto.getCustomerId());
         formDTO.setUserId(tokenDto.getUserId());
-        return new Result<PageData<IcVaccineListResultDTO>>().ok(icVaccineService.natList(formDTO));
+        return new Result<PageData<IcVaccineListResultDTO>>().ok(icVaccineService.icVaccineList(formDTO));
     }
 
     /**
@@ -279,7 +279,7 @@ public class IcVaccineController  implements ResultDataResolver {
             WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").build();
             PageData<NatListResultDTO> data = null;
             do {
-                data = icVaccineService.natList(formDTO);
+                data = icVaccineService.icVaccineList(formDTO);
                 data.getList().forEach(o-> {
                     o.setNatResult(NumConstant.ONE_STR.equals(o.getNatResult()) ? "阳性" : "阴性");
                     o.setIsResiUser(NumConstant.ONE_STR.equals(o.getIsResiUser()) ? "是" : "否");

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineDao.java

@@ -3,10 +3,10 @@ package com.epmet.dao;
 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.MyNatListResultDTO;
 import com.epmet.dto.result.NatListResultDTO;
 import com.epmet.entity.IcVaccineEntity;
-import com.epmet.entity.IcVaccineEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -29,14 +29,16 @@ public interface IcVaccineDao extends BaseDao<IcVaccineEntity> {
     /**
      * @Author sun
      * @Description 【核酸】本辖区核酸检测信息列表
-     **/
+     *
-    List<NatListResultDTO> getNatList(MyNatListFormDTO formDTO);
+     * @param formDTO*/
+    List<NatListResultDTO> getIcVaccineList(VaccineListFormDTO formDTO);
 
     /**
      * @Author sun
      * @Description 【核酸】客户下核酸检测信息列表
-     **/
+     *
-    List<NatListResultDTO> getCustomerNatList(MyNatListFormDTO formDTO);
+     * @param formDTO*/
+    List<NatListResultDTO> getCustomerIcVaccineList(VaccineListFormDTO formDTO);
 
     /**
      * @Author sun

epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcVaccineService.java

@@ -40,13 +40,14 @@ public interface IcVaccineService extends BaseService<IcVaccineEntity> {
      *
      * @param formDTO
      * @return*/
-    PageData<IcVaccineListResultDTO> natList(VaccineListFormDTO formDTO);
+    PageData<IcVaccineListResultDTO> icVaccineList(VaccineListFormDTO formDTO);
 
     /**
      * @Author sun
      * @Description 【核酸】核酸检测信息详情
-     **/
+     *
-    IcNatDTO detail(MyNatListFormDTO formDTO);
+     * @param formDTO*/
+    IcNatDTO detail(VaccineListFormDTO formDTO);
 
     /**
      * @Author sun

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java

@@ -157,9 +157,9 @@ public class IcVaccineServiceImpl extends BaseServiceImpl<IcVaccineDao, IcVaccin
      * @param formDTO
      * @return*/
     @Override
-    public PageData<IcVaccineListResultDTO> natList(VaccineListFormDTO formDTO) {
+    public PageData<IcVaccineListResultDTO> icVaccineList(VaccineListFormDTO formDTO) {
         //1.根据是查询客户数据还是本辖区数据走不同逻辑
-        if ("current".equals(formDTO.getOrgType())) {
+        if ("current".equals(formDTO.getSearchType())) {
             //本辖区数据
             //2.获取工作人员缓存信息
             CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getUserId());
@@ -168,13 +168,13 @@ public class IcVaccineServiceImpl extends BaseServiceImpl<IcVaccineDao, IcVaccin
             }
             formDTO.setAgencyId(staffInfo.getAgencyId());
             //3.按条件查询业务数据
-            PageInfo<NatListResultDTO> data = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage())
+            PageInfo<IcVaccineListResultDTO> data = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage())
-                    .doSelectPageInfo(() -> baseDao.getNatList(formDTO));
+                    .doSelectPageInfo(() -> baseDao.getIcVaccineList(formDTO));
             return new PageData(data.getList(), data.getTotal());
-        } else if ("all".equals(formDTO.getOrgType())) {
+        } else if ("all".equals(formDTO.getSearchType())) {
             //客户下数据
-            PageInfo<NatListResultDTO> data = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage())
+            PageInfo<IcVaccineListResultDTO> data = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage())
-                    .doSelectPageInfo(() -> baseDao.getCustomerNatList(formDTO));
+                    .doSelectPageInfo(() -> baseDao.getCustomerIcVaccineList(formDTO));
             return new PageData(data.getList(), data.getTotal());
         }
 
@@ -184,9 +184,10 @@ public class IcVaccineServiceImpl extends BaseServiceImpl<IcVaccineDao, IcVaccin
     /**
      * @Author sun
      * @Description 【核酸】核酸检测信息详情
-     **/
+     *
+     * @param formDTO*/
     @Override
-    public IcNatDTO detail(MyNatListFormDTO formDTO) {
+    public IcNatDTO detail(VaccineListFormDTO formDTO) {
         IcNatDTO resultDTO = new IcNatDTO();
         //1.查询核酸记录信息
         IcVaccineEntity entity = baseDao.selectById(formDTO.getIcNatId());

epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineDao.xml

@@ -30,7 +30,7 @@
         ORDER BY nat_time DESC
     </select>
 
-    <select id="getNatList" resultType="com.epmet.dto.result.NatListResultDTO">
+    <select id="getIcVaccineList" resultType="com.epmet.dto.result.NatListResultDTO">
         SELECT
             a.ic_nat_id icNatId,
             a.agency_id agencyId,
@@ -72,7 +72,7 @@
         ORDER BY b.nat_time DESC, b.id ASC
     </select>
 
-    <select id="getCustomerNatList" resultType="com.epmet.dto.result.NatListResultDTO">
+    <select id="getCustomerIcVaccineList" resultType="com.epmet.dto.result.NatListResultDTO">
         SELECT
             id icNatId,
             user_id userId,