|
@@ -1,6 +1,7 @@
|
|
|
package com.qunzhixinxi.hnqz.admin.manager;
|
|
|
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
+import cn.hutool.core.text.CharSequenceUtil;
|
|
|
import cn.hutool.core.text.StrPool;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
@@ -16,6 +17,7 @@ import com.qunzhixinxi.hnqz.admin.api.entity.SysDept;
|
|
|
import com.qunzhixinxi.hnqz.admin.api.entity.SysDictItem;
|
|
|
import com.qunzhixinxi.hnqz.admin.api.entity.SysUser;
|
|
|
import com.qunzhixinxi.hnqz.admin.api.entity.WmDaDrugEntDrugtable;
|
|
|
+import com.qunzhixinxi.hnqz.admin.api.entity.WmDaHospital;
|
|
|
import com.qunzhixinxi.hnqz.admin.api.entity.WmScorePackage;
|
|
|
import com.qunzhixinxi.hnqz.admin.api.entity.WmScorePackageStatus;
|
|
|
import com.qunzhixinxi.hnqz.admin.api.entity.WmTask;
|
|
@@ -28,6 +30,7 @@ import com.qunzhixinxi.hnqz.admin.controller.task.vo.TaskRespVO.ToDirectCheck;
|
|
|
import com.qunzhixinxi.hnqz.admin.mapper.SysCheckChainNodeCheckHistoryMapper;
|
|
|
import com.qunzhixinxi.hnqz.admin.mapper.WmTaskV2Mapper;
|
|
|
import com.qunzhixinxi.hnqz.admin.service.SysUserAreaService;
|
|
|
+import com.qunzhixinxi.hnqz.admin.service.WmDaHospitalService;
|
|
|
import com.qunzhixinxi.hnqz.admin.service.WmScorePackageService;
|
|
|
import com.qunzhixinxi.hnqz.admin.service.WmScorePackageStatusService;
|
|
|
import com.qunzhixinxi.hnqz.admin.service.WmTaskContentService;
|
|
@@ -78,6 +81,7 @@ public class TaskManager {
|
|
|
@Resource private SysCheckChainManager checkChainManager;
|
|
|
@Resource private WmScorePackageStatusService scorePackageStatusService;
|
|
|
@Resource private SysCheckChainNodeCheckHistoryMapper checkChainNodeCheckHistoryMapper;
|
|
|
+ @Resource private WmDaHospitalService wmDaHospitalService;
|
|
|
|
|
|
// 丁凯总作为分管领导可见的服务商
|
|
|
private static final List<Integer> DING_KAI_DEPT_ID =
|
|
@@ -446,6 +450,12 @@ public class TaskManager {
|
|
|
// 任务内容
|
|
|
WmTaskContent taskContent = tcId2EntityMap.get(record.getTaskContentId());
|
|
|
record.setTaskContent(taskContent);
|
|
|
+ if (taskContent != null && CharSequenceUtil.isNotBlank(taskContent.getTemp24())) {
|
|
|
+ WmDaHospital hospital = wmDaHospitalService.getById(taskContent.getTemp24());
|
|
|
+ if (hospital != null) {
|
|
|
+ taskContent.setTemp24label(hospital.getYymc());
|
|
|
+ }
|
|
|
+ }
|
|
|
List<WmTaskContentConfig> configList = configMap.get(record.getTaskTypeId());
|
|
|
record.setConfigs(configList);
|
|
|
|