gdxz/hospital-admin-api
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修正返回目录

Browse Source
This commit is contained in:
admin
2023-09-28 08:40:43 +08:00
parent aedf61c31b
commit 70c35e0ce6
84 changed files with 3579 additions and 2007 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/controller/adminApi.go
+4 -4
View File
@@ -3,9 +3,9 @@ package controller
import (
"github.com/gin-gonic/gin"
"hospital-admin-api/api/dao"
"hospital-admin-api/api/dto"
"hospital-admin-api/api/requests"
"hospital-admin-api/api/responses"
"hospital-admin-api/api/responses/apiResponse"
"hospital-admin-api/api/service"
"hospital-admin-api/global"
"hospital-admin-api/utils"
@@ -45,7 +45,7 @@ func (r *AdminApi) GetApiPage(c *gin.Context) {
}
// 处理返回值
getApiPageResponses := apiResponse.GetApiPageResponse(adminApi)
getApiPageResponses := dto.GetAdminApiListDto(adminApi)
result := make(map[string]interface{})
result["page"] = apiRequest.GetApiPage.Page
@@ -87,7 +87,7 @@ func (r *AdminApi) GetApiList(c *gin.Context) {
}
// 处理返回值
getApiPageResponses := apiResponse.GetApiListResponse(adminApis)
getApiPageResponses := dto.GetAdminApiListDto(adminApis)
responses.OkWithData(getApiPageResponses, c)
}
@@ -153,7 +153,7 @@ func (r *AdminApi) GetApi(c *gin.Context) {
}
// 处理返回值
getApiResponses := apiResponse.GetApiResponse(adminApi)
getApiResponses := dto.GetAdminApiDto(adminApi)
responses.OkWithData(getApiResponses, c)
}
api/controller/adminDept.go
+2 -2
View File
@@ -3,9 +3,9 @@ package controller
import (
"github.com/gin-gonic/gin"
"hospital-admin-api/api/dao"
"hospital-admin-api/api/dto"
"hospital-admin-api/api/requests"
"hospital-admin-api/api/responses"
"hospital-admin-api/api/responses/deptResponse"
"hospital-admin-api/api/service"
"hospital-admin-api/global"
"hospital-admin-api/utils"
@@ -88,7 +88,7 @@ func (r *Dept) GetDept(c *gin.Context) {
}
// 处理返回值
getDeptResponses := deptResponse.GetDeptResponse(adminDept)
getDeptResponses := dto.GetAdminDeptDto(adminDept)
responses.OkWithData(getDeptResponses, c)
}
api/controller/adminMenu.go
+3 -6
View File
@@ -2,9 +2,9 @@ package controller
import (
"github.com/gin-gonic/gin"
"hospital-admin-api/api/dto"
"hospital-admin-api/api/requests"
"hospital-admin-api/api/responses"
"hospital-admin-api/api/responses/menuResponse"
"hospital-admin-api/api/service"
"hospital-admin-api/global"
"hospital-admin-api/utils"
@@ -243,11 +243,8 @@ func (r *Menu) GetMenu(c *gin.Context) {
}
// 处理返回值
getMenuResponse, err := menuResponse.GetMenuResponse(adminMenu, getAdminMenuApis)
if err != nil {
responses.FailWithMessage(err.Error(), c)
return
}
getMenuResponse := dto.GetAdminMenuDto(adminMenu)
getMenuResponse.LoadAdminMenuApi(getAdminMenuApis)
responses.OkWithData(getMenuResponse, c)
}
api/controller/adminPost.go
+4 -4
View File
@@ -3,9 +3,9 @@ package controller
import (
"github.com/gin-gonic/gin"
"hospital-admin-api/api/dao"
"hospital-admin-api/api/dto"
"hospital-admin-api/api/requests"
"hospital-admin-api/api/responses"
"hospital-admin-api/api/responses/postResponse"
"hospital-admin-api/api/service"
"hospital-admin-api/global"
"hospital-admin-api/utils"
@@ -45,7 +45,7 @@ func (r *Post) GetPostPage(c *gin.Context) {
}
// 处理返回值
getPostPageResponses := postResponse.GetPostPageResponse(adminPost)
getPostPageResponses := dto.GetAdminPostListDto(adminPost)
result := make(map[string]interface{})
result["page"] = postRequest.GetPostPage.Page
@@ -116,7 +116,7 @@ func (r *Post) GetPost(c *gin.Context) {
}
// 处理返回值
getPostResponses := postResponse.GetPostResponse(adminPost)
getPostResponses := dto.GetAdminPostDto(adminPost)
responses.OkWithData(getPostResponses, c)
}
@@ -241,7 +241,7 @@ func (r *Post) GetPostList(c *gin.Context) {
}
// 处理返回值
getPostListResponses := postResponse.GetPostListResponse(adminPosts)
getPostListResponses := dto.GetAdminPostListDto(adminPosts)
responses.OkWithData(getPostListResponses, c)
}
api/controller/adminRole.go
+6 -40
View File
@@ -3,9 +3,9 @@ package controller
import (
"github.com/gin-gonic/gin"
"hospital-admin-api/api/dao"
"hospital-admin-api/api/dto"
"hospital-admin-api/api/requests"
"hospital-admin-api/api/responses"
"hospital-admin-api/api/responses/roleResponse"
"hospital-admin-api/api/service"
"hospital-admin-api/global"
"hospital-admin-api/utils"
@@ -45,24 +45,7 @@ func (r *Role) GetRolePage(c *gin.Context) {
}
// 处理返回值
getRolePageResponses := make([]roleResponse.GetRolePage, len(adminRole))
if len(adminRole) > 0 {
for i, v := range adminRole {
// 将原始结构体转换为新结构体
getRolePageResponse := roleResponse.GetRolePage{
RoleId: strconv.Itoa(int(v.RoleId)),
RoleName: v.RoleName,
RoleStatus: v.RoleStatus,
IsAdmin: v.IsAdmin,
CreatedAt: v.CreatedAt,
UpdatedAt: v.UpdatedAt,
}
// 将转换后的结构体添加到新切片中
getRolePageResponses[i] = getRolePageResponse
}
}
getRolePageResponses := dto.GetAdminRoleListDto(adminRole)
result := make(map[string]interface{})
result["page"] = RoleRequest.GetRolePage.Page
@@ -208,27 +191,10 @@ func (r *Role) GetRole(c *gin.Context) {
}
// 处理返回值
// 转换int64为string
var menuIdsString []string
for _, menuId := range menuIds {
menuId := strconv.FormatInt(menuId, 10)
menuIdsString = append(menuIdsString, menuId)
}
GetRoleResponse := dto.GetAdminRoleDto(adminRole)
// 转换int64为string
RoleId := strconv.FormatInt(adminRole.RoleId, 10)
if err != nil {
responses.Fail(c)
return
}
GetRoleResponse := &roleResponse.GetRole{
MenuIds: menuIdsString,
RoleId: RoleId,
RoleName: adminRole.RoleName,
RoleStatus: adminRole.RoleStatus,
IsAdmin: adminRole.IsAdmin,
}
// 加载角色菜单id
GetRoleResponse.LoadRoleMenuIdsDto(menuIds)
responses.OkWithData(GetRoleResponse, c)
}
@@ -344,7 +310,7 @@ func (r *Role) GetRoleList(c *gin.Context) {
}
// 处理返回值
getRoleListResponses := roleResponse.GetRoleListResponse(adminRoles)
getRoleListResponses := dto.GetAdminRoleListDto(adminRoles)
responses.OkWithData(getRoleListResponses, c)
}
api/controller/adminUser.go
+4 -4
View File
@@ -3,9 +3,9 @@ package controller
import (
"github.com/gin-gonic/gin"
"hospital-admin-api/api/dao"
"hospital-admin-api/api/dto"
"hospital-admin-api/api/requests"
"hospital-admin-api/api/responses"
"hospital-admin-api/api/responses/adminUserResponse"
"hospital-admin-api/api/service"
"hospital-admin-api/global"
"hospital-admin-api/utils"
@@ -49,7 +49,7 @@ func (r *AdminUser) GetUserPage(c *gin.Context) {
}
// 处理返回值
getUserPageResponses := adminUserResponse.GetUserPageResponse(adminUser)
getUserPageResponses := dto.GetAdminUserListDto(adminUser)
result := make(map[string]interface{})
result["page"] = UserRequest.GetUserPage.Page
@@ -120,9 +120,9 @@ func (r *AdminUser) GetUser(c *gin.Context) {
}
// 处理返回值
getUserResponses := adminUserResponse.GetUserResponse(adminUser)
result := dto.GetAdminUserDto(adminUser)
responses.OkWithData(getUserResponses, c)
responses.OkWithData(result, c)
}
// DeleteUser 删除用户-批量
api/controller/area.go
+2 -2
View File
@@ -3,9 +3,9 @@ package controller
import (
"github.com/gin-gonic/gin"
"hospital-admin-api/api/dao"
"hospital-admin-api/api/dto"
"hospital-admin-api/api/requests"
"hospital-admin-api/api/responses"
"hospital-admin-api/api/responses/areaResponse"
"hospital-admin-api/global"
"hospital-admin-api/utils"
)
@@ -40,6 +40,6 @@ func (b *Area) GetAreaList(c *gin.Context) {
}
// 处理返回值
r := areaResponse.GetAreaListResponse(area)
r := dto.GetAreaListDto(area)
responses.OkWithData(r, c)
}
api/controller/bank.go
+2 -2
View File
@@ -3,9 +3,9 @@ package controller
import (
"github.com/gin-gonic/gin"
"hospital-admin-api/api/dao"
"hospital-admin-api/api/dto"
"hospital-admin-api/api/requests"
"hospital-admin-api/api/responses"
"hospital-admin-api/api/responses/basicBankResponse"
"hospital-admin-api/global"
"hospital-admin-api/utils"
)
@@ -35,6 +35,6 @@ func (b *Bank) GetBankList(c *gin.Context) {
}
// 处理返回值
getBasicBankListResponse := basicBankResponse.GetBasicBankListResponse(basicBank)
getBasicBankListResponse := dto.GetBasicBankListDto(basicBank)
responses.OkWithData(getBasicBankListResponse, c)
}
api/controller/department.go
+2 -2
View File
@@ -4,9 +4,9 @@ package controller
import (
"github.com/gin-gonic/gin"
"hospital-admin-api/api/dao"
"hospital-admin-api/api/dto"
"hospital-admin-api/api/requests"
"hospital-admin-api/api/responses"
"hospital-admin-api/api/responses/hosDepCustomResponse"
"hospital-admin-api/global"
"hospital-admin-api/utils"
)
@@ -36,6 +36,6 @@ func (b *Department) GetDepartmentCustomList(c *gin.Context) {
}
// 处理返回值
getDepartmentListResponse := hosDepCustomResponse.GetHospitalDepartmentCustomListResponse(hospitalDepartmentCustom)
getDepartmentListResponse := dto.GetHospitalDepartmentCustomListDto(hospitalDepartmentCustom)
responses.OkWithData(getDepartmentListResponse, c)
}
api/controller/diseaseClassExpertise.go
+2 -2
View File
@@ -4,9 +4,9 @@ package controller
import (
"github.com/gin-gonic/gin"
"hospital-admin-api/api/dao"
"hospital-admin-api/api/dto"
"hospital-admin-api/api/requests"
"hospital-admin-api/api/responses"
"hospital-admin-api/api/responses/diseaseClassExpertiseResponse"
"hospital-admin-api/global"
"hospital-admin-api/utils"
)
@@ -36,6 +36,6 @@ func (b *DiseaseClassExpertise) GetExpertiseList(c *gin.Context) {
}
// 处理返回值
getExpertiseListResponse := diseaseClassExpertiseResponse.GetDiseaseClassExpertiseListResponse(diseaseClassExpertises)
getExpertiseListResponse := dto.GetDiseaseClassExpertiseListDto(diseaseClassExpertises)
responses.OkWithData(getExpertiseListResponse, c)
}
api/controller/hospital.go
+2 -2
View File
@@ -4,9 +4,9 @@ package controller
import (
"github.com/gin-gonic/gin"
"hospital-admin-api/api/dao"
"hospital-admin-api/api/dto"
"hospital-admin-api/api/requests"
"hospital-admin-api/api/responses"
"hospital-admin-api/api/responses/hospitalResponse"
"hospital-admin-api/global"
"hospital-admin-api/utils"
)
@@ -35,6 +35,6 @@ func (b *Hospital) GetHospitalLimit(c *gin.Context) {
}
// 处理返回值
getHospitalLimitResponse := hospitalResponse.GetHospitalLimitResponse(hospitals)
getHospitalLimitResponse := dto.GetHospitalListDto(hospitals)
responses.OkWithData(getHospitalLimitResponse, c)
}
api/controller/orderInquiry.go
+2 -2
View File
@@ -3,9 +3,9 @@ package controller
import (
"github.com/gin-gonic/gin"
"hospital-admin-api/api/dao"
"hospital-admin-api/api/dto"
"hospital-admin-api/api/requests"
"hospital-admin-api/api/responses"
"hospital-admin-api/api/responses/orderInquiryResponse"
"hospital-admin-api/api/service"
"hospital-admin-api/global"
"hospital-admin-api/utils"
@@ -44,7 +44,7 @@ func (r *OrderInquiry) GetOrderInquiryPage(c *gin.Context) {
}
// 处理返回值
GetOrderInquiryPageResponses := orderInquiryResponse.GetOrderInquiryPageResponse(orderInquiry)
GetOrderInquiryPageResponses := dto.GetOrderInquiryListDto(orderInquiry)
if err != nil {
responses.FailWithMessage(err.Error(), c)
return
api/controller/orderPrescription.go
+27 -25
View File
@@ -6,8 +6,10 @@ import (
"hospital-admin-api/api/requests"
"hospital-admin-api/api/responses"
"hospital-admin-api/api/responses/orderPrescriptionResponse"
"hospital-admin-api/api/service"
"hospital-admin-api/global"
"hospital-admin-api/utils"
"strconv"
)
type OrderPrescription struct{}
@@ -52,28 +54,28 @@ func (r *OrderPrescription) GetOrderPrescriptionPage(c *gin.Context) {
responses.OkWithData(result, c)
}
// // GetOrderPrescription 处方详情
// func (r *OrderPrescription) GetOrderPrescription(c *gin.Context) {
// id := c.Param("family_id")
// if id == "" {
// responses.FailWithMessage("缺少参数", c)
// return
// }
//
// // 将 id 转换为 int64 类型
// familyId, err := strconv.ParseInt(id, 10, 64)
// if err != nil {
// responses.Fail(c)
// return
// }
//
// // 业务处理
// patientFamilyService := service.PrescriptionService{}
// getPrescriptionResponse, err := patientFamilyService.GetPrescription(familyId)
// if err != nil {
// responses.FailWithMessage(err.Error(), c)
// return
// }
//
// responses.OkWithData(getPrescriptionResponse, c)
// }
// GetOrderPrescription 处方详情
func (r *OrderPrescription) GetOrderPrescription(c *gin.Context) {
id := c.Param("order_prescription_id")
if id == "" {
responses.FailWithMessage("缺少参数", c)
return
}
// 将 id 转换为 int64 类型
orderPrescriptionId, err := strconv.ParseInt(id, 10, 64)
if err != nil {
responses.Fail(c)
return
}
// 业务处理
orderPrescriptionService := service.OrderPrescriptionService{}
getPrescriptionResponse, err := orderPrescriptionService.GetOrderPrescription(orderPrescriptionId)
if err != nil {
responses.FailWithMessage(err.Error(), c)
return
}
responses.OkWithData(getPrescriptionResponse, c)
}
api/controller/orderProduct.go
+2 -2
View File
@@ -3,9 +3,9 @@ package controller
import (
"github.com/gin-gonic/gin"
"hospital-admin-api/api/dao"
"hospital-admin-api/api/dto"
"hospital-admin-api/api/requests"
"hospital-admin-api/api/responses"
"hospital-admin-api/api/responses/orderProductResponse"
"hospital-admin-api/api/service"
"hospital-admin-api/global"
"hospital-admin-api/utils"
@@ -45,7 +45,7 @@ func (r *OrderProduct) GetOrderProductPage(c *gin.Context) {
}
// 处理返回值
GetOrderProductPageResponses := orderProductResponse.GetOrderProductPageResponse(orderProduct)
GetOrderProductPageResponses := dto.GetOrderProductListDto(orderProduct)
if err != nil {
responses.FailWithMessage(err.Error(), c)
return
api/controller/patientFamily.go
+2 -2
View File
@@ -3,9 +3,9 @@ package controller
import (
"github.com/gin-gonic/gin"
"hospital-admin-api/api/dao"
"hospital-admin-api/api/dto"
"hospital-admin-api/api/requests"
"hospital-admin-api/api/responses"
"hospital-admin-api/api/responses/patientFamilyResponse"
"hospital-admin-api/api/service"
"hospital-admin-api/global"
"hospital-admin-api/utils"
@@ -44,7 +44,7 @@ func (r *PatientFamily) GetPatientFamilyPage(c *gin.Context) {
}
// 处理返回值
GetPatientFamilyPage := patientFamilyResponse.GetPatientFamilyPageResponse(patientFamily)
GetPatientFamilyPage := dto.GetPatientFamilyListDto(patientFamily)
result := make(map[string]interface{})
result["page"] = req.GetPatientFamilyPage.Page
api/controller/userDoctor.go
+4 -4
View File
@@ -3,9 +3,9 @@ package controller
import (
"github.com/gin-gonic/gin"
"hospital-admin-api/api/dao"
"hospital-admin-api/api/dto"
"hospital-admin-api/api/requests"
"hospital-admin-api/api/responses"
"hospital-admin-api/api/responses/userDoctorResponse"
"hospital-admin-api/api/service"
"hospital-admin-api/global"
"hospital-admin-api/utils"
@@ -45,7 +45,7 @@ func (r *UserDoctor) GetUserDoctorPage(c *gin.Context) {
}
// 处理返回值
getUserDoctorPageResponses := userDoctorResponse.GetUserDoctorPageResponse(userDoctor)
getUserDoctorPageResponses := dto.GetUserDoctorListDto(userDoctor)
result := make(map[string]interface{})
result["page"] = userDoctorRequest.GetUserDoctorPage.Page
@@ -194,7 +194,7 @@ func (r *UserDoctor) GetUserDoctorPendingPage(c *gin.Context) {
}
// 处理返回值
res := userDoctorResponse.GetUserDoctorPendingPageResponse(userDoctor)
res := dto.GetUserDoctorPendingListDto(userDoctor)
result := make(map[string]interface{})
result["page"] = userDoctorRequest.GetUserDoctorPendingPage.Page
@@ -299,7 +299,7 @@ func (r *UserDoctor) GetMultiPage(c *gin.Context) {
}
// 处理返回值
res := userDoctorResponse.GetMultiPageResponse(userDoctor)
res := dto.GetUserDoctorListDto(userDoctor)
result := make(map[string]interface{})
result["page"] = userDoctorRequest.GetMultiPage.Page
api/controller/userPatient.go
+2 -2
View File
@@ -3,9 +3,9 @@ package controller
import (
"github.com/gin-gonic/gin"
"hospital-admin-api/api/dao"
"hospital-admin-api/api/dto"
"hospital-admin-api/api/requests"
"hospital-admin-api/api/responses"
"hospital-admin-api/api/responses/userPatientResponse"
"hospital-admin-api/api/service"
"hospital-admin-api/global"
"hospital-admin-api/utils"
@@ -45,7 +45,7 @@ func (r *UserPatient) GetUserPatientPage(c *gin.Context) {
}
// 处理返回值
getUserDoctorPageResponses := userPatientResponse.GetUserPatientPageResponse(userPatient)
getUserDoctorPageResponses := dto.GetUserPatientListDto(userPatient)
result := make(map[string]interface{})
result["page"] = userPatientRequest.GetUserPatientPage.Page