Merge remote-tracking branch 'origin/master'

# Conflicts:
#	boman-web-core/src/main/java/com/boman/web/core/service/vaccineInfo/impl/VaccineInfoServiceImpl.java

boman-modules/boman-system/src/main/java/com/boman/system/controller/SysUserController.java

@@ -250,7 +250,7 @@ public class SysUserController extends BaseController
     @PutMapping
     public AjaxResult edit(@Validated @RequestBody SysUser user)
     {
-        userService.checkUserAllowed(user);
+        //userService.checkUserAllowed(user);
         if (StringUtils.isNotEmpty(user.getPhonenumber())
                 && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
         {

boman-web-core/src/main/java/com/boman/web/core/controller/VaccineInfoController.java

@@ -147,15 +147,19 @@ public class VaccineInfoController extends BaseController {
     /**
      * 根据身份证号查询用户疫苗信息集合
      */
-    @PostMapping("/syncData")
+    @PostMapping("/syncDataTest")
     public AjaxResult syncData() throws Exception {
         vaccineInfoUserService.syncData();
         return AjaxResult.success();
     }
 
     private String validate(VaccineInfoOperation vaccineInfo) {
-        List<VaccineInfoUser> vaccineInfoUserList = vaccineInfo.getVaccineInfoUserList();
+        String isVaccination = vaccineInfo.getIsVaccination();
         String msg = "";
+        if ("否".equals(isVaccination)){
+            return msg;
+        }
+        List<VaccineInfoUser> vaccineInfoUserList = vaccineInfo.getVaccineInfoUserList();
         for (VaccineInfoUser vaccineInfoUser : vaccineInfoUserList) {
             String vaccineName = vaccineInfoUser.getVaccineName();
             Date vaccinationTime =  vaccineInfoUser.getVaccinationTime();

boman-web-core/src/main/java/com/boman/web/core/service/vaccineInfo/impl/VaccineInfoServiceImpl.java

@@ -1,34 +1,29 @@
 package com.boman.web.core.service.vaccineInfo.impl;
 
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import com.alibaba.fastjson.JSONObject;
 import com.boman.common.core.utils.DateUtils;
 import com.boman.common.core.utils.SecurityUtils;
 import com.boman.common.core.utils.StringUtils;
 import com.boman.common.core.utils.obj.ObjectUtils;
 import com.boman.domain.SysDept;
-import com.boman.domain.SysDictData;
 import com.boman.domain.dto.AjaxResult;
 import com.boman.system.api.RemoteDeptService;
 import com.boman.web.core.domain.VaccineInfoOperation;
 import com.boman.web.core.domain.VaccineInfoUser;
+import com.boman.web.core.mapper.VaccineInfoMapper;
 import com.boman.web.core.mapper.VaccineInfoOperationMapper;
 import com.boman.web.core.mapper.VaccineInfoUserMapper;
 import com.boman.web.core.service.vaccineInfo.IVaccineInfoService;
-
 import com.boman.web.core.utils.AuthUtils;
-import io.swagger.models.auth.In;
 import org.springframework.stereotype.Service;
-import com.boman.web.core.mapper.VaccineInfoMapper;
 import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * 疫苗信息Service业务层处理
@@ -136,7 +131,15 @@ public class VaccineInfoServiceImpl implements IVaccineInfoService {
                 //户籍地
                 String domicile = infoOperation.getDomicile();
                 StringBuilder sbDomicile = new StringBuilder();
-                sbDomicile.append(province).append(city).append(region);
+                if (StringUtils.isNotBlank(province)){
+                    sbDomicile.append(province);
+                }
+                if (StringUtils.isNotBlank(city)){
+                    sbDomicile.append(city);
+                }
+                if (StringUtils.isNotBlank(region)){
+                    sbDomicile.append(region);
+                }
                 if (StringUtils.isNotBlank(domicile)) {
                     sbDomicile.append(domicile);
                 }
@@ -221,31 +224,37 @@ public class VaccineInfoServiceImpl implements IVaccineInfoService {
             Date vaccinationTime = null;
             String vaccineName = "";
             String jiCi = "";
-            if (vaccineInfoUserList != null && vaccineInfoUserList.size() > 0) {
-                for (VaccineInfoUser vaccineInfoUser : vaccineInfoUserList) {
-                    if (StringUtils.isNotBlank(vaccineInfoUser.getVaccineName()) || vaccineInfoUser.getVaccinationTime() != null || StringUtils.isNotBlank(vaccineInfoUser.getVaccinationPlace()) || StringUtils.isNotBlank(vaccineInfoUser.getJici()) || StringUtils.isNotBlank(vaccineInfoUser.getProgress())) {
-                        if (vaccineInfoUser.getVaccinationTime() != null && vaccineInfoUser.getVaccinationTime().compareTo(vaccinationTime) > 0) {
-                            vaccinationTime = vaccineInfoUser.getVaccinationTime();
-                        }
-                        //剂次可能是 "加强针"
-                        String jici = vaccineInfoUser.getJici();
-                        if (StringUtils.isBlank(jiCi)) {
-                            jiCi = vaccineInfoUser.getJici();
-                        }
-                        if (StringUtils.isBlank(vaccineName)) {
-                            vaccineName = vaccineInfoUser.getVaccineName();
-                        }
-                        if (isNumeric(jici) && isNumeric(jiCi)) {
-                            if (Integer.parseInt(jici) > Integer.parseInt(jiCi)) {
+            String isVaccination = vaccineInfoOperation.getIsVaccination();
+            if (!"否".equals(isVaccination)) {
+                if (vaccineInfoUserList != null && vaccineInfoUserList.size() > 0) {
+                    for (VaccineInfoUser vaccineInfoUser : vaccineInfoUserList) {
+                        if (StringUtils.isNotBlank(vaccineInfoUser.getVaccineName()) || vaccineInfoUser.getVaccinationTime() != null || StringUtils.isNotBlank(vaccineInfoUser.getVaccinationPlace()) || StringUtils.isNotBlank(vaccineInfoUser.getJici()) || StringUtils.isNotBlank(vaccineInfoUser.getProgress())) {
+                            if (vaccinationTime == null) {
+                                vaccinationTime = vaccineInfoUser.getVaccinationTime();
+                            } else if (vaccineInfoUser.getVaccinationTime() != null && vaccineInfoUser.getVaccinationTime().compareTo(vaccinationTime) > 0) {
+                                vaccinationTime = vaccineInfoUser.getVaccinationTime();
+                            }
+                            //剂次可能是 "加强针"
+                            String jici = vaccineInfoUser.getJici();
+                            if (StringUtils.isBlank(jiCi)) {
                                 jiCi = vaccineInfoUser.getJici();
                             }
-                        } else if (!isNumeric(jici)) {
-                            jiCi = vaccineInfoUser.getJici();
-                            vaccineName = vaccineInfoUser.getVaccineName();
+                            if (StringUtils.isBlank(vaccineName)) {
+                                vaccineName = vaccineInfoUser.getVaccineName();
+                            }
+                            if (isNumeric(jici) && isNumeric(jiCi)) {
+                                if (Integer.parseInt(jici) > Integer.parseInt(jiCi)) {
+                                    jiCi = vaccineInfoUser.getJici();
+                                    vaccineName = vaccineInfoUser.getVaccineName();
+                                }
+                            } else if (!isNumeric(jici)) {
+                                jiCi = vaccineInfoUser.getJici();
+                                vaccineName = vaccineInfoUser.getVaccineName();
+                            }
+                            vaccineInfoUser.setIdCard(vaccineInfoOperation.getIdCard());
+                            vaccineInfoUser.setCreateBy(SecurityUtils.getUsername());
+                            vaccineInfoUserMapper.insertVaccineInfoUser(vaccineInfoUser);
                         }
-                        vaccineInfoUser.setIdCard(vaccineInfoOperation.getIdCard());
-                        vaccineInfoUser.setCreateBy(SecurityUtils.getUsername());
-                        vaccineInfoUserMapper.insertVaccineInfoUser(vaccineInfoUser);
                     }
                 }
             }
@@ -287,39 +296,42 @@ public class VaccineInfoServiceImpl implements IVaccineInfoService {
             }
             //提取出用户接种疫苗信息列表
             List<VaccineInfoUser> vaccineInfoUserList = vaccineInfoOperation.getVaccineInfoUserList();
-            if (vaccineInfoUserList != null && vaccineInfoUserList.size() > 0) {
-                for (VaccineInfoUser vaccineInfoUser : vaccineInfoUserList) {
-                    //新增的疫苗信息
-                    String vaccineName = vaccineInfoUser.getVaccineName();
-                    String jici = vaccineInfoUser.getJici();
-                    Object vaccineInfoUserMap = map.get(vaccineName + jici);
-                    if (ObjectUtils.isEmpty(vaccineInfoUserMap)) {
-                        //说明没有,则新增
-                        if (StringUtils.isNotBlank(vaccineInfoUser.getVaccineName()) || vaccineInfoUser.getVaccinationTime() != null || StringUtils.isNotBlank(vaccineInfoUser.getVaccinationPlace()) || StringUtils.isNotBlank(vaccineInfoUser.getJici()) || StringUtils.isNotBlank(vaccineInfoUser.getProgress())) {
-                            if (vaccinationTime == null) {
-                                vaccinationTime = vaccineInfoUser.getVaccinationTime();
-                            } else if (vaccineInfoUser.getVaccinationTime() != null && vaccineInfoUser.getVaccinationTime().compareTo(vaccinationTime) > 0) {
-                                vaccinationTime = vaccineInfoUser.getVaccinationTime();
-                            }
-                            if (StringUtils.isBlank(jiCiOld)) {
-                                jiCiOld = vaccineInfoUser.getJici();
-                            }
-                            if (StringUtils.isBlank(vaccineNameOld)) {
-                                vaccineNameOld = vaccineInfoUser.getVaccineName();
-                            }
-                            //剂次可能是 "加强针"
-                            if (isNumeric(jici) && isNumeric(jiCiOld)) {
-                                if (Integer.parseInt(jici) > Integer.parseInt(jiCiOld)) {
+            String isVaccination = vaccineInfoOperation.getIsVaccination();
+            if (!"否".equals(isVaccination)) {
+                if (vaccineInfoUserList != null && vaccineInfoUserList.size() > 0) {
+                    for (VaccineInfoUser vaccineInfoUser : vaccineInfoUserList) {
+                        //新增的疫苗信息
+                        String vaccineName = vaccineInfoUser.getVaccineName();
+                        String jici = vaccineInfoUser.getJici();
+                        Object vaccineInfoUserMap = map.get(vaccineName + jici);
+                        if (ObjectUtils.isEmpty(vaccineInfoUserMap)) {
+                            //说明没有,则新增
+                            if (StringUtils.isNotBlank(vaccineInfoUser.getVaccineName()) || vaccineInfoUser.getVaccinationTime() != null || StringUtils.isNotBlank(vaccineInfoUser.getVaccinationPlace()) || StringUtils.isNotBlank(vaccineInfoUser.getJici()) || StringUtils.isNotBlank(vaccineInfoUser.getProgress())) {
+                                if (vaccinationTime == null) {
+                                    vaccinationTime = vaccineInfoUser.getVaccinationTime();
+                                } else if (vaccineInfoUser.getVaccinationTime() != null && vaccineInfoUser.getVaccinationTime().compareTo(vaccinationTime) > 0) {
+                                    vaccinationTime = vaccineInfoUser.getVaccinationTime();
+                                }
+                                if (StringUtils.isBlank(jiCiOld)) {
                                     jiCiOld = vaccineInfoUser.getJici();
+                                }
+                                if (StringUtils.isBlank(vaccineNameOld)) {
                                     vaccineNameOld = vaccineInfoUser.getVaccineName();
                                 }
-                            } else if (!isNumeric(jici)) {
-                                jiCiOld = vaccineInfoUser.getJici();
-                                vaccineNameOld = vaccineInfoUser.getVaccineName();
+                                //剂次可能是 "加强针"
+                                if (isNumeric(jici) && isNumeric(jiCiOld)) {
+                                    if (Integer.parseInt(jici) > Integer.parseInt(jiCiOld)) {
+                                        jiCiOld = vaccineInfoUser.getJici();
+                                        vaccineNameOld = vaccineInfoUser.getVaccineName();
+                                    }
+                                } else if (!isNumeric(jici)) {
+                                    jiCiOld = vaccineInfoUser.getJici();
+                                    vaccineNameOld = vaccineInfoUser.getVaccineName();
+                                }
+                                vaccineInfoUser.setIdCard(vaccineInfoOperationOld.getIdCard());
+                                vaccineInfoUser.setCreateBy(SecurityUtils.getUsername());
+                                vaccineInfoUserMapper.insertVaccineInfoUser(vaccineInfoUser);
                             }
-                            vaccineInfoUser.setIdCard(vaccineInfoOperationOld.getIdCard());
-                            vaccineInfoUser.setCreateBy(SecurityUtils.getUsername());
-                            vaccineInfoUserMapper.insertVaccineInfoUser(vaccineInfoUser);
                         }
                     }
                 }
@@ -491,68 +503,71 @@ public class VaccineInfoServiceImpl implements IVaccineInfoService {
         String vaccineName = "";
         //剂次
         String jiCi = vaccineInfo.getJici();
-        if (vaccineInfoUserList != null && vaccineInfoUserList.size() > 0) {
-            for (VaccineInfoUser vaccineInfoUser : vaccineInfoUserList) {
-                if (vaccineInfoUser.getId() != null) {
-                    vaccineInfoUser.setUpdateBy(SecurityUtils.getUsername());
-
-                    if (StringUtils.isNotBlank(vaccineInfoUser.getVaccineName()) || vaccineInfoUser.getVaccinationTime() != null || StringUtils.isNotBlank(vaccineInfoUser.getVaccinationPlace()) || StringUtils.isNotBlank(vaccineInfoUser.getJici()) || StringUtils.isNotBlank(vaccineInfoUser.getProgress())) {
-                        if (vaccinationTime == null) {
-                            vaccinationTime = vaccineInfoUser.getVaccinationTime();
-                        } else if (vaccineInfoUser.getVaccinationTime() != null && vaccineInfoUser.getVaccinationTime().compareTo(vaccinationTime) > 0) {
-                            vaccinationTime = vaccineInfoUser.getVaccinationTime();
-                        }
-                        //剂次可能是 "加强针"
-                        String jici = vaccineInfoUser.getJici();
-                        if (StringUtils.isBlank(jiCi)) {
-                            jiCi = vaccineInfoUser.getJici();
-                        }
-                        if (StringUtils.isBlank(vaccineName)) {
-                            vaccineName = vaccineInfoUser.getVaccineName();
-                        }
-                        if (isNumeric(jici) && isNumeric(jiCi)) {
-                            if (Integer.parseInt(jici) > Integer.parseInt(jiCi)) {
+        String isVaccination = vaccineInfo.getIsVaccination();
+        if (!"否".equals(isVaccination)) {
+            if (vaccineInfoUserList != null && vaccineInfoUserList.size() > 0) {
+                for (VaccineInfoUser vaccineInfoUser : vaccineInfoUserList) {
+                    if (vaccineInfoUser.getId() != null) {
+                        vaccineInfoUser.setUpdateBy(SecurityUtils.getUsername());
+
+                        if (StringUtils.isNotBlank(vaccineInfoUser.getVaccineName()) || vaccineInfoUser.getVaccinationTime() != null || StringUtils.isNotBlank(vaccineInfoUser.getVaccinationPlace()) || StringUtils.isNotBlank(vaccineInfoUser.getJici()) || StringUtils.isNotBlank(vaccineInfoUser.getProgress())) {
+                            if (vaccinationTime == null) {
+                                vaccinationTime = vaccineInfoUser.getVaccinationTime();
+                            } else if (vaccineInfoUser.getVaccinationTime() != null && vaccineInfoUser.getVaccinationTime().compareTo(vaccinationTime) > 0) {
+                                vaccinationTime = vaccineInfoUser.getVaccinationTime();
+                            }
+                            //剂次可能是 "加强针"
+                            String jici = vaccineInfoUser.getJici();
+                            if (StringUtils.isBlank(jiCi)) {
                                 jiCi = vaccineInfoUser.getJici();
+                            }
+                            if (StringUtils.isBlank(vaccineName)) {
                                 vaccineName = vaccineInfoUser.getVaccineName();
                             }
-                        } else if (!isNumeric(jici)) {
-                            jiCi = vaccineInfoUser.getJici();
-                            vaccineName = vaccineInfoUser.getVaccineName();
-                        }
-                        if (neetUpdate) {
-                            vaccineInfoUser.setIdCard(vaccineInfo.getIdCard());
+                            if (isNumeric(jici) && isNumeric(jiCi)) {
+                                if (Integer.parseInt(jici) > Integer.parseInt(jiCi)) {
+                                    jiCi = vaccineInfoUser.getJici();
+                                    vaccineName = vaccineInfoUser.getVaccineName();
+                                }
+                            } else if (!isNumeric(jici)) {
+                                jiCi = vaccineInfoUser.getJici();
+                                vaccineName = vaccineInfoUser.getVaccineName();
+                            }
+                            if (neetUpdate) {
+                                vaccineInfoUser.setIdCard(vaccineInfo.getIdCard());
+                            }
+                            vaccineInfoUserMapper.updateVaccineInfoUser(vaccineInfoUser);
                         }
-                        vaccineInfoUserMapper.updateVaccineInfoUser(vaccineInfoUser);
-                    }
 
-                } else {
-                    if (StringUtils.isNotBlank(vaccineInfoUser.getVaccineName()) || vaccineInfoUser.getVaccinationTime() != null || StringUtils.isNotBlank(vaccineInfoUser.getVaccinationPlace()) || StringUtils.isNotBlank(vaccineInfoUser.getJici()) || StringUtils.isNotBlank(vaccineInfoUser.getProgress())) {
-                        //判断接种时间是否是新
-                        if (vaccinationTime == null) {
-                            vaccinationTime = vaccineInfoUser.getVaccinationTime();
-                        } else if (vaccineInfoUser.getVaccinationTime() != null && vaccineInfoUser.getVaccinationTime().compareTo(vaccinationTime) > 0) {
-                            vaccinationTime = vaccineInfoUser.getVaccinationTime();
-                        }
-                        //剂次可能是 "加强针"
-                        String jici = vaccineInfoUser.getJici();
-                        if (StringUtils.isBlank(jiCi)) {
-                            jiCi = vaccineInfoUser.getJici();
-                        }
-                        if (StringUtils.isBlank(vaccineName)) {
-                            vaccineName = vaccineInfoUser.getVaccineName();
-                        }
-                        if (isNumeric(jici) && isNumeric(jiCi)) {
-                            if (Integer.parseInt(jici) > Integer.parseInt(jiCi)) {
+                    } else {
+                        if (StringUtils.isNotBlank(vaccineInfoUser.getVaccineName()) || vaccineInfoUser.getVaccinationTime() != null || StringUtils.isNotBlank(vaccineInfoUser.getVaccinationPlace()) || StringUtils.isNotBlank(vaccineInfoUser.getJici()) || StringUtils.isNotBlank(vaccineInfoUser.getProgress())) {
+                            //判断接种时间是否是新
+                            if (vaccinationTime == null) {
+                                vaccinationTime = vaccineInfoUser.getVaccinationTime();
+                            } else if (vaccineInfoUser.getVaccinationTime() != null && vaccineInfoUser.getVaccinationTime().compareTo(vaccinationTime) > 0) {
+                                vaccinationTime = vaccineInfoUser.getVaccinationTime();
+                            }
+                            //剂次可能是 "加强针"
+                            String jici = vaccineInfoUser.getJici();
+                            if (StringUtils.isBlank(jiCi)) {
                                 jiCi = vaccineInfoUser.getJici();
+                            }
+                            if (StringUtils.isBlank(vaccineName)) {
                                 vaccineName = vaccineInfoUser.getVaccineName();
                             }
-                        } else if (!isNumeric(jici)) {
-                            jiCi = vaccineInfoUser.getJici();
-                            vaccineName = vaccineInfoUser.getVaccineName();
+                            if (isNumeric(jici) && isNumeric(jiCi)) {
+                                if (Integer.parseInt(jici) > Integer.parseInt(jiCi)) {
+                                    jiCi = vaccineInfoUser.getJici();
+                                    vaccineName = vaccineInfoUser.getVaccineName();
+                                }
+                            } else if (!isNumeric(jici)) {
+                                jiCi = vaccineInfoUser.getJici();
+                                vaccineName = vaccineInfoUser.getVaccineName();
+                            }
+                            vaccineInfoUser.setIdCard(vaccineInfo.getIdCard());
+                            vaccineInfoUser.setCreateBy(SecurityUtils.getUsername());
+                            vaccineInfoUserMapper.insertVaccineInfoUser(vaccineInfoUser);
                         }
-                        vaccineInfoUser.setIdCard(vaccineInfo.getIdCard());
-                        vaccineInfoUser.setCreateBy(SecurityUtils.getUsername());
-                        vaccineInfoUserMapper.insertVaccineInfoUser(vaccineInfoUser);
                     }
                 }
             }
@@ -573,7 +588,7 @@ public class VaccineInfoServiceImpl implements IVaccineInfoService {
         vaccineInfoOperationNew.setCreateBy(SecurityUtils.getUsername());
         vaccineInfoOperationNew.setVaccineInfoId(vaccineInfo.getId());
         vaccineInfoOperationMapper.insertVaccineInfoOperation(vaccineInfoOperationNew);
-        return info > 0? AjaxResult.success():AjaxResult.error();
+        return info > 0 ? AjaxResult.success() : AjaxResult.error();
     }
 
     /**

boman-web-core/src/main/java/com/boman/web/core/service/vaccineInfo/impl/VaccineInfoUserServiceImpl.java

@@ -69,8 +69,7 @@ public class VaccineInfoUserServiceImpl implements IVaccineInfoUserService {
      * 接种情况（是/否）
      * 人群分类
      */
-    @Override
-    public void syncData() throws Exception {
+    public void syncData222() throws Exception {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         // 获取疫苗信息，每次处理1000条
         int counts = syncMapper.selectCount("select count(1) from vaccine_info");
@@ -169,8 +168,62 @@ public class VaccineInfoUserServiceImpl implements IVaccineInfoUserService {
         }
     }
 
+
+    @Override
+    public void syncData() throws Exception {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        // 获取疫苗信息，每次处理1000条
+//        int counts = syncMapper.selectCount("select count(1) from vaccine_info");
+        int count = 1;
+        int counts = 1;
+        int times = counts / 1000;
+        int startPagte = 0;
+        int endPage = 1000;
+
+        for (int i = 0; i < times + 1; i++) {
+            List<JSONObject> vaccInfos = this.getVaccInfo(startPagte, endPage);
+            // 身份证号码
+            List<String> idCards = new ArrayList<>();
+            Map<String, JSONObject> vannInfoMap = new HashMap<>();
+
+            Map<String, String> progressMap = new HashMap<>();
+            for (JSONObject vanninfo : vaccInfos) {
+                String idcard = vanninfo.getString("id_card");
+                JSONObject jsonObject = new JSONObject();
+                jsonObject.put("id_card", idcard);
+                progressMap.put(idcard, vanninfo.getString("progress"));
+                vannInfoMap.put(idcard, jsonObject);
+                idCards.add(idcard);
+            }
+
+            int secCount = 1;
+            // 查询疫苗是否完成
+            for (String icsard : idCards) {
+                JSONObject update = vannInfoMap.get(icsard);
+                JSONObject userInfo = this.getvaccUser(icsard);
+                if (userInfo != null) {
+                    if(progressMap.get(icsard).equals("否")) {
+                        update.put("shouldSlow", "是");
+                    }else {
+                        update.put("shouldSlow", "否");
+                    }
+                    update.put("should_be", "否");
+                } else {
+                    update.put("shouldSlow", "否");
+                    update.put("should_be", "是");
+                }
+
+                System.out.println("secCount: " + secCount);
+                secCount++;
+            }
+            this.updateData(new ArrayList(vannInfoMap.values()), count);
+            count++;
+            startPagte += 1000;
+        }
+    }
+
     private List<JSONObject> getVaccInfo(int startPagte, int endPage) {
-        String sql = "select * from vaccine_info limit " + startPagte + ", " + endPage;
+        String sql = "select * from vaccine_info where id_card = '11010819710505603X' limit " + startPagte + ", " + endPage;
         List<JSONObject> objs = syncMapper.selectBySql(sql);
         return objs;
     }

boman-web-core/src/main/resources/mapper/VaccineInfoMapper.xml

@@ -302,6 +302,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="findHjInfo" parameterType="VaccineInfoOperation" resultMap="VaccineInfoResult">
         select id, user_name ,gender, birthday,age from vaccine_info
         <where>
+            is_del = 'N'
          <if test="idCard != null and idCard != '' ">id_card = #{idCard}</if>
         </where>
         limit 1