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 79a998f..ccbc534 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
@@ -748,10 +748,13 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
     public Result updateSyncUser(SaveEpidemicUserDTO dto) {
         log.info("接受县平台更新人员信息"+dto);
         if(null != dto &&  !CollectionUtils.isEmpty(dto.getList())){
+            updateDictColumn(dto);
             for(EpidemicUserInfoEntity eu : dto.getList()){
                 EpidemicUserInfoEntity check = epidemicUserInfoService.selectInfoByIdCard(eu.getIdCard());
                 if (null == check) {
-                    setDeptInfo(eu.getDeptId().toString(),eu);
+                    if(StringUtils.isNotBlank(eu.getDeptId().toString())){
+                        setDeptInfo(eu.getDeptId().toString(),eu);
+                    }
                     String delFlag = eu.getDelFlag();
                     Date updatedTime = eu.getUpdatedTime();
                     insert(eu);
@@ -761,7 +764,9 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
                 }else{
                     BeanUtils.copyProperties(eu, check);
                     //更新部门信息
-                    setDeptInfo(eu.getDeptId().toString(),check);
+                    if(StringUtils.isNotBlank(eu.getDeptId().toString())){
+                        setDeptInfo(eu.getDeptId().toString(),eu);
+                    }
                     Date updatedTime = eu.getUpdatedTime();
                     updateById(check);
                     check.setUpdatedTime(updatedTime);
@@ -772,6 +777,206 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
         return new Result().ok("更新成功！");
     }
 
+    /**
+    * @describe: 将县平台传送过来的字典汉字转换为字典值
+    * @author wangtong
+    * @date 2022/1/14 16:06
+    * @params [dto]
+    * @return void
+    */
+    private void updateDictColumn(SaveEpidemicUserDTO dto){
+        //获取字典信息
+        SysPopulationSimpleDictFormDTO sysPopulationSimpleDictFormDTO = new SysPopulationSimpleDictFormDTO();
+        List<String> dicTypes = new ArrayList<>();
+        Collections.addAll(dicTypes, PopulationDictConstant.ACCOUNT_TYPE,
+                PopulationDictConstant.BODY_STATUS,
+                PopulationDictConstant.EDUCATION_LEVEL,
+                PopulationDictConstant.EMPLOYMENT_STATUS,
+                PopulationDictConstant.FAMILY_CATEGORY,
+                PopulationDictConstant.GENDER,
+                PopulationDictConstant.HELP_STATUS,
+                PopulationDictConstant.MARITAL_STATUS,
+                PopulationDictConstant.MOTOR_VEHICLE_CATEGORY,
+                PopulationDictConstant.POLITICS_STATUS,
+                PopulationDictConstant.UNEMPLOYMENT_REASON,
+                PopulationDictConstant.SPECIAL_CROWD,
+                PopulationDictConstant.PEOPLE_CATEGORIES);
+        sysPopulationSimpleDictFormDTO.setDicTypes(dicTypes);
+        List<SysPopulationSimpleDictDTO> sysPopulationSimpleDictDTOS = new ArrayList<>();
+        getSysDictList(sysPopulationSimpleDictFormDTO,sysPopulationSimpleDictDTOS);
+        if(CollectionUtils.isEmpty(sysPopulationSimpleDictDTOS)){
+            Result<List<SysPopulationSimpleDictDTO>> listResult = adminVimFeignClient.listPopulationSimple(sysPopulationSimpleDictFormDTO);
+            if (listResult == null || !listResult.success()) {
+                throw new RenException("获取字典信息失败");
+            }
+            sysPopulationSimpleDictDTOS = listResult.getData();
+        }
+
+        for(EpidemicUserInfoEntity userInfo : dto.getList()){
+
+            String specialCrowd = userInfo.getSpecialCrowd() == null ? null : userInfo.getSpecialCrowd().trim();
+            String peopleCategories = userInfo.getPeopleCategories() == null ? null : userInfo.getPeopleCategories().trim();
+            String politicsStatus = userInfo.getPoliticsStatus() == null ? null : userInfo.getPoliticsStatus().trim();
+
+            String standardOfCulture = userInfo.getStandardOfCulture() == null ? null : userInfo.getStandardOfCulture().trim();
+            String health = userInfo.getHealth() == null ? null : userInfo.getHealth().trim();
+            String maritalStatus = userInfo.getMaritalStatus() == null ? null : userInfo.getMaritalStatus().trim();
+            String accountType = userInfo.getAccountType() == null ? null : userInfo.getAccountType().trim();
+            String workStatus = userInfo.getWorkStatus() == null ? null : userInfo.getWorkStatus().trim();
+            String unemploymentReason = userInfo.getUnemploymentReason() == null ? null : userInfo.getUnemploymentReason().trim();
+            String familyCategory = userInfo.getFamilyCategory() == null ? null : userInfo.getFamilyCategory().trim();
+            String helpStatus = userInfo.getHelpStatus() == null ? null : userInfo.getHelpStatus().trim();
+            String motorVehicleCategory = userInfo.getMotorVehicleCategory() == null ? null : userInfo.getMotorVehicleCategory().trim();
+
+
+            if (StringUtils.isNotBlank(politicsStatus)) {
+                for (SysPopulationSimpleDictDTO sysPopulationSimpleDictDTO : sysPopulationSimpleDictDTOS) {
+                    if (PopulationDictConstant.POLITICS_STATUS.equals(sysPopulationSimpleDictDTO.getDicType())) {
+                        List<SysSimpleDictDTO> sysSimpleDictList = sysPopulationSimpleDictDTO.getSysSimpleDicts();
+                        for (SysSimpleDictDTO sysSimpleDict : sysSimpleDictList) {
+                            if (politicsStatus.equals(sysSimpleDict.getDictName())) {
+                                userInfo.setPoliticsStatus(sysSimpleDict.getDictValue());
+                            }
+                        }
+                    }
+                }
+            }
+            if (StringUtils.isNotBlank(specialCrowd)) {
+                for (SysPopulationSimpleDictDTO sysPopulationSimpleDictDTO : sysPopulationSimpleDictDTOS) {
+                    if (PopulationDictConstant.SPECIAL_CROWD.equals(sysPopulationSimpleDictDTO.getDicType())) {
+                        List<SysSimpleDictDTO> sysSimpleDicts = sysPopulationSimpleDictDTO.getSysSimpleDicts();
+                        for (SysSimpleDictDTO sysSimpleDict : sysSimpleDicts) {
+                            if (specialCrowd.equals(sysSimpleDict.getDictName())) {
+                                userInfo.setSpecialCrowd(sysSimpleDict.getDictValue());
+                            }
+                        }
+                    }
+                }
+            }
+            if (StringUtils.isNotBlank(peopleCategories)) {
+                for (SysPopulationSimpleDictDTO sysPopulationSimpleDictDTO : sysPopulationSimpleDictDTOS) {
+                    if (PopulationDictConstant.PEOPLE_CATEGORIES.equals(sysPopulationSimpleDictDTO.getDicType())) {
+                        List<SysSimpleDictDTO> sysSimpleDicts = sysPopulationSimpleDictDTO.getSysSimpleDicts();
+                        for (SysSimpleDictDTO sysSimpleDict : sysSimpleDicts) {
+                            if (peopleCategories.equals(sysSimpleDict.getDictName())) {
+                                userInfo.setPeopleCategories(sysSimpleDict.getDictValue());
+                            }
+                        }
+                    }
+                }
+            }
+            //新增字典校验
+            if (StringUtils.isNotBlank(standardOfCulture)) {
+                for (SysPopulationSimpleDictDTO sysPopulationSimpleDictDTO : sysPopulationSimpleDictDTOS) {
+                    if (PopulationDictConstant.EDUCATION_LEVEL.equals(sysPopulationSimpleDictDTO.getDicType())) {
+                        List<SysSimpleDictDTO> sysSimpleDicts = sysPopulationSimpleDictDTO.getSysSimpleDicts();
+                        for (SysSimpleDictDTO sysSimpleDict : sysSimpleDicts) {
+                            if (standardOfCulture.equals(sysSimpleDict.getDictName())) {
+                                userInfo.setStandardOfCulture(sysSimpleDict.getDictValue());
+                            }
+                        }
+                    }
+                }
+            }
+            if (StringUtils.isNotBlank(health)) {
+                for (SysPopulationSimpleDictDTO sysPopulationSimpleDictDTO : sysPopulationSimpleDictDTOS) {
+                    if (PopulationDictConstant.BODY_STATUS.equals(sysPopulationSimpleDictDTO.getDicType())) {
+                        List<SysSimpleDictDTO> sysSimpleDicts = sysPopulationSimpleDictDTO.getSysSimpleDicts();
+                        for (SysSimpleDictDTO sysSimpleDict : sysSimpleDicts) {
+                            if (health.equals(sysSimpleDict.getDictName())) {
+                                userInfo.setHealth(sysSimpleDict.getDictValue());
+                            }
+                        }
+                    }
+                }
+            }
+            if (StringUtils.isNotBlank(maritalStatus)) {
+                for (SysPopulationSimpleDictDTO sysPopulationSimpleDictDTO : sysPopulationSimpleDictDTOS) {
+                    if (PopulationDictConstant.MARITAL_STATUS.equals(sysPopulationSimpleDictDTO.getDicType())) {
+                        List<SysSimpleDictDTO> sysSimpleDicts = sysPopulationSimpleDictDTO.getSysSimpleDicts();
+                        for (SysSimpleDictDTO sysSimpleDict : sysSimpleDicts) {
+                            if (maritalStatus.equals(sysSimpleDict.getDictName())) {
+                                userInfo.setMaritalStatus(sysSimpleDict.getDictValue());
+                            }
+                        }
+                    }
+                }
+            }
+            if (StringUtils.isNotBlank(accountType)) {
+                for (SysPopulationSimpleDictDTO sysPopulationSimpleDictDTO : sysPopulationSimpleDictDTOS) {
+                    if (PopulationDictConstant.ACCOUNT_TYPE.equals(sysPopulationSimpleDictDTO.getDicType())) {
+                        List<SysSimpleDictDTO> sysSimpleDicts = sysPopulationSimpleDictDTO.getSysSimpleDicts();
+                        for (SysSimpleDictDTO sysSimpleDict : sysSimpleDicts) {
+                            if (accountType.equals(sysSimpleDict.getDictName())) {
+                                userInfo.setAccountType(sysSimpleDict.getDictValue());
+                            }
+                        }
+                    }
+                }
+            }
+            if (StringUtils.isNotBlank(workStatus)) {
+                for (SysPopulationSimpleDictDTO sysPopulationSimpleDictDTO : sysPopulationSimpleDictDTOS) {
+                    if (PopulationDictConstant.EMPLOYMENT_STATUS.equals(sysPopulationSimpleDictDTO.getDicType())) {
+                        List<SysSimpleDictDTO> sysSimpleDicts = sysPopulationSimpleDictDTO.getSysSimpleDicts();
+                        for (SysSimpleDictDTO sysSimpleDict : sysSimpleDicts) {
+                            if (workStatus.equals(sysSimpleDict.getDictName())) {
+                                userInfo.setWorkStatus(sysSimpleDict.getDictValue());
+                            }
+                        }
+                    }
+                }
+            }
+            if (StringUtils.isNotBlank(unemploymentReason)) {
+                for (SysPopulationSimpleDictDTO sysPopulationSimpleDictDTO : sysPopulationSimpleDictDTOS) {
+                    if (PopulationDictConstant.UNEMPLOYMENT_REASON.equals(sysPopulationSimpleDictDTO.getDicType())) {
+                        List<SysSimpleDictDTO> sysSimpleDicts = sysPopulationSimpleDictDTO.getSysSimpleDicts();
+                        for (SysSimpleDictDTO sysSimpleDict : sysSimpleDicts) {
+                            if (unemploymentReason.equals(sysSimpleDict.getDictName())) {
+                                userInfo.setUnemploymentReason(sysSimpleDict.getDictValue());
+                            }
+                        }
+                    }
+                }
+            }
+            if (StringUtils.isNotBlank(familyCategory)) {
+                for (SysPopulationSimpleDictDTO sysPopulationSimpleDictDTO : sysPopulationSimpleDictDTOS) {
+                    if (PopulationDictConstant.FAMILY_CATEGORY.equals(sysPopulationSimpleDictDTO.getDicType())) {
+                        List<SysSimpleDictDTO> sysSimpleDicts = sysPopulationSimpleDictDTO.getSysSimpleDicts();
+                        for (SysSimpleDictDTO sysSimpleDict : sysSimpleDicts) {
+                            if (familyCategory.equals(sysSimpleDict.getDictName())) {
+                                userInfo.setFamilyCategory(sysSimpleDict.getDictValue());
+                            }
+                        }
+                    }
+                }
+            }
+            if (StringUtils.isNotBlank(helpStatus)) {
+                for (SysPopulationSimpleDictDTO sysPopulationSimpleDictDTO : sysPopulationSimpleDictDTOS) {
+                    if (PopulationDictConstant.HELP_STATUS.equals(sysPopulationSimpleDictDTO.getDicType())) {
+                        List<SysSimpleDictDTO> sysSimpleDicts = sysPopulationSimpleDictDTO.getSysSimpleDicts();
+                        for (SysSimpleDictDTO sysSimpleDict : sysSimpleDicts) {
+                            if (helpStatus.equals(sysSimpleDict.getDictName())) {
+                                userInfo.setHelpStatus(sysSimpleDict.getDictValue());
+                            }
+                        }
+                    }
+                }
+            }
+            if (StringUtils.isNotBlank(motorVehicleCategory)) {
+                for (SysPopulationSimpleDictDTO sysPopulationSimpleDictDTO : sysPopulationSimpleDictDTOS) {
+                    if (PopulationDictConstant.MOTOR_VEHICLE_CATEGORY.equals(sysPopulationSimpleDictDTO.getDicType())) {
+                        List<SysSimpleDictDTO> sysSimpleDicts = sysPopulationSimpleDictDTO.getSysSimpleDicts();
+                        for (SysSimpleDictDTO sysSimpleDict : sysSimpleDicts) {
+                            if (motorVehicleCategory.equals(sysSimpleDict.getDictName())) {
+                                userInfo.setMotorVehicleCategory(sysSimpleDict.getDictValue());
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
     private void   setDeptInfo(String deptId , EpidemicUserInfoEntity entity){
         if (StringUtils.isNotBlank(deptId)) {
             Result<ParentAndAllDeptDTO> parentAndAllDept = adminVimFeignClient.getParentAndAllDept(deptId);