PC端修改：

疫苗接种记录导入bug修复

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

@@ -389,13 +389,18 @@ public class VaccinationInfoServiceImpl extends BaseVimCurdServiceImpl<Vaccinati
 
         // 网格信息
         List<String> idCards = new ArrayList<>(maxDoseMap.keySet());
-        List<EpidemicUserDeptInfoDTO> userDeptInfoList = epidemicUserInfoDao.selectDeptInfoByIdCards(idCards);
+        List<EpidemicUserDeptInfoDTO> userDeptInfoList = new ArrayList<>();
-        Map<String, EpidemicUserDeptInfoDTO> deptMaps = userDeptInfoList.stream().collect(Collectors.toMap(EpidemicUserDeptInfoDTO::getIdCard, Function.identity()));
+        Map<String, EpidemicUserDeptInfoDTO> deptMaps = new HashMap<>();
+        if (!idCards.isEmpty()) {
+            userDeptInfoList = epidemicUserInfoDao.selectDeptInfoByIdCards(idCards);
+            deptMaps = userDeptInfoList.stream().collect(Collectors.toMap(EpidemicUserDeptInfoDTO::getIdCard, Function.identity()));
+        }
 
         // 插入接种数据
         if (!addList.isEmpty()) {
             List<VaccinationInfoEntity> insertUserList = ConvertUtils.sourceToTarget(addList, VaccinationInfoEntity.class);
             List<EpidemicUserInoutRecordEntity> finalAddressList = addressList;
+            Map<String, EpidemicUserDeptInfoDTO> finalDeptMaps = deptMaps;
             insertUserList.forEach(entity -> {
                 entity.setIdentityNo(entity.getIdentityNo().toUpperCase());
                 Optional<EpidemicUserInoutRecordEntity> addressOptional = finalAddressList.stream().filter(address -> address.getIdCard().equals(entity.getIdentityNo())).findFirst();
@@ -406,7 +411,7 @@ public class VaccinationInfoServiceImpl extends BaseVimCurdServiceImpl<Vaccinati
                     entity.setGrid(addressOptional.get().getGridName());
                     entity.setVillageName(addressOptional.get().getPlot());
                 }
-                EpidemicUserDeptInfoDTO dept = deptMaps.get(entity.getIdentityNo().toUpperCase());
+                EpidemicUserDeptInfoDTO dept = finalDeptMaps.get(entity.getIdentityNo().toUpperCase());
                 if (dept != null) {
                     entity.setGridId(dept.getGridId());
                     entity.setParentDeptIds(dept.getParentDeptIds());

epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoDao.xml

@@ -230,19 +230,15 @@
         SELECT
         i.ID_CARD,
         i.USER_NAME,
-        h.GRID_ID,
+        i.GRID_ID,
-        h.PARENT_DEPT_IDS,
+        i.PARENT_DEPT_IDS,
-        h.PARENT_DEPT_NAMES,
+        i.PARENT_DEPT_NAMES,
-        h.ALL_DEPT_IDS,
+        i.ALL_DEPT_IDS,
-        h.ALL_DEPT_NAMES
+        i.ALL_DEPT_NAMES
         FROM
         epidemic_user_info i
-        LEFT JOIN epdc_house_resident r ON r.RESIDENT_ID = i.id
-        LEFT JOIN epdc_housing_information h ON r.HOUSE_ID = h.id
         WHERE
-        h.DEL_FLAG = '0'
+        i.DEL_FLAG = '0'
-        AND i.DEL_FLAG = '0'
-        AND r.DEL_FLAG = '0'
         AND i.ID_CARD IN
         <foreach collection="idCards" index="index" item="idCard" open="(" separator="," close=")">
             #{idCard}