Browse Source

修复身份证参数问题

feature/yujt_vim
yujt 4 years ago
parent
commit
43671559d1
  1. 2
      epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dao/EpidemicUserInfoDao.java
  2. 4
      epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java
  3. 2
      epdc-cloud-vim-yushan/src/main/resources/mapper/vim/VaccinationInfoDao.xml

2
epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dao/EpidemicUserInfoDao.java

@ -116,7 +116,7 @@ public interface EpidemicUserInfoDao extends BaseDao<EpidemicUserInfoEntity> {
* @author zhy
* @date 2021/4/30 10:06
*/
EpidemicUserInfoEntity checkCompleteInfo(@Param("idCard") Long idCard, @Param("vaccinationState") String vaccinationState);
EpidemicUserInfoEntity checkCompleteInfo(@Param("idCard") String idCard, @Param("vaccinationState") String vaccinationState);
/**
* 查询全部人员信息

4
epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java

@ -354,11 +354,11 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
userInfoDTO.setVaccinationState(dto.getVaccinationState());
} else {
// 否则先检查是否有接种完成的记录
EpidemicUserInfoEntity completeInfo = epidemicUserInfoDao.checkCompleteInfo(dto.getId(), "2");
EpidemicUserInfoEntity completeInfo = epidemicUserInfoDao.checkCompleteInfo(dto.getIdentityNo(), "2");
// 没有接种完成的记录需要继续查询最大接种剂次
if (completeInfo == null) {
// 检查最大剂次
completeInfo = epidemicUserInfoDao.checkCompleteInfo(dto.getId(), null);
completeInfo = epidemicUserInfoDao.checkCompleteInfo(dto.getIdentityNo(), null);
if (completeInfo == null || completeInfo.getVaccinationNum() < dto.getDose()) {
// 如果没有接种记录或者接种记录的剂次小于本次,那么更新最新的状态
userInfoDTO.setVaccinationNum(dto.getDose());

2
epdc-cloud-vim-yushan/src/main/resources/mapper/vim/VaccinationInfoDao.xml

@ -43,7 +43,7 @@
u.ID_CARD,
u.VACCINATION_STATE,
vi.DOSE,
DATE_FORMAT( vi.VACCINATION_TIME, '%Y-%M-%d' ) AS VACCINATION_TIME,
DATE_FORMAT( vi.VACCINATION_TIME, '%Y-%m-%d' ) AS VACCINATION_TIME,
vc.COMPANY_NAME,
vs.SITE_NAME
FROM

Loading…
Cancel
Save