新增系统商品

api/service/order.go

@@ -163,8 +163,8 @@ func (r *OrderService) ReportPreProduct(orderProductId, adminUserId int64) (bool
 	icdNameStr := strings.Join(icdNameSlice, ";")
 
 	// 处理上传数据-药品数据
-	drugRequests := make([]prescription.DrugRequest, len(orderProductItems))
-	orderDrugRequests := make([]prescription.OrderDrugRequest, len(orderProductItems))
+	drugListRequests := make([]prescription.DrugListRequest, len(orderProductItems))
+	orderDrugListRequests := make([]prescription.OrderDrugListRequest, len(orderProductItems))
 	for i, o := range orderProductItems {
 		// 获取商品数据
 		productDao := dao.ProductDao{}
@@ -179,7 +179,7 @@ func (r *OrderService) ReportPreProduct(orderProductId, adminUserId int64) (bool
 		}
 
 		// 药品数据1
-		drugRequest := prescription.DrugRequest{
+		drugRequest := prescription.DrugListRequest{
 			DrugCode:            product.ProductPlatformCode, // 药品编码
 			ApprovalNumber:      product.LicenseNumber,       // 批准文号
 			DrugName:            product.ProductName,         // 药品名称
@@ -194,10 +194,10 @@ func (r *OrderService) ReportPreProduct(orderProductId, adminUserId int64) (bool
 			FrequencyName:       product.FrequencyUse,        // 频次名称
 			UseDays:             useDays,                     // 使用天数
 		}
-		drugRequests[i] = drugRequest
+		drugListRequests[i] = drugRequest
 
 		// 药品数据2
-		orderDrugRequest := prescription.OrderDrugRequest{
+		orderDrugRequest := prescription.OrderDrugListRequest{
 			DrugCode:       product.ProductPlatformCode, // 药品编码
 			ApprovalNumber: product.LicenseNumber,       // 批准文号
 			DrugName:       product.ProductName,         // 药品名称
@@ -206,7 +206,7 @@ func (r *OrderService) ReportPreProduct(orderProductId, adminUserId int64) (bool
 			DrugCount:      o.Amount,                    // 药品数量
 			PackingUnit:    product.PackagingUnit,       // 药品单位
 		}
-		orderDrugRequests[i] = orderDrugRequest
+		orderDrugListRequests[i] = orderDrugRequest
 	}
 
 	// 处理上传数据-处方数据
@@ -237,8 +237,8 @@ func (r *OrderService) ReportPreProduct(orderProductId, adminUserId int64) (bool
 		PhysicalExamination:      "无",
 		SupplementaryExamination: "无",
 		AllergicHistory:          orderInquiryCase.AllergyHistory,
-		DrugList:                 drugRequests,
-		OrderDrugList:            orderDrugRequests,
+		DrugList:                 drugListRequests,
+		OrderDrugList:            orderDrugListRequests,
 	}
 
 	presRequests[0] = presRequest