From 268809bb4d1ace0bbe8ec20262ebb7d7822c8630 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 02 一月 2025 11:25:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
medicalWaste-system/src/main/java/com/sinata/system/service/biz/ScreenService.java | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/service/biz/ScreenService.java b/medicalWaste-system/src/main/java/com/sinata/system/service/biz/ScreenService.java
index 970b29e..8e57d4b 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/service/biz/ScreenService.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/service/biz/ScreenService.java
@@ -8,6 +8,7 @@
import com.sinata.system.domain.MedicalWasteStaticsVO;
import com.sinata.system.domain.MwCollectRecord;
import com.sinata.system.domain.SysDepartment;
+import com.sinata.system.domain.vo.DepartmentTagInfoVO;
import com.sinata.system.domain.vo.ScreenDepartmentVO;
import com.sinata.system.domain.vo.SysDictDataVO;
import com.sinata.system.domain.vo.TodayMedicalWastePieVO;
@@ -15,6 +16,7 @@
import com.sinata.system.enums.DepartmentEnum;
import com.sinata.system.service.ISysDictDataService;
import com.sinata.system.service.MwCollectRecordService;
+import com.sinata.system.service.MwDisposalRecordService;
import com.sinata.system.service.SysDepartmentService;
import lombok.RequiredArgsConstructor;
import org.jetbrains.annotations.NotNull;
@@ -39,6 +41,7 @@
private final SysDepartmentService sysDepartmentService;
private final MwCollectRecordService mwCollectRecordService;
private final ISysDictDataService sysDictDataService;
+ private final MwDisposalRecordService mwDisposalRecordService;
/**
* 机构分布-获取机构列表
@@ -51,6 +54,25 @@
return BeanUtils.copyToList(list, ScreenDepartmentVO.class);
}
+ /**
+ * 获取大屏单位标签信息
+ *
+ * @param id
+ * @return
+ */
+ public DepartmentTagInfoVO getTagInfo(Long id) {
+ SysDepartment department = sysDepartmentService.getById(id);
+ DepartmentTagInfoVO vo = null;
+ if (Objects.isNull(department)) {
+ throw new ServiceException("单位不存在");
+ }
+ if (department.getOrgType().equals(DepartmentEnum.MEDICAL_INSTITUTION.getCode())) {
+ vo = mwCollectRecordService.getTagInfo(id);
+ } else {
+ vo = mwDisposalRecordService.getTagInfo(id);
+ }
+ return vo;
+ }
/**
* 预警数据统计
*
@@ -160,4 +182,6 @@
}
return vo;
}
+
+
}
--
Gitblit v1.7.1