导出新增了合并单元格，样式处理

api/dao/orderProduct.go

@@ -68,6 +68,22 @@ func (r *OrderProductDao) GetOrderProductList(maps interface{}) (m []*model.Orde
 	return m, nil
 }
 
+// GetOrderProductNormalList 获取药品订单列表-正常订单
+func (r *OrderProductDao) GetOrderProductNormalList(maps interface{}, createdAt model.LocalTime) (m []*model.OrderProduct, err error) {
+	query := global.Db.Where(maps)
+
+	// 格式化时间为 "Y-m-d H:i:s"
+	at := time.Time(createdAt).Format("2006-01-02 15:04:05")
+	query = query.Where("created_at < ?", at) // 有效使用时间
+
+	query = query.Where("order_product_status in (?)", []string{"1", "2", "3", "4"})
+	err = query.Find(&m).Error
+	if err != nil {
+		return nil, err
+	}
+	return m, nil
+}
+
 // GetOrderProduct 获取药品订单
 func (r *OrderProductDao) GetOrderProduct(maps interface{}) (m *model.OrderProduct, err error) {
 	err = global.Db.Where(maps).First(&m).Error
@@ -334,6 +350,10 @@ func (r *OrderProductDao) GetOrderProductExportListSearch(req requests.OrderProd
 		return db.Omit("open_id", "union_id", "wx_session_key")
 	})
 
+	query = query.Preload("UserDoctor.User", func(db *gorm.DB) *gorm.DB {
+		return db.Select("user_id", "user_name", "mobile")
+	})
+
 	// 处方
 	query = query.Preload("OrderPrescription", func(db *gorm.DB) *gorm.DB {
 		return db.Select("order_prescription_id", "prescription_code")
@@ -349,6 +369,12 @@ func (r *OrderProductDao) GetOrderProductExportListSearch(req requests.OrderProd
 		return db.Select("user_id", "user_name", "mobile")
 	})
 
+	// 药品列表
+	query = query.Preload("OrderProductItem")
+
+	// 药品列表-药品
+	query = query.Preload("OrderProductItem.Product")
+
 	// 当前搜索数据
 	if req.Type == 1 {
 		// 医生姓名
@@ -534,7 +560,7 @@ func (r *OrderProductDao) GetOrderProductExportListSearch(req requests.OrderProd
 	}
 
 	// 排序
-	query = query.Order("created_at desc")
+	query = query.Order("created_at asc")
 
 	err = query.Find(&m).Error
 	if err != nil {