From 4feb978ac9908a46e7285ab0c9a897b89fd99ff2 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期一, 25 十一月 2024 20:17:57 +0800
Subject: [PATCH] Fix Bug:  当天多个检查项目  打印小票 检查项目不对

---
 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/appointment/AppointmentServiceImpl.java |   27 ++++++++++++++++++++-------
 1 files changed, 20 insertions(+), 7 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 e6fdb12..16fe636 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
@@ -73,7 +73,6 @@
         AppointmentDO appointment = BeanUtils.toBean(createReqVO, AppointmentDO.class);
 
         appointment.setBookTime( LocalDateTime.now() );
-        appointment.setBookSrc( 1 );
 
         try {
             appointmentMapper.insert(appointment);
@@ -113,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;
     }
 
     /**
@@ -203,6 +201,7 @@
             appointmentDO.setBookId(appointmentExternal.getReqIdeApplyno());
             appointmentDO.setBookCheckType(getCorrespondingCheckType(appointmentExternal.getPlanDefItemList().getPlanDefItem().getPlanDefItemcode()));
             appointmentDO.setBookTime(DateUtils.ofUTC(appointmentExternal.getReqAuthoredOn()));  // 寮�鍗曟椂闂�
+            appointmentDO.setBookSrc( getBookSource(appointmentExternal.getAdmTypeCode()) );
 
             // 鍏夊紑鍗曠殑鎯呭喌锛屾病鏈夐绾︽椂闂�
             if (null != appointmentExternal.getReqExtBooktime() ) {
@@ -212,8 +211,7 @@
                 appointmentDO.setBookTimeslot((bookStartTime.getHour() * 100 + bookStartTime.getMinute()) * 10000 + bookEndTime.getHour() * 100 + bookEndTime.getMinute());
             }
 
-            appointmentDO.setBookSrc(0);
-            appointmentDO.setPaid(1);
+            appointmentDO.setPaid( 0 );  // TODO
 
             curAppointDOList.add( appointmentDO );
         }
@@ -264,6 +262,19 @@
         }
 
         return newSeqNo;
+    }
+
+    private Integer getBookSource(String admTypeCode) {
+        if (admTypeCode.equals("AMB"))        // 闂ㄨ瘖
+            return 1;
+        else if (admTypeCode.equals("EMER"))  // 鎬ヨ瘖
+            return 2;
+        else if (admTypeCode.equals("PHY"))  // 浣撴
+            return 3;
+        else if (admTypeCode.equals("IMP"))   // 浣忛櫌
+            return 4;
+
+        return 1;
     }
 
     private Integer getCorrespondingCheckType(String strPlanDefItemcode) {
@@ -324,6 +335,8 @@
         patDetails.setWardCode( appointment.getPatWardCode() );
         patDetails.setWardDesc( appointment.getPatWardDesc() );
         patDetails.setBedNo( appointment.getPatBedNo() );
+        patDetails.setSource( appointment.getPatSrc() );
+        patDetails.setApplyNo( appointment.getApplyNo() );
         return patDetails;
     }
 }

--
Gitblit v1.9.3