fix(bug修复): 部门全称

luoyb

2021-03-12 7b7b63de881e04a8197bfa3d145f797167eb8e3c

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpPhysicalExamServiceImpl.java

@@ -7,9 +7,11 @@
import java.util.Optional;

import cc.mrbird.febs.common.core.constant.DicCode;
import cc.mrbird.febs.common.core.entity.constant.FebsConstant;
import cc.mrbird.febs.common.core.entity.system.Dept;
import cc.mrbird.febs.common.core.entity.system.DicItem;
import cc.mrbird.febs.common.core.utils.CastUtil;
import cc.mrbird.febs.common.core.utils.SortUtil;
import cc.mrbird.febs.common.redis.service.RedisService;
import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
@@ -92,9 +94,12 @@
        } else {
            queryWrapper.in("a.EmpStatus", 0);
        }
        Page<EmpPhysicalExam> page = new Page<>(request.getPageNum(), request.getPageSize());
        queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));

        Page<EmpPhysicalExam> page = new Page<>(request.getPageNum(), request.getPageSize());
        SortUtil.handlePageSort(request, page, "createTime", FebsConstant.ORDER_DESC, true);
        IPage<EmpPhysicalExam> iPage = empPhysicalexamMapper.selectPageVo(page, queryWrapper);

        List<EmpPhysicalExam> list = iPage.getRecords();
        //设置字典数据
        List<DicItem> dicItems = CastUtil.castList(redisService.get("dicItems"), DicItem.class);
@@ -177,7 +182,7 @@

    @Override
    @Transactional(rollbackFor = Exception.class)
   public void importEmpPhysicalExam(List<List<Object>> listObject,List<String>  returnList) {
   public void importEmpPhysicalExam(List<List<Object>> listObject,List<String>  returnList,List<DicItem> dicItems) {
      for (List<Object> list : listObject) {
            if (list.size()==0){
                continue;
@@ -209,10 +214,21 @@
         if (StringUtils.isNotBlank(list.get(7).toString())) {
            physicalExam.setPhysicalExamDate(DateUtil.parseDate(list.get(7).toString()));
         }
         physicalExam.setPhysicalExamType(list.get(8).toString());
            //体检
            DicItem  dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"physicalExamType")&&StrUtil.equals(j.getDicItemName(),list.get(8).toString())).findFirst().orElse(null);
            if (null!=dicItem){
                physicalExam.setPhysicalExamType(dicItem.getDicItemCode());
            }

         physicalExam.setBloodPressure(list.get(9).toString());
         physicalExam.setTransaminase(list.get(10).toString());
         physicalExam.setEcg(list.get(11).toString());
         //心电图

              dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"ecg")&&StrUtil.equals(j.getDicItemName(),list.get(11).toString())).findFirst().orElse(null);
            if (null!=dicItem){
                physicalExam.setEcg(dicItem.getDicItemCode());

            }
         physicalExam.setConclusion(list.get(12).toString());
         physicalExam.setReviewRecord(list.get(13).toString());
         physicalExam.setRemark(list.get(14).toString());