From 68ff33beff11310e830b0615b5a81f83fad0f683 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期日, 08 十一月 2026 23:33:14 +0800
Subject: [PATCH] ai优化
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/jobrecord/JobRecordServiceImpl.java | 165 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 163 insertions(+), 2 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/jobrecord/JobRecordServiceImpl.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/jobrecord/JobRecordServiceImpl.java
index a04aeb5..e14aa53 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/jobrecord/JobRecordServiceImpl.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/jobrecord/JobRecordServiceImpl.java
@@ -1,6 +1,11 @@
package cn.lihu.jh.module.ecg.service.jobrecord;
+import cn.lihu.jh.module.ecg.controller.admin.appointment.vo.AppointmentRespVO;
+import cn.lihu.jh.module.ecg.dal.dataobject.appointment.AppointmentDO;
+import cn.lihu.jh.module.ecg.dal.dataobject.devrent.DevRentDO;
import cn.lihu.jh.module.ecg.dal.dataobject.jobrecord.JobRecordStatisticDO;
+import cn.lihu.jh.module.ecg.dal.mysql.appointment.AppointmentMapper;
+import cn.lihu.jh.module.ecg.dal.mysql.devrent.DevRentMapper;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import org.springframework.transaction.annotation.Transactional;
@@ -14,10 +19,14 @@
import cn.lihu.jh.framework.common.util.object.BeanUtils;
import cn.lihu.jh.module.ecg.dal.mysql.jobrecord.JobRecordMapper;
+import cn.lihu.jh.module.ecg.dal.mysql.queue.QueueMapper;
+import cn.lihu.jh.module.ecg.enums.QueueStatusEnum;
+import lombok.extern.slf4j.Slf4j;
import javax.annotation.Resource;
import static cn.lihu.jh.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.lihu.jh.framework.common.pojo.CommonResult.success;
import static cn.lihu.jh.module.ecg.enums.ErrorCodeConstants.*;
/**
@@ -27,10 +36,21 @@
*/
@Service
@Validated
+@Slf4j
public class JobRecordServiceImpl implements JobRecordService {
@Resource
private JobRecordMapper jobRecordMapper;
+
+ /** 銆愭挙閿�鏍囪瘑銆戣褰撴棩闃熷垪鐘舵�侊紝鍒ゆ柇"瀹屾垚鏄惁琚挙閿�杩�" */
+ @Resource
+ private QueueMapper queueMapper;
+
+ @Resource
+ private DevRentMapper devRentMapper;
+
+ @Resource
+ private AppointmentMapper appointmentMapper;
@Override
public Long createJobRecord(JobRecordSaveReqVO createReqVO) {
@@ -66,12 +86,153 @@
@Override
public JobRecordDO getJobRecord(Long id) {
- return jobRecordMapper.selectById(id);
+ JobRecordDO jobRecordDO = jobRecordMapper.selectById(id);
+ if (null != jobRecordDO) {
+ fillPatientInfo(java.util.Collections.singletonList(jobRecordDO));
+ }
+ return jobRecordDO;
}
@Override
public PageResult<JobRecordDO> getJobRecordPage(JobRecordPageReqVO pageReqVO) {
- return jobRecordMapper.selectPage(pageReqVO);
+ PageResult<JobRecordDO> pageResult = jobRecordMapper.selectPage(pageReqVO);
+
+ List<JobRecordDO> jobRecordDOList = pageResult.getList();
+ if ( !jobRecordDOList.isEmpty() ) {
+ List<Long> rentIdList = jobRecordDOList.stream().map(item -> item.getRentId()).toList();
+ List<Integer> paidInfoList = devRentMapper.getPaidInfo(rentIdList);
+ for (int i = 0; i < jobRecordDOList.size(); i++) {
+ jobRecordDOList.get(i).setPaid(paidInfoList.get(i));
+ }
+ // 闇�姹�1锛氬洖濉偅鑰呬俊鎭紙鎵归噺锛岄伩鍏� N+1锛�
+ fillPatientInfo(jobRecordDOList);
+ // 銆愭挙閿�鏍囪瘑銆戞爣璁�"瀹屾垚琚挙閿�杩囥�佽繕娌¢噸鏂板畬鎴�"鐨勮褰�
+ fillUndoneFlag(jobRecordDOList);
+ }
+
+ return pageResult;
+ }
+
+ /**
+ * 銆愭挙閿�鏍囪瘑銆戠粰"宸插畬鎴愯褰�"琛ヤ笂 {@code undone}銆�
+ *
+ * <p>鎾ら攢銆屾鏌ュ畬鎴愩�嶅彧鏄妸闃熷垪琛� 40(宸插氨璇�) 鏀瑰洖 20(鍑嗗涓�)锛�**涓嶇 job_record**锛�
+ * 鍥犳鍒ゆ柇瑙勫垯鏄細璇ユ偅鑰�**浠婃棩**瀵瑰簲妫�鏌ラ」鐩殑闃熷垪琛屽瓨鍦ㄣ�佷笖鐘舵�� 鈮� 40 鈫� 宸茶鎾ら攢銆�
+ * 鎮h�呭啀娆″畬鎴愬悗闃熷垪琛屼細鍥炲埌 40 鈫� 鑷姩鎭㈠鎴�"宸插畬鎴�"锛屾棤闇�鍐欏簱銆佷篃涓嶄細婕忔竻鏍囪銆�
+ *
+ * <p>涓�娆℃壒閲忔煡璇㈣В鍐虫暣椤碉紙鎸� patId 鍙栧綋鏃ラ槦鍒楃姸鎬侊紝鍐嶅湪鍐呭瓨閲屾寜 patId+checkType 鍖归厤锛夈��
+ */
+ private void fillUndoneFlag(List<JobRecordDO> jobRecordDOList) {
+ List<String> patIdList = jobRecordDOList.stream()
+ .map(JobRecordDO::getPatId)
+ .filter(Objects::nonNull)
+ .distinct()
+ .toList();
+ if (patIdList.isEmpty()) {
+ return;
+ }
+ Map<String, Integer> statusMap = new HashMap<>();
+ try {
+ for (Map<String, Object> row : queueMapper.selectTodayStatusByPatIds(patIdList)) {
+ Object patId = row.get("patId");
+ Object checkType = row.get("checkType");
+ Object status = row.get("status");
+ if (null != patId && null != checkType && status instanceof Number) {
+ statusMap.put(patId + "#" + checkType, ((Number) status).intValue());
+ }
+ }
+ } catch (Exception e) {
+ log.warn("[fillUndoneFlag] 璇诲彇褰撴棩闃熷垪鐘舵�佸け璐ワ紝鎾ら攢鏍囪瘑鎸夈�愭湭鎾ら攢銆戝鐞�", e);
+ return;
+ }
+ for (JobRecordDO row : jobRecordDOList) {
+ if (null == row.getPatId() || null == row.getCheckType()) {
+ row.setUndone(false);
+ continue;
+ }
+ Integer status = statusMap.get(row.getPatId() + "#" + row.getCheckType());
+ // 闃熷垪琛屼笉瀛樺湪锛堝巻鍙茶褰�/宸叉竻鐞嗭級鈫� 瑙嗕负鏈挙閿�锛涘瓨鍦ㄤ笖涓嶆槸 40 鈫� 宸叉挙閿�
+ row.setUndone(null != status && QueueStatusEnum.FINISH.getStatus() != status);
+ }
+ }
+
+ // ==================== 闇�姹�1锛氬洖濉偅鑰呬俊鎭� 18 椤� ====================
+ // 鍥炲~閾捐矾锛堜笁绾э級锛�
+ // job_record.rentId 鈫� dev_rent.applyNo 鈫� appointment
+ // 涔嬫墍浠ヤ笉鐢ㄩ�愭潯 getByApplyNo锛歫ob_record 鍒楄〃椤典竴娆″彲鑳借繑鍥炲嚑鍗佹潯锛�
+ // 閫愭潯鏌ヤ細褰㈡垚 N+1銆傝繖閲屾敼涓恒�屾壒閲忓彇 dev_rent銆�+銆屾壒閲忓彇 appointment銆嶃��
+
+ private void fillPatientInfo(List<JobRecordDO> jobRecordDOList) {
+ if (null == jobRecordDOList || jobRecordDOList.isEmpty()) {
+ return;
+ }
+ // 1) 鎵归噺鍙� dev_rent锛屾嬁鍒� applyNo
+ List<Long> rentIdList = jobRecordDOList.stream()
+ .map(JobRecordDO::getRentId)
+ .filter(java.util.Objects::nonNull)
+ .distinct()
+ .toList();
+ if (rentIdList.isEmpty()) {
+ return;
+ }
+ Map<Long, String> applyNoByRentId = new HashMap<>();
+ // 涓�娆� IN 鏌ヨ鍙栧叏閮� applyNo锛堝師鍏堥�愭潯 selectById 鈫� N 娆℃煡璇級
+ List<DevRentDO> devRentDOList = devRentMapper.getApplyNoByIdList(rentIdList);
+ if (null != devRentDOList) {
+ devRentDOList.forEach(d -> {
+ if (null != d && null != d.getId()
+ && org.springframework.util.StringUtils.hasText(d.getApplyNo())) {
+ applyNoByRentId.put(d.getId(), d.getApplyNo());
+ }
+ });
+ }
+ if (applyNoByRentId.isEmpty()) {
+ return;
+ }
+
+ // 2) 鎵归噺鍙� appointment锛堜竴娆� IN 鏌ヨ锛�
+ List<String> applyNoList = applyNoByRentId.values().stream().distinct().toList();
+ Map<String, AppointmentDO> appointmentByApplyNo = new HashMap<>();
+ List<AppointmentDO> appointmentDOList = appointmentMapper.getByApplyNoList(applyNoList);
+ if (null != appointmentDOList) {
+ appointmentDOList.forEach(a -> {
+ if (null != a && org.springframework.util.StringUtils.hasText(a.getApplyNo())) {
+ appointmentByApplyNo.put(a.getApplyNo(), a);
+ }
+ });
+ }
+
+ // 3) 鍥炲~
+ jobRecordDOList.forEach(jobRecordDO -> {
+ if (null == jobRecordDO || null == jobRecordDO.getRentId()) {
+ return;
+ }
+ String applyNo = applyNoByRentId.get(jobRecordDO.getRentId());
+ if (null == applyNo) {
+ return;
+ }
+ AppointmentDO appointment = appointmentByApplyNo.get(applyNo);
+ if (null == appointment) {
+ return;
+ }
+ jobRecordDO.setApplyNo(applyNo);
+ jobRecordDO.setEpisodeId(appointment.getEpisodeId());
+ jobRecordDO.setPatGender(appointment.getPatGender());
+ jobRecordDO.setPatBirthday(appointment.getPatBirthday());
+ jobRecordDO.setRegisterDate(appointment.getRegisterDate());
+ jobRecordDO.setDoctor(appointment.getDoctor());
+ jobRecordDO.setDoctorTime(appointment.getDoctorTime());
+ jobRecordDO.setPatSrc(appointment.getPatSrc());
+ jobRecordDO.setPatMobile(appointment.getPatMobile());
+ jobRecordDO.setPatPhone(appointment.getPatPhone());
+ jobRecordDO.setPatWardDesc(appointment.getPatWardDesc());
+ jobRecordDO.setPatBedNo(appointment.getPatBedNo());
+ jobRecordDO.setMedicalCard(appointment.getMedicalCard());
+ jobRecordDO.setDoctorAdviceNo(appointment.getDoctorAdviceNo());
+ jobRecordDO.setOutpatientNo(appointment.getOutpatientNo());
+ jobRecordDO.setPatIdentityId(appointment.getPatIdentityId());
+ jobRecordDO.setTolerance(appointment.getTolerance());
+ });
}
@Override
--
Gitblit v1.9.3