From 6b4e8545b39e7f614b5285754e7ae5c4bb4bb7f6 Mon Sep 17 00:00:00 2001
From: wucongxing8150 <815046773@qq.com>
Date: Thu, 25 Jul 2024 09:22:18 +0800
Subject: [PATCH] 1

---
 api/dao/hospital.go      | 4 ++--
 api/dto/Product.go       | 2 +-
 api/requests/hospital.go | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/api/dao/hospital.go b/api/dao/hospital.go
index bfac701..090f14b 100644
--- a/api/dao/hospital.go
+++ b/api/dao/hospital.go
@@ -114,11 +114,11 @@ func (r *HospitalDao) GetHospitalPageSearch(req requests.GetHospitalPage, page,
 		query = query.Where("province_id = ?", req.ProvinceId)
 	}
 
-	if req.CityId != 0 {
+	if req.CityId != nil {
 		query = query.Where("city_id = ?", req.CityId)
 	}
 
-	if req.CountyId != 0 {
+	if req.CountyId != nil {
 		query = query.Where("county_id = ?", req.CountyId)
 	}
 
diff --git a/api/dto/Product.go b/api/dto/Product.go
index 229f896..0443e60 100644
--- a/api/dto/Product.go
+++ b/api/dto/Product.go
@@ -43,7 +43,7 @@ func GetProductDto(m *model.Product) *ProductDto {
 		IsDelete:            m.IsDelete,
 		PrescriptionNum:     m.PrescriptionNum,
 		ProductName:         m.ProductName,
-		CommonName:          m.ProductName,
+		CommonName:          m.CommonName,
 		ProductPrice:        m.ProductPrice,
 		MnemonicCode:        m.MnemonicCode,
 		ProductType:         m.ProductType,
diff --git a/api/requests/hospital.go b/api/requests/hospital.go
index 6fa3615..5e8f73e 100644
--- a/api/requests/hospital.go
+++ b/api/requests/hospital.go
@@ -27,8 +27,8 @@ type GetHospitalPage struct {
 	HospitalName      string `json:"hospital_name" form:"hospital_name" label:"医院名称"`
 	HospitalLevelName string `json:"hospital_level_name" form:"hospital_level_name" label:"医院等级名称"`
 	ProvinceId        int    `json:"province_id"  form:"province_id" label:"省份id"`
-	CityId            int    `json:"city_id"  form:"city_id" label:"城市id"`
-	CountyId          int    `json:"county_id"  form:"county_id" label:"区县id"`
+	CityId            *int   `json:"city_id"  form:"city_id" label:"城市id"`
+	CountyId          *int   `json:"county_id"  form:"county_id" label:"区县id"`
 }
 
 // AddHospital 新增医院