From 966039e4b6a2724cf52a0c69258d7572ede3f9a7 Mon Sep 17 00:00:00 2001
From: wucongxing <815046773@qq.com>
Date: Thu, 6 Jul 2023 11:57:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E7=A7=91=E5=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/controller/department.go        | 16 ++++++++++++---
 api/dao/hospitalDepartmentCustom.go | 31 +++++++++++++++++++++++++++++
 api/service/department.go           | 14 -------------
 3 files changed, 44 insertions(+), 17 deletions(-)

diff --git a/api/controller/department.go b/api/controller/department.go
index cdbf9e5..3c20c0b 100644
--- a/api/controller/department.go
+++ b/api/controller/department.go
@@ -3,8 +3,10 @@ package controller
 
 import (
 	"github.com/gin-gonic/gin"
+	"hospital-admin-api/api/dao"
 	"hospital-admin-api/api/requests"
 	"hospital-admin-api/api/responses"
+	"hospital-admin-api/api/responses/hosDepCustomResponse"
 	"hospital-admin-api/global"
 	"hospital-admin-api/utils"
 )
@@ -14,7 +16,7 @@ type Department struct{}
 // GetDepartmentCustomList 获取自定义科室列表
 func (b *Department) GetDepartmentCustomList(c *gin.Context) {
 	departmentRequest := requests.DepartmentRequest{}
-	if err := c.ShouldBindJSON(&departmentRequest.GetDepartmentCustomList); err != nil {
+	if err := c.ShouldBind(&departmentRequest.GetDepartmentCustomList); err != nil {
 		responses.FailWithMessage(err.Error(), c)
 		return
 	}
@@ -25,7 +27,15 @@ func (b *Department) GetDepartmentCustomList(c *gin.Context) {
 		return
 	}
 
+	hospitalDepartmentCustomDao := dao.HospitalDepartmentCustom{}
+
+	hospitalDepartmentCustom, err := hospitalDepartmentCustomDao.GetHospitalDepartmentCustomList(departmentRequest.GetDepartmentCustomList)
+	if err != nil {
+		responses.Ok(c)
+		return
+	}
+
 	// 处理返回值
-	// getDepartmentListResponse := hosDepCustomResponse.GetHospitalDepartmentCustomListResponse(hospitalDepartmentCustom)
-	// responses.OkWithData(getDepartmentListResponse, c)
+	getDepartmentListResponse := hosDepCustomResponse.GetHospitalDepartmentCustomListResponse(hospitalDepartmentCustom)
+	responses.OkWithData(getDepartmentListResponse, c)
 }
diff --git a/api/dao/hospitalDepartmentCustom.go b/api/dao/hospitalDepartmentCustom.go
index be4a1d8..2f4e332 100644
--- a/api/dao/hospitalDepartmentCustom.go
+++ b/api/dao/hospitalDepartmentCustom.go
@@ -3,6 +3,7 @@ package dao
 import (
 	"gorm.io/gorm"
 	"hospital-admin-api/api/model"
+	"hospital-admin-api/api/requests"
 	"hospital-admin-api/global"
 )
 
@@ -51,3 +52,33 @@ func (r *HospitalDepartmentCustom) EditHospitalDepartmentCustomById(tx *gorm.DB,
 	}
 	return nil
 }
+
+// GetHospitalDepartmentCustomListByMaps 获取自定义科室列表
+func (r *HospitalDepartmentCustom) GetHospitalDepartmentCustomListByMaps(departmentRequest requests.GetDepartmentCustomList) (m []*model.HospitalDepartmentCustom, err error) {
+	result := global.Db
+	if departmentRequest.DepartmentId != "" {
+		result = result.Where("department_id = ?", departmentRequest.DepartmentId)
+	}
+
+	if departmentRequest.DepartmentCustomName != "" {
+		result = result.Where("department_custom_name like ?", "%"+departmentRequest.DepartmentCustomName+"%")
+	}
+
+	if departmentRequest.DepartmentName != "" {
+		result = result.Where("department_name like ?", "%"+departmentRequest.DepartmentName+"%")
+	}
+
+	if departmentRequest.DepartmentCode != "" {
+		result = result.Where("department_code = ?", departmentRequest.DepartmentCode)
+	}
+
+	if departmentRequest.DepartmentStatus != 0 {
+		result = result.Where("department_status = ?", departmentRequest.DepartmentStatus)
+	}
+
+	err = result.Find(&m).Error
+	if err != nil {
+		return nil, err
+	}
+	return m, nil
+}
diff --git a/api/service/department.go b/api/service/department.go
index 7257d5c..f2fde25 100644
--- a/api/service/department.go
+++ b/api/service/department.go
@@ -1,17 +1,3 @@
 package service
 
 type DepartmentService struct{}
-
-// // GetDepartmentCustomList 获取自定义科室列表
-// func (r *DepartmentService) GetDepartmentCustomList(departmentRequest requests.GetDepartmentCustomList) (bool, error) {
-// 	hospitalDepartmentCustomDao := dao.HospitalDepartmentCustom{}
-//
-// 	maps := make(map[string]interface{})
-// 	if departmentRequest.DepartmentId != "" {
-// 		maps["department_id"] = departmentRequest.DepartmentId
-// 	}
-// 	hospitalDepartmentCustom, err := hospitalDepartmentCustomDao.GetHospitalDepartmentCustomList(maps)
-// 	if err != nil {
-//
-// 	}
-// }