From 4b278300e8b3b1faabd5d080990cd3124f68612c Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 26 十一月 2024 13:09:28 +0800
Subject: [PATCH] 会取下一个时段的序号

---
 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/appointment/AppointmentServiceImpl.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 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 e433dcd..1eff7cd 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
@@ -112,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;
     }
 
     /**
@@ -186,6 +185,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());
@@ -212,7 +212,7 @@
                 appointmentDO.setBookTimeslot((bookStartTime.getHour() * 100 + bookStartTime.getMinute()) * 10000 + bookEndTime.getHour() * 100 + bookEndTime.getMinute());
             }
 
-            appointmentDO.setPaid( 0 );  // TODO
+            appointmentDO.setPaid( 0 );
 
             curAppointDOList.add( appointmentDO );
         }

--
Gitblit v1.9.3