huanghongfa
2021-08-10 5513e69c82a82eb6be786d5cb8e23b81bffc8636
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationMajorExcelListen.java
@@ -18,6 +18,7 @@
import com.panzhihua.common.model.vos.community.ComMngPopulationMajorExcelVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationMajorMistakeExcelVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationMistakeExcelVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationRehabilitationMistakeExcelVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.ListUtils;
import com.panzhihua.common.utlis.PayUtil;
@@ -121,7 +122,7 @@
                throw new ServiceException("500", "导入数据为空!");
            }
            ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
            String key = Constants.Major_POPULATION_ERROR_LIST + communityId;
            String key = Constants.MAJOR_POPULATION_ERROR_LIST + communityId;
            Map<String,String> dictMap = dictionaryR.getData().stream().collect(Collectors.toMap(BcDictionaryVO::getDictName,BcDictionaryVO::getDictValue));
//        Map<String,Integer> dictMap = new HashMap<>();
@@ -323,7 +324,16 @@
                        vo.setGuarDianPhone(oneData.get(17).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(18))){
                        vo.setPatientRelation(oneData.get(18).trim());
                        Integer isOk = PopulRelationEnum.getCodeByName(oneData.get(18));
                        if(isOk.equals(-1)){
                            index++;
                            ComMngPopulationMajorMistakeExcelVO mistake = new ComMngPopulationMajorMistakeExcelVO();
                            setMistake(oneData, mistake);
                            mistake.setMistake("您填写的与患者关系有误");
                            mistakes.add(mistake);
                            continue;
                        }
                        vo.setPatientRelation(isOk);
                    }
                    if(StringUtils.isNotEmpty(oneData.get(19))){
                        vo.setDiagnose(oneData.get(19).trim());