From d137034b1c1013954c2b79ce8fd6c78f75168edb Mon Sep 17 00:00:00 2001
From: haomingming <haomingming@igandan.org>
Date: Tue, 6 Jan 2026 18:37:09 +0800
Subject: [PATCH 1/2] 12

---
 api/service/export.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/api/service/export.go b/api/service/export.go
index b5f7d56..eccc6bb 100644
--- a/api/service/export.go
+++ b/api/service/export.go
@@ -1833,6 +1833,9 @@ func (r *ExportService) OrderPrescription(d []*model.OrderPrescription) (string,
 		if v.OrderInquiry !=nil && v.OrderInquiry.UserDoctor != nil {
 			// 医生姓名
 			data.DoctorName = v.OrderInquiry.UserDoctor.UserName
+		}else if(v.UserDoctor !=nil){
+			// 医生姓名
+			data.DoctorName = v.UserDoctor.UserName
 		}
 
 		if v.UserPharmacist != nil {

From ff7959deecc578b68d87c639b9130204fba7ab47 Mon Sep 17 00:00:00 2001
From: haomingming <haomingming@igandan.org>
Date: Thu, 8 Jan 2026 14:51:30 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=B9=8B=E5=89=8D=E4=B8=BA=E5=8C=97?=
 =?UTF-8?q?=E4=BA=AC=E6=AC=A3=E6=AC=A3=E8=B4=A6=E6=88=B7=EF=BC=8C=E7=8E=B0?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E6=88=90=E9=83=BD=E6=AC=A3=E6=AC=A3=E8=B4=A6?=
 =?UTF-8?q?=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 extend/weChat/weChatPay.go | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/extend/weChat/weChatPay.go b/extend/weChat/weChatPay.go
index 0a3ea0b..ebc3976 100644
--- a/extend/weChat/weChatPay.go
+++ b/extend/weChat/weChatPay.go
@@ -35,9 +35,15 @@ func (r RefundRequest) Refund(orderType int) (*refunddomestic.Refund, error) {
 
 	} else if orderType == 2 || orderType == 3 {
 		// 药品/检测
-		mchId = config.C.Wechat.Pay1636644248.MchId
-		mchCertificateSerialNumber = config.C.Wechat.Pay1636644248.MchCertificateSerialNumber
-		v3ApiSecret = config.C.Wechat.Pay1636644248.V3ApiSecret
+
+		// mchId = config.C.Wechat.Pay1636644248.MchId
+		// mchCertificateSerialNumber = config.C.Wechat.Pay1636644248.MchCertificateSerialNumber
+		// v3ApiSecret = config.C.Wechat.Pay1636644248.V3ApiSecret
+
+		// 之前为北京欣欣账户，现改为成都欣欣账户
+		mchId = config.C.Wechat.Pay1659662936.MchId
+		mchCertificateSerialNumber = config.C.Wechat.Pay1659662936.MchCertificateSerialNumber
+		v3ApiSecret = config.C.Wechat.Pay1659662936.V3ApiSecret
 	} else if orderType == 4 {
 		// 服务包
 		mchId = config.C.Wechat.Pay1659662936.MchId