From eada28f2564c4583a51a48788e27c2e2465de74e Mon Sep 17 00:00:00 2001
From: LiJianZhao <lijianzhao@jizhiweb.cn>
Date: Wed, 7 May 2025 12:47:26 +0800
Subject: [PATCH] deb

---
 .../entity/diagnosis/dto/ChargeQueueQuery.java      |  4 ++++
 .../service/diagnosis/MedicalRecordService.java     | 13 +++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/dto/ChargeQueueQuery.java b/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/dto/ChargeQueueQuery.java
index 0c2cc31..9a3c269 100644
--- a/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/dto/ChargeQueueQuery.java
+++ b/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/dto/ChargeQueueQuery.java
@@ -2,10 +2,14 @@ package com.syjiaer.clinic.server.entity.diagnosis.dto;
 
 import lombok.Data;
 
+import java.time.LocalDateTime;
+
 @Data
 public class ChargeQueueQuery {
     private String patientName;
     private Integer pageNum;
     private Integer pageSize;
     private Integer status;
+    private LocalDateTime beginTime;
+    private LocalDateTime endTime;
 }
diff --git a/src/main/java/com/syjiaer/clinic/server/service/diagnosis/MedicalRecordService.java b/src/main/java/com/syjiaer/clinic/server/service/diagnosis/MedicalRecordService.java
index 9e018cf..609aa43 100644
--- a/src/main/java/com/syjiaer/clinic/server/service/diagnosis/MedicalRecordService.java
+++ b/src/main/java/com/syjiaer/clinic/server/service/diagnosis/MedicalRecordService.java
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.syjiaer.clinic.server.common.api.input.IM2203A;
 import com.syjiaer.clinic.server.common.api.request.SocialRequest;
 import com.syjiaer.clinic.server.common.config.Config;
+import com.syjiaer.clinic.server.common.constants.Constants;
 import com.syjiaer.clinic.server.common.enums.RegistrationStatusEnum;
 import com.syjiaer.clinic.server.common.exception.MessageException;
 import com.syjiaer.clinic.server.common.util.StringUtil;
@@ -327,6 +328,18 @@ public class MedicalRecordService extends BaseService {
         if (query.getStatus() != null) {
             queryWrapper.eq("status", query.getStatus());
         }
+        if (query.getBeginTime() != null){
+            queryWrapper.ge("create_time", query.getBeginTime());
+        }
+        if (query.getEndTime() != null){
+            queryWrapper.le("create_time", query.getEndTime());
+        }
+        if (query.getPageNum() == null ||query.getPageNum() <= 0){
+            query.setPageNum(1);
+        }
+        if (query.getPageSize() == null || query.getPageSize() <= 0){
+            query.setPageSize(Constants.DetailPageSize);
+        }
         Page<Diagnosis> diagnosisList = pageHelper(query.getPageNum(), query.getPageSize(), queryWrapper, diagnosisMapper, "create_time", false);
 
         List<ChargeQueueVo> list = new ArrayList<>();