From 916ef47a95bb8515f90b407dc80a96a804cc3a5e Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 01 四月 2025 14:11:49 +0800
Subject: [PATCH] just comment
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/appointment/AppointmentServiceImpl.java | 73 +++++++++++++++++++++++++++++-------
1 files changed, 58 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 45cad56..254ea8e 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,16 @@
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.dal.dataobject.queue.QueueDO;
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 +33,10 @@
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 java.util.stream.Collectors;
import static cn.lihu.jh.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.lihu.jh.framework.common.pojo.CommonResult.error;
@@ -66,7 +73,6 @@
AppointmentDO appointment = BeanUtils.toBean(createReqVO, AppointmentDO.class);
appointment.setBookTime( LocalDateTime.now() );
- appointment.setBookSrc( 1 );
try {
appointmentMapper.insert(appointment);
@@ -106,11 +112,10 @@
return appointmentMapper.selectById(id);
}
- // TODO 灏氫笉鏀寔, 涓�浣嶆偅鑰呭綋澶╀袱绉嶆鏌ラ」鐩殑鎯呭喌
@Override
- public AppointmentDO getCurAppointmentByPatId(String patId) {
- List<AppointmentDO> appointmentDOList = appointmentMapper.getCurrentPatId( patId );
- return 0 == appointmentDOList.size() ? null : appointmentDOList.get(0);
+ public AppointmentDO getCurAppointmentByPatIdAndCheckType(String patId, Integer checkType) {
+ AppointmentDO appointmentDO = appointmentMapper.getByPatAndCheckTypeAndBookDate( patId, checkType, LocalDate.now() );
+ return appointmentDO;
}
/**
@@ -119,7 +124,7 @@
*/
@Override
public List<AppointmentDO> queryAndCreateAppointmentByPatId(String patCode) {
- // 鍏堜粠鍖婚櫌骞冲彴鏌ヨ
+ // 浠庡尰闄㈠钩鍙版煡璇�
List<AppointmentDO> appointmentExtermalList = getAppointmentExtermal( patCode );
for ( int appointmentIndex = 0; appointmentIndex < appointmentExtermalList.size(); appointmentIndex++ ) {
@@ -127,12 +132,27 @@
if (null == appointmentExtermal )
continue;
- // 浠嶥B鏌ュ埌棰勭害锛屾槸鍚﹀凡缁忓瓨鍦�
- AppointmentDO appointmentDO = appointmentMapper.getByPatAndCheckTypeAndBookDate(appointmentExtermal.getPatId(), appointmentExtermal.getBookCheckType(), appointmentExtermal.getBookDate());
+ // 浠嶥B鏌ヨ棰勭害锛屾槸鍚﹀凡缁忓瓨鍦�
+ AppointmentDO appointmentDO = appointmentMapper.getByEpisodeIdAndApplyNo(appointmentExtermal.getEpisodeId(), appointmentExtermal.getApplyNo());
if (null == appointmentDO) {
appointmentMapper.insert(appointmentExtermal);
} else {
- appointmentExtermal.setId( appointmentDO.getId() ); // 纭繚 杩斿洖鍊间繚鎶� appointment id
+ appointmentExtermal.setId( appointmentDO.getId() ); // 纭繚 杩斿洖鍊煎寘鍚� appointment id
+
+ // 澶勭悊绗竴娆＄‘璁ゆ椂杩樻病鏈夐绾︽椂闂达紝鍐嶆潵纭鏃跺凡鏈夐绾︽椂闂寸殑鎯呭喌
+ if (appointmentDO.getBookDate() != appointmentExtermal.getBookDate()) {
+ appointmentMapper.updateById( appointmentExtermal );
+ }
+ }
+ }
+
+ // 鏌ヨ[queue琛╙琛ュ厖 book_seq_num 鍒拌繑鍥炲�间腑
+ if (!appointmentExtermalList.isEmpty()) {
+ List<Long> appointIdlist = appointmentExtermalList.stream().map(appointmentDO -> appointmentDO.getId()).toList();
+ List<QueueDO> simpleQueueDOList = queueService.selectBookSeqNumByAppointIdList(appointIdlist);
+ if (!simpleQueueDOList.isEmpty()) {
+ Map<Long, Integer> mapAppointIdVsBookSeqNo = simpleQueueDOList.stream().collect(Collectors.toMap(QueueDO::getAppointId, QueueDO::getBookSeqNum));
+ appointmentExtermalList.forEach(appointmentExterma -> appointmentExterma.setBookSeqNum(mapAppointIdVsBookSeqNo.get(appointmentExterma.getId())));
}
}
@@ -170,6 +190,7 @@
AppointmentDO appointmentDO = BeanUtils.toBean(appointmentExternal, AppointmentDO.class);
appointmentDO.setApplyNo( appointmentExternal.getReqIdeApplyno() );
+ appointmentDO.setEpisodeId( appointmentExternal.getEpisodeID() );
appointmentDO.setPatSrc( getCorrespondingPatientSource(appointmentExternal.getAdmTypeCode()) );
appointmentDO.setPatId(appointmentExternal.getPatientID()); // 鍐呭涓� 韬唤璇佸彿 鎴� 闂ㄨ瘖浣忛櫌鍙�
appointmentDO.setPatName(appointmentExternal.getPatName());
@@ -183,9 +204,9 @@
appointmentDO.setPatWardDesc(appointmentExternal.getPatLocWardDesc());
appointmentDO.setPatMobile(appointmentExternal.getPhone());
appointmentDO.setPatBedNo(appointmentExternal.getEnBedno());
- appointmentDO.setBookId(appointmentExternal.getReqIdeApplyno());
appointmentDO.setBookCheckType(getCorrespondingCheckType(appointmentExternal.getPlanDefItemList().getPlanDefItem().getPlanDefItemcode()));
appointmentDO.setBookTime(DateUtils.ofUTC(appointmentExternal.getReqAuthoredOn())); // 寮�鍗曟椂闂�
+ appointmentDO.setBookSrc( 0 );
// 鍏夊紑鍗曠殑鎯呭喌锛屾病鏈夐绾︽椂闂�
if (null != appointmentExternal.getReqExtBooktime() ) {
@@ -195,8 +216,7 @@
appointmentDO.setBookTimeslot((bookStartTime.getHour() * 100 + bookStartTime.getMinute()) * 10000 + bookEndTime.getHour() * 100 + bookEndTime.getMinute());
}
- appointmentDO.setBookSrc(0);
- appointmentDO.setPaid(1);
+ appointmentDO.setPaid( 0 );
curAppointDOList.add( appointmentDO );
}
@@ -211,6 +231,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);
@@ -224,17 +249,20 @@
try {
QueueSaveReqVO queueSaveReqVO = new QueueSaveReqVO();
+ queueSaveReqVO.setApplyNo( appointment.getApplyNo() );
+ queueSaveReqVO.setEpisodeId( appointment.getEpisodeId() );
+ queueSaveReqVO.setAppointId(appointment.getId());
queueSaveReqVO.setPatId(appointment.getPatId());
queueSaveReqVO.setPatName(appointment.getPatName());
queueSaveReqVO.setPatGender(appointment.getPatGender());
queueSaveReqVO.setBookDate(appointment.getBookDate());
- queueSaveReqVO.setBookTimeslot(appointment.getBookTimeslot());
+ queueSaveReqVO.setBookTimeslot( confirmReqVO.getBookTimeslot() ); /*appointment.getBookTimeslot()*/
queueSaveReqVO.setBookCheckType(appointment.getBookCheckType());
queueSaveReqVO.setBookSeqNum( newSeqNo );
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);
@@ -290,4 +318,19 @@
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() );
+ patDetails.setSource( appointment.getPatSrc() );
+ return patDetails;
+ }
+}
+
--
Gitblit v1.9.3