From 4c136bc8d4c7d16a7918a06bb4bda5f34a54ba5d Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期一, 01 三月 2021 00:01:05 +0800
Subject: [PATCH] 修改bug
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpPhysicalExamServiceImpl.java | 63 ++++++++++++++++++++++++++++++-
1 files changed, 60 insertions(+), 3 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 8b56666..c9f84e1 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
@@ -6,6 +6,12 @@
import java.util.List;
import java.util.Optional;
+import cc.mrbird.febs.common.core.constant.DicCode;
+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.redis.service.RedisService;
+import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
@@ -23,6 +29,7 @@
import cc.mrbird.febs.server.hr.entity.EmpPhysicalExam;
import cc.mrbird.febs.server.hr.mapper.EmpPhysicalExamMapper;
import cc.mrbird.febs.server.hr.service.IEmpPhysicalExamService;
+import cn.hutool.core.date.DateUtil;
import lombok.RequiredArgsConstructor;
/**
@@ -39,6 +46,7 @@
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
class EmpPhysicalExamServiceImpl extends ServiceImpl<EmpPhysicalExamMapper, EmpPhysicalExam> implements IEmpPhysicalExamService {
+ private final RedisService redisService;
private final EmpPhysicalExamMapper empPhysicalexamMapper;
private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
.map(u -> u.getUserId().toString())
@@ -61,7 +69,7 @@
queryWrapper.like(EmpPhysicalExam::getDeptName, empPhysicalexam.getDeptName());
}
if (StringUtils.isNotBlank(empPhysicalexam.getPhysicalExamDateStr())) {
- queryWrapper.between(EmpPhysicalExam::getPhysicalExamDate, empPhysicalexam.getPhysicalExamDateStr().split(",")[0], empPhysicalexam.getPhysicalExamDateStr().split(",")[1]);
+ queryWrapper.between(EmpPhysicalExam::getPhysicalExamDate, empPhysicalexam.getPhysicalExamDateStr().split(",")[0], empPhysicalexam.getPhysicalExamDateStr().split(",")[1]);
}
if (StringUtils.isNotBlank(empPhysicalexam.getPhysicalExamType())) {
queryWrapper.eq(EmpPhysicalExam::getPhysicalExamType, empPhysicalexam.getPhysicalExamType());
@@ -76,7 +84,24 @@
queryWrapper.eq(EmpPhysicalExam::getEmpStatus, empPhysicalexam.getEmpStatus());
}
Page<EmpPhysicalExam> page = new Page<>(request.getPageNum(), request.getPageSize());
- return this.page(page, queryWrapper);
+ IPage<EmpPhysicalExam> iPage = this.page(page, queryWrapper);
+ List<EmpPhysicalExam> list = iPage.getRecords();
+ //设置字典数据
+ List<DicItem> dicItems = CastUtil.castList(redisService.get("dicItems"), DicItem.class);
+ list.forEach(p -> {
+ p.setPhysicalExamTypeName(dicItems.stream()
+ .filter(k -> DicCode.PHYSICALEXAMTYPE.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getPhysicalExamType()))
+ .findFirst()
+ .map(DicItem::getDicItemName)
+ .orElse("普通体检"));
+ p.setEcgName(dicItems.stream()
+ .filter(k -> DicCode.ECG.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getPhysicalExamType()))
+ .findFirst()
+ .map(DicItem::getDicItemName)
+ .orElse("正常"));
+ });
+ iPage.setRecords(list);
+ return iPage;
}
@Override
@@ -136,6 +161,38 @@
public boolean momentToNormal(String ids) {
String[] str = ids.split(",");
List<String> list = new ArrayList<>(Arrays.asList(str));
- return empPhysicalexamMapper.momentToNormal(list, operatorId)>0;
+ return empPhysicalexamMapper.momentToNormal(list, operatorId) > 0;
}
+
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void importEmpPhysicalExam(List<List<Object>> listObject) {
+ for (List<Object> list : listObject) {
+ EmpPhysicalExam physicalExam = new EmpPhysicalExam();
+ physicalExam.setPhysicalExamId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
+ physicalExam.setEmpNumb(list.get(0).toString());
+ physicalExam.setDeptName(list.get(1).toString());
+ List<Dept> depts = CastUtil.castList(redisService.get("depts"), Dept.class);
+ Long deptId = depts.stream().filter(d -> d.getDeptName().equals(list.get(1).toString())).findFirst().get()
+ .getDeptId();
+ physicalExam.setDeptId(deptId);
+ physicalExam.setJobName(list.get(2).toString());
+ physicalExam.setEmpName(list.get(3).toString());
+ physicalExam.setCertificateNumb(list.get(4).toString());
+ physicalExam.setSex("男".equals(list.get(5).toString()) ? "1" : "2");
+ physicalExam.setHospital(list.get(6).toString());
+ if (StringUtils.isNotBlank(list.get(7).toString())) {
+ physicalExam.setPhysicalExamDate(DateUtil.parseDate(list.get(7).toString()));
+ }
+ physicalExam.setPhysicalExamType(list.get(8).toString());
+ physicalExam.setBloodPressure(list.get(9).toString());
+ physicalExam.setTransaminase(list.get(10).toString());
+ physicalExam.setEcg(list.get(11).toString());
+ physicalExam.setConclusion(list.get(12).toString());
+ physicalExam.setReviewRecord(list.get(13).toString());
+ physicalExam.setRemark(list.get(14).toString());
+ this.save(physicalExam);
+ }
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0