From fdbf09b4120558114e45134322aadb6a8d4bffc8 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期五, 08 十一月 2024 18:46:10 +0800
Subject: [PATCH] update
---
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 8c4c396..3dedf51 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
@@ -7,7 +7,10 @@
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.queuesequence.QueueSequenceService;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.dao.DuplicateKeyException;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -39,10 +42,17 @@
*/
@Service
@Validated
+@Slf4j
public class AppointmentServiceImpl implements AppointmentService {
@Resource
+ private EcgConfigService ecgConfigService;
+
+ @Resource
private RemoteDataService remoteDataService;
+
+ @Resource
+ private QueueSequenceService queueSequenceService;
@Resource
private QueueService queueService;
@@ -104,29 +114,33 @@
}
/**
- * // TODO 灏氫笉鏀寔, 涓�浣嶆偅鑰呭綋澶╀袱绉嶆鏌ラ」鐩殑鎯呭喌
* @param patCode 缂栧彿 : !!! 涓嶄竴瀹氬氨鏄湰绯荤粺鐨� 鎮ｈ�呯紪鍙�(patID), 鏍规簮鍦ㄤ簬 妫�鏌ュ崟鎵弿鍑烘潵鐨勭紪鍙� 涓嶄竴瀹氭槸 鏈郴缁熺殑 鎮ｈ�呯紪鍙�(patID)
* @return
*/
@Override
- public AppointmentDO queryAndCreateAppointmentByPatId(String patCode) {
+ public List<AppointmentDO> queryAndCreateAppointmentByPatId(String patCode) {
// 鍏堜粠鍖婚櫌骞冲彴鏌ヨ
List<AppointmentDO> appointmentExtermalList = getAppointmentExtermal( patCode );
+
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
@@ -155,6 +169,8 @@
AppointmentExternal appointmentExternal = result.getRow().get( appointIndex );
AppointmentDO appointmentDO = BeanUtils.toBean(appointmentExternal, AppointmentDO.class);
+ appointmentDO.setApplyNo( appointmentExternal.getReqIdeApplyno() );
+ appointmentDO.setPatSrc( getCorrespondingPatientSource(appointmentExternal.getAdmTypeCode()) );
appointmentDO.setPatId(appointmentExternal.getPatientID()); // 鍐呭涓� 韬唤璇佸彿 鎴� 闂ㄨ瘖浣忛櫌鍙�
appointmentDO.setPatName(appointmentExternal.getPatName());
appointmentDO.setPatGender(Byte.valueOf(appointmentExternal.getPatgender()));
@@ -175,7 +191,7 @@
if (null != appointmentExternal.getReqExtBooktime() ) {
appointmentDO.setBookDate(DateUtils.ofUTC(appointmentExternal.getReqExtBooktime()).toLocalDate());
LocalDateTime bookStartTime = DateUtils.ofUTC(appointmentExternal.getReqExtBooktime());
- LocalDateTime bookEndTime = bookStartTime.plusMinutes(30);
+ LocalDateTime bookEndTime = bookStartTime.plusMinutes( ecgConfigService.getTimeslotLength());
appointmentDO.setBookTimeslot((bookStartTime.getHour() * 100 + bookStartTime.getMinute()) * 10000 + bookEndTime.getHour() * 100 + bookEndTime.getMinute());
}
@@ -190,13 +206,25 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public String appoitmentConfirm(AppointmentConfirmReqVO confirmReqVO) {
+ public Integer appoitmentConfirm(AppointmentConfirmReqVO confirmReqVO) {
AppointmentDO appointment = getAppointment(confirmReqVO.getId());
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);
+
+
+ Integer newSeqNo = null;
+ if (confirmReqVO.getIsVip() == 0) {
+ newSeqNo = queueSequenceService.distributeSeqNo(confirmReqVO.getBookCheckType(), confirmReqVO.getBookTimeslot());
+ } else {
+ newSeqNo = queueSequenceService.distributeVipSeqNo(confirmReqVO.getBookCheckType(), confirmReqVO.getBookTimeslot());
+ }
try {
QueueSaveReqVO queueSaveReqVO = new QueueSaveReqVO();
@@ -206,6 +234,8 @@
queueSaveReqVO.setBookDate(appointment.getBookDate());
queueSaveReqVO.setBookTimeslot(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());
@@ -214,7 +244,7 @@
throw exception(APPOINTMENT_HAVE_QUEUED);
}
- return "纭鎴愬姛";
+ return newSeqNo;
}
private Integer getCorrespondingCheckType(String strPlanDefItemcode) {
@@ -251,4 +281,17 @@
return 100;
}
+
+ private Integer getCorrespondingPatientSource(String admTypeCode) {
+ if (admTypeCode.equals("AMB"))
+ return 1;
+ else if (admTypeCode.equals("EMER"))
+ return 2;
+ else if (admTypeCode.equals("IMP"))
+ return 3;
+ else if (admTypeCode.equals("PHY"))
+ return 4;
+
+ return 0;
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3