From 7b24329e73ab77985bcf15a8a0c1cf875f15ffbd Mon Sep 17 00:00:00 2001 From: yujt Date: Sun, 9 May 2021 09:27:50 +0800 Subject: [PATCH] update --- .../epdc/vaccine/vim/controller/VaccinationInfoController.java | 3 --- .../vaccine/vim/service/impl/VaccinationInfoServiceImpl.java | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-) 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 50cec96..aece98b 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 @@ -10,7 +10,6 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; -import com.elink.esua.epdc.vaccine.epidemic.service.EpidemicUserInfoService; import com.elink.esua.epdc.vaccine.vim.dto.VaccinationInfoDTO; import com.elink.esua.epdc.vaccine.vim.dto.result.EpdcAppVimInfoResultDTO; import com.elink.esua.epdc.vaccine.vim.excel.VaccinationInfoExcel; @@ -35,8 +34,6 @@ import java.util.Map; public class VaccinationInfoController { @Autowired private VaccinationInfoService vaccinationInfoService; - @Autowired - private EpidemicUserInfoService epidemicUserInfoService; @GetMapping("page") public Result> page(@RequestParam Map params) { diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/service/impl/VaccinationInfoServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/service/impl/VaccinationInfoServiceImpl.java index 2996ecd..df8ef0b 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/service/impl/VaccinationInfoServiceImpl.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/service/impl/VaccinationInfoServiceImpl.java @@ -121,7 +121,8 @@ public class VaccinationInfoServiceImpl extends BaseVimCurdServiceImpl entities = checkVaccination(dto); + if (entities.isEmpty() || entities.get(0).getDose().equals(dto.getDose())) { update(dto); } else { return new Result().error("接种剂次重复");