修改bug

yz

2021-03-12 6a12ce06674bdbee846144d7e21e9fff8d4c5ef3

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

@@ -177,7 +177,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 +209,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());