From 913587c63ac1a475b37e21b7f1fa160a23a286ef Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期三, 06 十一月 2024 18:16:02 +0800
Subject: [PATCH] 检查类型相关
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/appointment/AppointmentServiceImpl.java | 137 ++++++++++++++++++++++++++++++---------------
1 files changed, 90 insertions(+), 47 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 3f0de3d..8c4c396 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
@@ -1,8 +1,8 @@
package cn.lihu.jh.module.ecg.service.appointment;
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.enums.QueueStatusEnum;
import cn.lihu.jh.module.ecg.feign.RemoteDataService;
import cn.lihu.jh.module.ecg.feign.RestApiReqBodyVo;
import cn.lihu.jh.module.ecg.feign.RestApiResult;
@@ -16,19 +16,20 @@
import cn.lihu.jh.module.ecg.controller.admin.appointment.vo.*;
import cn.lihu.jh.module.ecg.dal.dataobject.appointment.AppointmentDO;
import cn.lihu.jh.framework.common.pojo.PageResult;
-import cn.lihu.jh.framework.common.pojo.PageParam;
import cn.lihu.jh.framework.common.util.object.BeanUtils;
import cn.lihu.jh.module.ecg.dal.mysql.appointment.AppointmentMapper;
import javax.annotation.Resource;
+import javax.xml.crypto.Data;
+import java.time.LocalDate;
import java.time.LocalDateTime;
-import java.util.Date;
+import java.util.ArrayList;
+import java.util.List;
import static cn.lihu.jh.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.lihu.jh.framework.common.pojo.CommonResult.error;
-import static cn.lihu.jh.framework.common.pojo.CommonResult.success;
import static cn.lihu.jh.module.ecg.enums.ErrorCodeConstants.*;
/**
@@ -50,14 +51,19 @@
private AppointmentMapper appointmentMapper;
@Override
- public Integer createAppointment(AppointmentSaveReqVO createReqVO) {
+ public Long createAppointment(AppointmentSaveReqVO createReqVO) {
// 鎻掑叆
AppointmentDO appointment = BeanUtils.toBean(createReqVO, AppointmentDO.class);
appointment.setBookTime( LocalDateTime.now() );
appointment.setBookSrc( 1 );
- appointmentMapper.insert(appointment);
+ try {
+ appointmentMapper.insert(appointment);
+ } catch (DuplicateKeyException e) {
+ throw exception(APPOINTMENT_EXIST_TODAY);
+ }
+
// 杩斿洖
return appointment.getId();
}
@@ -72,27 +78,55 @@
}
@Override
- public void deleteAppointment(Integer id) {
+ public void deleteAppointment(Long id) {
// 鏍￠獙瀛樺湪
validateAppointmentExists(id);
// 鍒犻櫎
appointmentMapper.deleteById(id);
}
- private void validateAppointmentExists(Integer id) {
+ private void validateAppointmentExists(Long id) {
if (appointmentMapper.selectById(id) == null) {
throw exception(APPOINTMENT_NOT_EXISTS);
}
}
@Override
- public AppointmentDO getAppointment(Integer id) {
+ public AppointmentDO getAppointment(Long id) {
return appointmentMapper.selectById(id);
}
+ // TODO 灏氫笉鏀寔, 涓�浣嶆偅鑰呭綋澶╀袱绉嶆鏌ラ」鐩殑鎯呭喌
@Override
- public AppointmentDO getAppointmentByPatId(String patId) {
- return appointmentMapper.getByPatId( patId );
+ public AppointmentDO getCurAppointmentByPatId(String patId) {
+ List<AppointmentDO> appointmentDOList = appointmentMapper.getCurrentPatId( patId );
+ return 0 == appointmentDOList.size() ? null : appointmentDOList.get(0);
+ }
+
+ /**
+ * // TODO 灏氫笉鏀寔, 涓�浣嶆偅鑰呭綋澶╀袱绉嶆鏌ラ」鐩殑鎯呭喌
+ * @param patCode 缂栧彿 : !!! 涓嶄竴瀹氬氨鏄湰绯荤粺鐨� 鎮ｈ�呯紪鍙�(patID), 鏍规簮鍦ㄤ簬 妫�鏌ュ崟鎵弿鍑烘潵鐨勭紪鍙� 涓嶄竴瀹氭槸 鏈郴缁熺殑 鎮ｈ�呯紪鍙�(patID)
+ * @return
+ */
+ @Override
+ public 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;
+ }
+ }
+
+ List<AppointmentDO> appointmentDOList = appointmentMapper.getCurrentPatId( patCode );
+ return 0 == appointmentDOList.size() ? null : appointmentDOList.get(0);
}
@Override
@@ -101,59 +135,68 @@
}
@Override
- public AppointmentDO getAppointmentExtermal(String mzzyh) {
+ public List<AppointmentDO> getAppointmentExtermal(String patId) {
+ List<AppointmentDO> curAppointDOList = new ArrayList<AppointmentDO>();
+
RestApiReqBodyVo reqBodyVo = new RestApiReqBodyVo();
- //reqBodyVo.setSfzh(confirmReqVO.getPatId());
- reqBodyVo.setMzzyh( mzzyh );
+ if (18 == patId.length()) {
+ reqBodyVo.setSfzh( patId );
+ } else {
+ reqBodyVo.setMzzyh(patId);
+ }
// QueryRisReportList queryEcgRequest
RestApiResult<AppointmentExternal> result = remoteDataService.httpApi("queryEcgRequest", "ECG", "ECG", reqBodyVo);
- result.getCode();
+ if (0 == result.getRow().size()) {
+ return curAppointDOList;
+ }
- AppointmentExternal appointmentExternal = result.getRow().get(0);
+ for (int appointIndex=0; appointIndex < result.getRow().size(); appointIndex++ ) {
+ AppointmentExternal appointmentExternal = result.getRow().get( appointIndex );
- AppointmentDO appointmentDO = BeanUtils.toBean( appointmentExternal, AppointmentDO.class );
+ AppointmentDO appointmentDO = BeanUtils.toBean(appointmentExternal, AppointmentDO.class);
+ appointmentDO.setPatId(appointmentExternal.getPatientID()); // 鍐呭涓� 韬唤璇佸彿 鎴� 闂ㄨ瘖浣忛櫌鍙�
+ appointmentDO.setPatName(appointmentExternal.getPatName());
+ appointmentDO.setPatGender(Byte.valueOf(appointmentExternal.getPatgender()));
+ appointmentDO.setPatBirthday(DateUtils.ofUTC(appointmentExternal.getEncPatBirthDate()).toLocalDate());
+ appointmentDO.setPatIdentityId(appointmentExternal.getIdentityID());
+ appointmentDO.setPatAddr(appointmentExternal.getAddress());
+ appointmentDO.setPatDeptCode(appointmentExternal.getPatLocDeptCode());
+ appointmentDO.setPatDeptDesc(appointmentExternal.getPatLocDeptDesc());
+ appointmentDO.setPatWardCode(appointmentExternal.getPatLocWardCode());
+ 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.setPatId( appointmentExternal.getPatientID() ); // 鍐呭涓� 韬唤璇佸彿 鎴� 闂ㄨ瘖浣忛櫌鍙�
- appointmentDO.setPatName( appointmentExternal.getPatName() );
- appointmentDO.setPatGender( Byte.valueOf(appointmentExternal.getPatgender()) );
- appointmentDO.setPatBirthday( appointmentExternal.getEncPatBirthDate() );
- appointmentDO.setPatIdentityId( appointmentExternal.getIdentityID() );
- appointmentDO.setPatAddr( appointmentExternal.getAddress() );
- appointmentDO.setPatDeptCode( appointmentExternal.getPatLocDeptCode() );
- appointmentDO.setPatDeptDesc( appointmentExternal.getPatLocDeptDesc() );
- appointmentDO.setPatWardCode( appointmentExternal.getPatLocWardCode() );
- appointmentDO.setPatWardDesc( appointmentExternal.getPatLocWardDesc() );
- appointmentDO.setPatMobile( appointmentExternal.getPhone() );
- appointmentDO.setPatBedNo( appointmentExternal.getEnBedno() );
- appointmentDO.setBookId( appointmentExternal.getReqIdeApplyno() );
- appointmentDO.setBookDate( appointmentExternal.getReqExtBooktime().toLocalDate() );
- appointmentDO.setBookCheckType( getCorrespondingCheckType(appointmentExternal.getPlanDefItemList().getPlanDefItem().getPlanDefItemcode()) );
- appointmentDO.setBookTime( appointmentExternal.getReqAuthoredOn() );
- LocalDateTime bookStartTime = appointmentExternal.getReqExtBooktime();
- LocalDateTime bookEndTime = bookStartTime.plusMinutes(30);
- appointmentDO.setBookTimeslot( (bookStartTime.getHour()*100 + bookStartTime.getMinute())*10000 + bookEndTime.getHour()*100 + bookEndTime.getMinute() );
- appointmentDO.setBookSrc( 0 );
- appointmentDO.setPaid( 1 );
- return appointmentDO;
+ // 鍏夊紑鍗曠殑鎯呭喌锛屾病鏈夐绾︽椂闂�
+ if (null != appointmentExternal.getReqExtBooktime() ) {
+ appointmentDO.setBookDate(DateUtils.ofUTC(appointmentExternal.getReqExtBooktime()).toLocalDate());
+ LocalDateTime bookStartTime = DateUtils.ofUTC(appointmentExternal.getReqExtBooktime());
+ LocalDateTime bookEndTime = bookStartTime.plusMinutes(30);
+ appointmentDO.setBookTimeslot((bookStartTime.getHour() * 100 + bookStartTime.getMinute()) * 10000 + bookEndTime.getHour() * 100 + bookEndTime.getMinute());
+ }
+
+ appointmentDO.setBookSrc(0);
+ appointmentDO.setPaid(1);
+
+ curAppointDOList.add( appointmentDO );
+ }
+
+ return curAppointDOList;
}
@Override
@Transactional(rollbackFor = Exception.class)
public String appoitmentConfirm(AppointmentConfirmReqVO confirmReqVO) {
- AppointmentDO appointment = getAppointmentExtermal(confirmReqVO.getMzzyh());
- if (null == appointment ) {
- //浠庨绾﹁〃鍙栨暟鎹紝鍚庣画瀵规帴鏁版嵁骞冲彴鏌ラ绾︽暟鎹�
- appointment = getAppointment(confirmReqVO.getId());
- }
-
+ AppointmentDO appointment = getAppointment(confirmReqVO.getId());
if (null == appointment)
throw exception(PATIENT_NOT_EXISTS);
if ( !DateUtils.isToday(appointment.getBookDate()) )
throw exception( APPOINTMENT_NOT_TODAY);
-
- appointmentMapper.insert(appointment);
try {
QueueSaveReqVO queueSaveReqVO = new QueueSaveReqVO();
--
Gitblit v1.9.3