diff --git a/epdc-cloud-commons-yushan b/epdc-cloud-commons-yushan index 6f363d0..60b469f 160000 --- a/epdc-cloud-commons-yushan +++ b/epdc-cloud-commons-yushan @@ -1 +1 @@ -Subproject commit 6f363d0fee687011f3fd37341fd7afbbdd2805c4 +Subproject commit 60b469fb3d9fccb7220f65c3ddbaa412033ecc01 diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/controller/VaccinationInfoController.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/controller/VaccinationInfoController.java index c081162..853babe 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/controller/VaccinationInfoController.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/controller/VaccinationInfoController.java @@ -54,14 +54,8 @@ public class VaccinationInfoController { public Result save(@RequestBody VaccinationInfoDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - // 剂次重复校验 - if (vaccinationInfoService.checkVaccination(dto).isEmpty()) { - vaccinationInfoService.save(dto); - epidemicUserInfoService.updateVaccinationInfo(dto); - } else { - return new Result().error("接种剂次重复"); - } - return new Result(); + + return vaccinationInfoService.saveNew(dto); } @PutMapping diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/service/VaccinationInfoService.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/service/VaccinationInfoService.java index 9e8dc4e..b0e3f27 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/service/VaccinationInfoService.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/service/VaccinationInfoService.java @@ -2,6 +2,7 @@ package com.elink.esua.epdc.vaccine.vim.service; import com.elink.esua.epdc.commons.mybatis.service.CrudService; +import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.vaccine.vim.dto.VaccinationInfoDTO; import com.elink.esua.epdc.vaccine.vim.entity.VaccinationInfoEntity; @@ -34,4 +35,14 @@ public interface VaccinationInfoService extends CrudService implements VaccinationInfoService { + @Autowired + private EpidemicUserInfoService epidemicUserInfoService; + @Override public QueryWrapper getWrapper(Map params) { String id = (String) params.get("id"); @@ -62,4 +65,18 @@ public class VaccinationInfoServiceImpl extends BaseVimCurdServiceImpl