From a4e563ee92fff5a9816e3e834e3342b309ff1aa8 Mon Sep 17 00:00:00 2001
From: wucongxing <815046773@qq.com>
Date: Mon, 9 Oct 2023 16:22:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E6=96=B9=E8=AF=A6=E6=83=85=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E8=8D=AF=E5=93=81=E8=AE=A2=E5=8D=95id=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/dao/orderProduct.go          |  9 +++++++++
 api/dto/OrderPrescription.go     |  9 +++++++++
 api/service/orderPrescription.go | 11 +++++++++++
 3 files changed, 29 insertions(+)

diff --git a/api/dao/orderProduct.go b/api/dao/orderProduct.go
index 6a652e5..bb20c7a 100644
--- a/api/dao/orderProduct.go
+++ b/api/dao/orderProduct.go
@@ -67,6 +67,15 @@ func (r *OrderProductDao) GetOrderProductList(maps interface{}) (m []*model.Orde
 	return m, nil
 }
 
+// GetOrderProduct 获取药品订单
+func (r *OrderProductDao) GetOrderProduct(maps interface{}) (m *model.OrderProduct, err error) {
+	err = global.Db.Where(maps).First(&m).Error
+	if err != nil {
+		return nil, err
+	}
+	return m, nil
+}
+
 // AddOrderProduct 新增药品订单
 func (r *OrderProductDao) AddOrderProduct(tx *gorm.DB, model *model.OrderProduct) (*model.OrderProduct, error) {
 	if err := tx.Create(model).Error; err != nil {
diff --git a/api/dto/OrderPrescription.go b/api/dto/OrderPrescription.go
index 7af70e7..42b957f 100644
--- a/api/dto/OrderPrescription.go
+++ b/api/dto/OrderPrescription.go
@@ -14,6 +14,7 @@ type OrderPrescriptionDto struct {
 	PatientId                string                         `json:"patient_id"`                 // 患者id
 	FamilyId                 string                         `json:"family_id"`                  // 家庭成员id（就诊用户）
 	PharmacistId             string                         `json:"pharmacist_id"`              // 药师id
+	OrderProductId           string                         `json:"order_product_id"`           // 药品订单id
 	PrescriptionStatus       int                            `json:"prescription_status"`        // 处方状态（1:待审核 2:待使用 3:已失效 4:已使用）
 	PharmacistAuditStatus    int                            `json:"pharmacist_audit_status"`    // 药师审核状态（0:审核中 1:审核成功 2:审核驳回）
 	PharmacistVerifyTime     model.LocalTime                `json:"pharmacist_verify_time"`     // 药师审核时间
@@ -197,3 +198,11 @@ func (r *OrderPrescriptionDto) LoadOrderPrescriptionProduct(m []*model.OrderPres
 	}
 	return r
 }
+
+// LoadOrderProductId 加载药品订单id
+func (r *OrderPrescriptionDto) LoadOrderProductId(m *model.OrderProduct) *OrderPrescriptionDto {
+	if m != nil {
+		r.OrderProductId = fmt.Sprintf("%d", m.OrderProductId)
+	}
+	return r
+}
diff --git a/api/service/orderPrescription.go b/api/service/orderPrescription.go
index 847ee0d..2e7a061 100644
--- a/api/service/orderPrescription.go
+++ b/api/service/orderPrescription.go
@@ -53,6 +53,14 @@ func (r *OrderPrescriptionService) GetOrderPrescription(OrderPrescriptionId int6
 		return nil, errors.New("药师数据错误")
 	}
 
+	// 获取药品订单数据
+	orderProductDao := dao.OrderProductDao{}
+
+	maps := make(map[string]interface{})
+	maps["order_inquiry_id"] = orderPrescription.OrderInquiryId
+	maps["order_prescription_id"] = OrderPrescriptionId
+	orderProduct, err := orderProductDao.GetOrderProduct(maps)
+
 	// 处理返回值
 	g = dto.GetOrderPrescriptionDto(orderPrescription)
 
@@ -71,5 +79,8 @@ func (r *OrderPrescriptionService) GetOrderPrescription(OrderPrescriptionId int6
 	// 加载处方商品数据
 	g.LoadOrderPrescriptionProduct(orderPrescriptionProducts)
 
+	// 加载药品订单id
+	g.LoadOrderProductId(orderProduct)
+
 	return g, nil
 }