From c3bafbb11c7b2b7702ab1d20d3f8a844ea49d16b Mon Sep 17 00:00:00 2001
From: wucongxing8150 <815046773@qq.com>
Date: Mon, 17 Jun 2024 09:24:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E6=8E=A5=E8=AF=8A?=
 =?UTF-8?q?=E6=AC=A1=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/dao/orderInquiry.go            |  9 +++++++++
 api/service/orderServicePackage.go | 13 ++++++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/api/dao/orderInquiry.go b/api/dao/orderInquiry.go
index 1508606..d243a0c 100644
--- a/api/dao/orderInquiry.go
+++ b/api/dao/orderInquiry.go
@@ -461,6 +461,15 @@ func (r *OrderInquiryDao) GetOrderInquiryTimeList(maps interface{}, startTime, e
 	return m, nil
 }
 
+// GetOrderInquiryCreatedTimeList 获取问诊订单列表-创建时间
+func (r *OrderInquiryDao) GetOrderInquiryCreatedTimeList(maps interface{}, startTime, endTime string) (m []*model.OrderInquiry, err error) {
+	err = global.Db.Where(maps).Where("created_at BETWEEN ? AND ?", startTime, endTime).Find(&m).Error
+	if err != nil {
+		return nil, err
+	}
+	return m, nil
+}
+
 // GetOrderInquiryForAccountPageSearch 获取账户关联问诊订单列表-分页
 func (r *OrderInquiryDao) GetOrderInquiryForAccountPageSearch(req requests.GetOrderInquiryForAccountPage, page, pageSize int) (m []*model.OrderInquiry, total int64, err error) {
 	var totalRecords int64
diff --git a/api/service/orderServicePackage.go b/api/service/orderServicePackage.go
index f863c1b..1ff10b1 100644
--- a/api/service/orderServicePackage.go
+++ b/api/service/orderServicePackage.go
@@ -2,6 +2,7 @@ package service
 
 import (
 	"errors"
+	"fmt"
 	"hospital-admin-api/api/dao"
 	"hospital-admin-api/api/dto"
 	"hospital-admin-api/api/model"
@@ -113,14 +114,18 @@ func (r *OrderServicePackageService) GetOrderServicePackageDetailInfo(orderServi
 				g.MonthInquiryCount = 1
 			} else {
 				// 获取服务包当月已问诊次数
-				g.MonthInquiryCount, err = r.GetCurrentMonthInquiryCount(g.OrderServiceType, orderServicePackage.UserId, orderServicePackage.DoctorId, CurrentMonthStartDate, CurrentMonthFinishDate)
+				g.MonthInquiryCount, err = r.GetCurrentMonthInquiryCount(g.OrderServiceType, orderServicePackage.UserId, orderServicePackage.DoctorId, g.PayTime)
 				if err != nil {
 					return nil, err
 				}
 			}
 
+			fmt.Println(g.MonthInquiryCount)
+
 			// 获取服务包当月剩余问诊次数
 			g.RemainingInquiryCount = r.GetRemainingInquiryCount(orderServicePackageDetail.MonthlyFrequency, g.MonthInquiryCount)
+
+			fmt.Println(g.RemainingInquiryCount)
 		}
 	}
 
@@ -548,9 +553,11 @@ func (r *OrderServicePackageService) isFirstInquiryServicePackage(orderNo string
 }
 
 // GetCurrentMonthInquiryCount 获取服务包当月已问诊次数
-func (r *OrderServicePackageService) GetCurrentMonthInquiryCount(orderServiceType int, userId, doctorId int64, startDate, endDate time.Time) (int, error) {
+func (r *OrderServicePackageService) GetCurrentMonthInquiryCount(orderServiceType int, userId, doctorId int64, startTime model.LocalTime) (int, error) {
 	orderInquiryDao := dao.OrderInquiryDao{}
 
+	CurrentMonthStartDate, CurrentMonthFinishDate, err := r.getOrderServicePackageCurrentMonthDate(startTime)
+
 	maps := make(map[string]interface{})
 	maps["inquiry_type"] = 1
 
@@ -565,7 +572,7 @@ func (r *OrderServicePackageService) GetCurrentMonthInquiryCount(orderServiceTyp
 	maps["inquiry_refund_status"] = 0
 	maps["inquiry_pay_status"] = 2
 	maps["inquiry_status"] = []int{1, 2, 3, 4, 5, 6}
-	orderInquirys, err := orderInquiryDao.GetOrderInquiryTimeList(maps, startDate.Format("2006-01-02 15:04"), endDate.Format("2006-01-02 15:04:05"))
+	orderInquirys, err := orderInquiryDao.GetOrderInquiryCreatedTimeList(maps, CurrentMonthStartDate.Format("2006-01-02 15:04:05"), CurrentMonthFinishDate.Format("2006-01-02 15:04:05"))
 	if err != nil {
 		return 0, err
 	}