From e36c1e2363e36a69a3cc8ccbc00d28b16f926abd Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 07 十一月 2024 14:38:57 +0800
Subject: [PATCH] 序号表操作
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/appointment/AppointmentServiceImpl.java | 108 +++++++++++++++++++++++++++++++++--------------------
1 files changed, 67 insertions(+), 41 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 7ce9921..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
@@ -25,6 +25,8 @@
import java.time.LocalDate;
import java.time.LocalDateTime;
+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;
@@ -94,28 +96,37 @@
return appointmentMapper.selectById(id);
}
+ // TODO 灏氫笉鏀寔, 涓�浣嶆偅鑰呭綋澶╀袱绉嶆鏌ラ」鐩殑鎯呭喌
@Override
public AppointmentDO getCurAppointmentByPatId(String patId) {
- AppointmentDO appointmentDO = appointmentMapper.getCurrentPatId( patId );
- return appointmentDO;
+ 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 patId) {
+ public AppointmentDO queryAndCreateAppointmentByPatId(String patCode) {
// 鍏堜粠鍖婚櫌骞冲彴鏌ヨ
- AppointmentDO appointmentExtermal = getAppointmentExtermal( patId );
- if (null != appointmentExtermal && null != appointmentExtermal.getBookDate() && appointmentExtermal.getBookDate().isEqual(LocalDate.now()) ) {
- // 鏌ュ埌褰撳ぉ鐨勯绾﹀悗锛屾煡璇B涓� 鏄惁宸茬粡瀛樺湪
- AppointmentDO appointmentDO = appointmentMapper.getCurrentPatId( patId );
- if (null == appointmentDO ) {
- appointmentExtermal.setBookSrc(0);
- appointmentMapper.insert( appointmentExtermal );
- return appointmentExtermal;
+ 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;
}
- return appointmentDO;
}
- return appointmentMapper.getCurrentPatId( patId );
+ List<AppointmentDO> appointmentDOList = appointmentMapper.getCurrentPatId( patCode );
+ return 0 == appointmentDOList.size() ? null : appointmentDOList.get(0);
}
@Override
@@ -124,42 +135,57 @@
}
@Override
- public AppointmentDO getAppointmentExtermal(String patId) {
+ public List<AppointmentDO> getAppointmentExtermal(String patId) {
+ List<AppointmentDO> curAppointDOList = new ArrayList<AppointmentDO>();
+
RestApiReqBodyVo reqBodyVo = new RestApiReqBodyVo();
- reqBodyVo.setSfzh("");
- reqBodyVo.setMzzyh( patId );
+ if (18 == patId.length()) {
+ reqBodyVo.setSfzh( patId );
+ } else {
+ reqBodyVo.setMzzyh(patId);
+ }
// QueryRisReportList queryEcgRequest
RestApiResult<AppointmentExternal> result = remoteDataService.httpApi("queryEcgRequest", "ECG", "ECG", reqBodyVo);
if (0 == result.getRow().size()) {
- return null;
+ return curAppointDOList;
}
- AppointmentExternal appointmentExternal = result.getRow().get(0);
- AppointmentDO appointmentDO = BeanUtils.toBean( appointmentExternal, AppointmentDO.class );
+ for (int appointIndex=0; appointIndex < result.getRow().size(); appointIndex++ ) {
+ AppointmentExternal appointmentExternal = result.getRow().get( appointIndex );
- 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.setBookDate( DateUtils.ofUTC( appointmentExternal.getReqExtBooktime() ).toLocalDate() );
- appointmentDO.setBookCheckType( getCorrespondingCheckType(appointmentExternal.getPlanDefItemList().getPlanDefItem().getPlanDefItemcode()) );
- appointmentDO.setBookTime( DateUtils.ofUTC( appointmentExternal.getReqAuthoredOn() ) );
- 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 );
- return appointmentDO;
+ 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())); // 寮�鍗曟椂闂�
+
+ // 鍏夊紑鍗曠殑鎯呭喌锛屾病鏈夐绾︽椂闂�
+ 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
--
Gitblit v1.9.3