From bcdfa82ecec2908f0dedc82eb852b207622f3a1a Mon Sep 17 00:00:00 2001
From: NiuZiYuan <niuziyuan@jizhiweb.cn>
Date: Mon, 26 May 2025 09:33:16 +0800
Subject: [PATCH] dev

---
 .../controller/statistics/StatisticsController.java    |  4 ++--
 .../service/patient/PatientRegistrationService.java    |  7 +++++++
 .../server/service/statistics/StatisticsService.java   | 10 +++++-----
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/syjiaer/clinic/server/controller/statistics/StatisticsController.java b/src/main/java/com/syjiaer/clinic/server/controller/statistics/StatisticsController.java
index e0497e2..9406fc8 100644
--- a/src/main/java/com/syjiaer/clinic/server/controller/statistics/StatisticsController.java
+++ b/src/main/java/com/syjiaer/clinic/server/controller/statistics/StatisticsController.java
@@ -87,12 +87,12 @@ public class StatisticsController extends BaseController {
      * 获取收费队列 就诊队列数量
      */
     @RequestMapping("/getTipCount")
-    public Result<TipCountVo> getChargeQueueCount() {
+    public Result<TipCountVo> getTipCount() {
         String begin = parmsUtil.getString("beginTime", "开始时间为空");
         String end = parmsUtil.getString("endTime", "结束时间为空");
         LocalDateTime beginTime = DateUtil.getDateTime(begin);
         LocalDateTime endTime = DateUtil.getDateTime(end);
-        return success( statisticsService.getWaitCount(beginTime, endTime));
+        return success( statisticsService.getTipCount(beginTime, endTime));
     }
     /**
      * 商品统计
diff --git a/src/main/java/com/syjiaer/clinic/server/service/patient/PatientRegistrationService.java b/src/main/java/com/syjiaer/clinic/server/service/patient/PatientRegistrationService.java
index 850f710..3fe1e90 100644
--- a/src/main/java/com/syjiaer/clinic/server/service/patient/PatientRegistrationService.java
+++ b/src/main/java/com/syjiaer/clinic/server/service/patient/PatientRegistrationService.java
@@ -292,6 +292,12 @@ public class PatientRegistrationService extends BaseService {
         if (query.getPageSize() == null) {
             query.setPageSize(Constants.DetailPageSize);
         }
+        if (query.getBeginTime() != null) {
+            PatientQueryWrapper.ge("update_datetime", query.getBeginTime());
+        }
+        if (query.getEndTime() != null) {
+            PatientQueryWrapper.le("update_datetime", query.getEndTime());
+        }
 
         return PatientQueryWrapper;
     }
@@ -311,6 +317,7 @@ public class PatientRegistrationService extends BaseService {
                 regis.setIsAppointment(true);
             }
         });
+
         return list;
     }
 
diff --git a/src/main/java/com/syjiaer/clinic/server/service/statistics/StatisticsService.java b/src/main/java/com/syjiaer/clinic/server/service/statistics/StatisticsService.java
index ec7bbb8..bd36934 100644
--- a/src/main/java/com/syjiaer/clinic/server/service/statistics/StatisticsService.java
+++ b/src/main/java/com/syjiaer/clinic/server/service/statistics/StatisticsService.java
@@ -190,7 +190,7 @@ public class StatisticsService extends BaseService {
         return result;
     }
 
-    public TipCountVo getWaitCount(LocalDateTime beginTime, LocalDateTime endTime) {
+    public TipCountVo getTipCount(LocalDateTime beginTime, LocalDateTime endTime) {
         ManagerUser user = getManagerUser();
         ManagerUser dbUser = managerUserMapper.selectById(user.getId());
         OrganizationMember  member= null;
@@ -213,8 +213,8 @@ public class StatisticsService extends BaseService {
 
         registrationStatusEnum = RegistrationStatusEnum.inProgress;
          registrationWrapper = new QueryWrapper<>();
-        registrationWrapper.lt("appointment_time", endTime);
-        registrationWrapper.ge("appointment_time", beginTime);
+        registrationWrapper.lt("update_datetime", endTime);
+        registrationWrapper.ge("update_datetime", beginTime);
         registrationWrapper.eq("status", registrationStatusEnum.getStatus());
         registrationWrapper.eq("del_flag",0);
         if (member != null && member.getRole() == 1){
@@ -224,8 +224,8 @@ public class StatisticsService extends BaseService {
 
         registrationStatusEnum = RegistrationStatusEnum.complete;
         registrationWrapper = new QueryWrapper<>();
-        registrationWrapper.lt("appointment_time", endTime);
-        registrationWrapper.ge("appointment_time", beginTime);
+        registrationWrapper.lt("update_datetime", endTime);
+        registrationWrapper.ge("update_datetime", beginTime);
         registrationWrapper.eq("status", registrationStatusEnum.getStatus());
         registrationWrapper.eq("del_flag",0);
         if (member != null && member.getRole() == 1){