From da5f06024406c4f210d9a410addc237ba1413217 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 19 十一月 2024 15:14:33 +0800
Subject: [PATCH] 患者详情
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/appointment/AppointmentServiceImpl.java | 55 ++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 40 insertions(+), 15 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/appointment/AppointmentServiceImpl.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/appointment/AppointmentServiceImpl.java
index 7e5ef71..e126dce 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/appointment/AppointmentServiceImpl.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/appointment/AppointmentServiceImpl.java
@@ -3,12 +3,15 @@
import cn.lihu.jh.framework.common.util.date.DateUtils;
import cn.lihu.jh.framework.common.util.date.LocalDateTimeUtils;
import cn.lihu.jh.module.ecg.controller.admin.queue.vo.QueueSaveReqVO;
+import cn.lihu.jh.module.ecg.dal.dataobject.checktype.CheckTypeDO;
+import cn.lihu.jh.module.ecg.dal.dataobject.patient.PatDetails;
import cn.lihu.jh.module.ecg.feign.RemoteDataService;
import cn.lihu.jh.module.ecg.feign.RestApiReqBodyVo;
import cn.lihu.jh.module.ecg.feign.RestApiResult;
import cn.lihu.jh.module.ecg.feign.dto.AppointmentExternal;
import cn.lihu.jh.module.ecg.service.config.EcgConfigService;
import cn.lihu.jh.module.ecg.service.queue.QueueService;
+import cn.lihu.jh.module.ecg.service.queue.QueueServiceTxFunctions;
import cn.lihu.jh.module.ecg.service.queuesequence.QueueSequenceService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.dao.DuplicateKeyException;
@@ -29,7 +32,9 @@
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import static cn.lihu.jh.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.lihu.jh.framework.common.pojo.CommonResult.error;
@@ -121,25 +126,26 @@
public List<AppointmentDO> queryAndCreateAppointmentByPatId(String patCode) {
// 鍏堜粠鍖婚櫌骞冲彴鏌ヨ
List<AppointmentDO> appointmentExtermalList = getAppointmentExtermal( patCode );
- return appointmentExtermalList;
-/* 鍏堜繚鐣�
for ( int appointmentIndex = 0; appointmentIndex < appointmentExtermalList.size(); appointmentIndex++ ) {
AppointmentDO appointmentExtermal = appointmentExtermalList.get(appointmentIndex);
- if (null != appointmentExtermal && null != appointmentExtermal.getBookDate() && appointmentExtermal.getBookDate().isEqual(LocalDate.now())) {
- // 鏌ュ埌褰撳ぉ鐨勯绾﹀悗锛屾煡璇B涓� 鏄惁宸茬粡瀛樺湪
- AppointmentDO appointmentDO = appointmentMapper.getCurrentByPatAndCheckType(appointmentExtermal.getPatId(), appointmentExtermal.getBookCheckType());
- if (null == appointmentDO) {
- appointmentMapper.insert(appointmentExtermal);
- return appointmentExtermal;
- }
- return appointmentDO;
+ if (null == appointmentExtermal )
+ continue;
+
+ // 浠嶥B鏌ュ埌棰勭害锛屾槸鍚﹀凡缁忓瓨鍦�
+ AppointmentDO appointmentDO = appointmentMapper.getByPatAndCheckTypeAndBookDate(appointmentExtermal.getPatId(), appointmentExtermal.getBookCheckType(), appointmentExtermal.getBookDate());
+ if (null == appointmentDO) {
+ appointmentMapper.insert(appointmentExtermal);
+ } else {
+ appointmentExtermal.setId( appointmentDO.getId() ); // 纭繚 杩斿洖鍊间繚鎶� appointment id
}
}
- List<AppointmentDO> appointmentDOList = appointmentMapper.getCurrentPatId( patCode );
- return 0 == appointmentDOList.size() ? null : appointmentDOList.get(0);
- */
+ // 涓嶄粠DB鏌ヨ
+ //List<AppointmentDO> appointmentDOList = appointmentMapper.getCurrentPatId( patCode );
+ //return 0 == appointmentDOList.size() ? null : appointmentDOList.get(0);
+
+ return appointmentExtermalList;
}
@Override
@@ -210,6 +216,11 @@
if (null == appointment)
throw exception(PATIENT_NOT_EXISTS);
+ // 鎵嬪姩棰勭害锛岀洿鎺ヨ缃绾︽棩鏈熶负褰撳ぉ
+ if (confirmReqVO.getIsVip() == 1) {
+ appointment.setBookDate( LocalDate.now() );
+ }
+
if ( !DateUtils.isToday(appointment.getBookDate()) )
throw exception( APPOINTMENT_NOT_TODAY);
@@ -233,7 +244,7 @@
queueSaveReqVO.setIsVip( confirmReqVO.getIsVip() );
queueSaveReqVO.setPassed((byte) 0);
queueSaveReqVO.setExpired((byte) 0);
- queueSaveReqVO.setPatDetails( appointment.getPatDeptDesc() + "-" + appointment.getPatWardDesc() + "-" + appointment.getPatBedNo());
+ queueSaveReqVO.setPatDetails( getPatDetails(appointment) );
queueService.queue(queueSaveReqVO);
} catch (DuplicateKeyException duplicateKeyException) {
throw exception(APPOINTMENT_HAVE_QUEUED);
@@ -289,4 +300,18 @@
return 0;
}
-}
\ No newline at end of file
+
+ private PatDetails getPatDetails(AppointmentDO appointment) {
+ PatDetails patDetails = new PatDetails();
+ patDetails.setId( appointment.getPatId() );
+ patDetails.setName( appointment.getPatName() );
+ patDetails.setMobile( appointment.getPatMobile() );
+ patDetails.setDeptCode( appointment.getPatDeptCode() );
+ patDetails.setDeptDesc( appointment.getPatDeptDesc() );
+ patDetails.setWardCode( appointment.getPatWardCode() );
+ patDetails.setWardDesc( appointment.getPatWardDesc() );
+ patDetails.setBedNo( appointment.getPatBedNo() );
+ return patDetails;
+ }
+}
+
--
Gitblit v1.9.3