From fda3f979616e3c5e26993ec7033900cd188ea296 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期四, 11 三月 2021 09:38:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpPhysicalExamServiceImpl.java | 35 +++++++++++++++++++++++++++++------
1 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpPhysicalExamServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpPhysicalExamServiceImpl.java
index 3a283fe..5013b22 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpPhysicalExamServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpPhysicalExamServiceImpl.java
@@ -12,6 +12,7 @@
import cc.mrbird.febs.common.core.utils.CastUtil;
import cc.mrbird.febs.common.redis.service.RedisService;
import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
+import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
import cn.hutool.core.util.StrUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
@@ -52,6 +53,7 @@
private final RedisService redisService;
private final EmpPhysicalExamMapper empPhysicalexamMapper;
+ private final IEmpBaseInfoService empBaseInfoService;
private final IRemoteDeptService remoteDeptService;
private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
.map(u -> u.getUserId().toString())
@@ -86,7 +88,9 @@
queryWrapper.like("a.Conclusion", empPhysicalexam.getConclusion());
}
if (StringUtils.isNotBlank(empPhysicalexam.getEmpStatus())) {
- queryWrapper.eq("a.EmpStatus", empPhysicalexam.getEmpStatus());
+ queryWrapper.in("a.EmpStatus", empPhysicalexam.getEmpStatus().split(","));
+ } 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));
@@ -173,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;
@@ -183,11 +187,19 @@
physicalExam.setEmpNumb(list.get(0).toString());
physicalExam.setDeptName(list.get(1).toString());
List<Dept> depts = CastUtil.castList(redisService.get("depts"), Dept.class);
- Dept dept = depts.stream().filter(d -> d.getDeptName().equals(list.get(3).toString())).findFirst().orElse(null);
+ Dept dept = depts.stream().filter(d -> d.getDeptName().equals(list.get(1).toString())).findFirst().orElse(null);
if (null == dept) {
- returnList.add(StrUtil.format("导入员工基本信息异常: 出现位置第{}行, 原因:{}部门不存在",listObject.indexOf(list),list.get(3).toString()));
+ returnList.add(StrUtil.format("导入员工体检信息异常: 出现位置第{}行, 原因:{}部门不存在",listObject.indexOf(list)+1,list.get(1).toString()));
continue;
}
+ Long empId = empBaseInfoService.getEmpIdByEmpNumb(list.get(0).toString());
+ if (null == empId){
+ returnList.add(StrUtil.format("导入员工体检信息异常: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
+ continue;
+ }
+ physicalExam.setDelFlag(2);
+ physicalExam.setEmpId(empId);
+ physicalExam.setDeptName(list.get(1).toString());
physicalExam.setDeptId(dept.getDeptId());
physicalExam.setJobName(list.get(2).toString());
physicalExam.setEmpName(list.get(3).toString());
@@ -197,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());
--
Gitblit v1.8.0