Merge remote-tracking branch 'origin/master'

孔祥富

2021-03-01 1c7cb9c300fda246db57ef5c43d118c7eaef22d6

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

@@ -184,7 +184,7 @@
            empOccupational.setHospitalizatioFlag("未住院".equals(list.get(12).toString()) ? 0 : 1);
         }
         if (StringUtils.isNotBlank(list.get(13).toString())) {
            empOccupational.setBedNumb(Integer.valueOf(list.get(14).toString()));
            empOccupational.setBedNumb(list.get(14).toString());
         }
         if (StringUtils.isNotBlank(list.get(14).toString())) {
            empOccupational.setReportTime(DateUtil.parseDate(list.get(14).toString()));