From 5dc193a97f10ded28aceb89f07b795f9495aa01d Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期三, 14 八月 2024 17:53:46 +0800
Subject: [PATCH] update
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java
index 8a370d8..d357c01 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java
@@ -211,17 +211,26 @@
list2.size();
}
- // 鑾峰彇 姣忎釜钀ヤ笟鐨勮瘖瀹� 鍊欒瘖鍑嗗鐨勫綋鍓嶄汉鏁� 灏辫瘖涓殑褰撳墠浜烘暟
- // queueService.get
+ // 鑾峰彇闂ㄨ瘖瀹� 璇婄枟搴婄殑缁熻
List<RoomStatisticsDO> roomStatisticsList = roomService.roomStatistics();
roomStatisticsList.size();
+<<<<<<< HEAD
+=======
+ // 鑾峰彇 姣忎釜钀ヤ笟鐨勮瘖瀹� 鍊欒瘖鍑嗗鐨勫綋鍓嶄汉鏁� 灏辫瘖涓殑褰撳墠浜烘暟
+ // queueService.get
+>>>>>>> c7362f7 (update)
List statusList = new ArrayList<Byte>();
statusList.add((byte)20);
statusList.add((byte)30);
List<QueueStatisticDO> queueStatisticDOList = queueService.queueStatistics(statusList);
queueStatisticDOList.size();
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> c7362f7 (update)
return success("hello");
}
}
--
Gitblit v1.9.3