From daab772045e2f6c9e95d4b56e4e673afd176d054 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Sat, 8 May 2021 14:37:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epidemic/dao/EpidemicUserInfoDao.java | 12 ++++- .../service/EpidemicUserInfoService.java | 7 +-- .../impl/EpidemicUserInfoServiceImpl.java | 54 +++++++++++++++---- .../controller/VaccinationInfoController.java | 19 ++----- .../vim/service/VaccinationInfoService.java | 20 +++++++ .../impl/VaccinationInfoServiceImpl.java | 27 +++++++++- .../mapper/epidemic/EpidemicUserInfoDao.xml | 14 ++++- 7 files changed, 121 insertions(+), 32 deletions(-) diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dao/EpidemicUserInfoDao.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dao/EpidemicUserInfoDao.java index 6ef82da..b5becd2 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dao/EpidemicUserInfoDao.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dao/EpidemicUserInfoDao.java @@ -26,7 +26,7 @@ public interface EpidemicUserInfoDao extends BaseDao { /** * 根据身份证号删除 * - * @param idCard1 + * @param idCard * @return void * @author wk * @date 2021-01-26 13:58 @@ -98,4 +98,14 @@ public interface EpidemicUserInfoDao extends BaseDao { * @date 2021/4/30 10:06 */ VaccinationInfoResultDTO selectDistinctInfo(Long id); + + /** + * 查询有无接种完成信息 + * + * @param idCard + * @return com.elink.esua.epdc.vaccine.epidemic.dto.result.VaccinationInfoResultDTO + * @author zhy + * @date 2021/4/30 10:06 + */ + EpidemicUserInfoEntity checkCompleteInfo(@Param("idCard") Long idCard, @Param("vaccinationState") String vaccinationState); } \ No newline at end of file diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/EpidemicUserInfoService.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/EpidemicUserInfoService.java index fec369b..442e22d 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/EpidemicUserInfoService.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/EpidemicUserInfoService.java @@ -47,11 +47,12 @@ public interface EpidemicUserInfoService extends CrudService diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java index ac9e0fe..efc0e7d 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java @@ -67,6 +67,8 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl 0) { + // 如果还有接种记录那么就是接种中 + // 虽然更新接种剂次为最大值-1，但实际上不一定能查到最大值-1条数据，数据不对应时需要补录 + userInfoDTO.setVaccinationNum(dto.getDose() - 1); + userInfoDTO.setVaccinationState(1); + } else { + // 如果库里没有接种记录了，直接归为未接种，数据需要补录 + userInfoDTO.setVaccinationNum(0); + userInfoDTO.setVaccinationState(0); + } + } + baseDao.updateVaccinationInfo(userInfoDTO); return new Result(); } 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 4228f4f..a4b4272 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 @@ -64,13 +64,8 @@ public class VaccinationInfoController { public Result update(@RequestBody VaccinationInfoDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - // 剂次重复校验 - if (vaccinationInfoService.checkVaccination(dto).isEmpty() || vaccinationInfoService.checkVaccination(dto).get(0).getDose().equals(dto.getDose())) { - vaccinationInfoService.update(dto); - } else { - return new Result().error("接种剂次重复"); - } - return new Result(); + + return vaccinationInfoService.updateNew(dto); } @DeleteMapping @@ -78,14 +73,8 @@ public class VaccinationInfoController { public Result delete(@RequestBody Long[] ids) { //效验数据 AssertUtils.isArrayEmpty(ids, "id"); - VaccinationInfoDTO dto = vaccinationInfoService.get(ids[0]); - if (vaccinationInfoService.beforeDelete(dto)) { - vaccinationInfoService.delete(ids); - epidemicUserInfoService.updateVaccinationInfo(dto); - } else { - return new Result().error("请先删除更高剂次接种记录"); - } - return new Result(); + + return vaccinationInfoService.deleteNew(ids); } @GetMapping("export") 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 ddc0e05..25b6aee 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 @@ -47,6 +47,26 @@ public interface VaccinationInfoService extends CrudService - + \ No newline at end of file