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

Compare commits

base: gdxz:b27d12995d62edc4f1823429addb8d1291076ddf
Branches Tags
gdxz:dev
gdxz:master
..
compare: gdxz:6ca0a5ff52a70ff5d0369a3d44cecb62c7f85ef9
Branches Tags
gdxz:master
gdxz:dev

No commits in common. "b27d12995d62edc4f1823429addb8d1291076ddf" and "6ca0a5ff52a70ff5d0369a3d44cecb62c7f85ef9" have entirely different histories.
b27d12995d ... 6ca0a5ff52

15 changed files with 3 additions and 283 deletions
Show Stats Expand all files Collapse all files

90
api/controller/export.go
View File

@ -272,24 +272,6 @@ func (r *Export) OrderInquiryForAccount(c *gin.Context) {
return return
} }
// 特殊处理
// 获取配置
systemConfigDao := dao.SystemConfigDao{}
systemConfig, err := systemConfigDao.GetSystemConfigById(1)
if err != nil {
responses.FailWithMessage(err.Error(), c)
return
}
// 年度审查
if systemConfig.IsAnnualReview == 1 {
adminUserId := c.GetInt64("UserId")
if adminUserId == 1845704393354121216 || adminUserId == 1732273543535661056 {
annualReviewHide := 0
req.AnnualReviewHide = &annualReviewHide
}
}
// 获取数据 // 获取数据
orderInquiryDao := dao.OrderInquiryDao{} orderInquiryDao := dao.OrderInquiryDao{}
orderInquirys, err := orderInquiryDao.GetOrderInquiryForAccountExportListSearch(req) orderInquirys, err := orderInquiryDao.GetOrderInquiryForAccountExportListSearch(req)
@ -434,24 +416,6 @@ func (r *Export) OrderInquiry(c *gin.Context) {
return return
} }
// 特殊处理
// 获取配置
systemConfigDao := dao.SystemConfigDao{}
systemConfig, err := systemConfigDao.GetSystemConfigById(1)
if err != nil {
responses.FailWithMessage(err.Error(), c)
return
}
// 年度审查
if systemConfig.IsAnnualReview == 1 {
adminUserId := c.GetInt64("UserId")
if adminUserId == 1845704393354121216 || adminUserId == 1732273543535661056 {
annualReviewHide := 0
req.AnnualReviewHide = &annualReviewHide
}
}
// 获取数据 // 获取数据
orderInquiryDao := dao.OrderInquiryDao{} orderInquiryDao := dao.OrderInquiryDao{}
orderInquirys, err := orderInquiryDao.GetOrderInquiryExportListSearch(req) orderInquirys, err := orderInquiryDao.GetOrderInquiryExportListSearch(req)
@ -501,24 +465,6 @@ func (r *Export) OrderProduct(c *gin.Context) {
return return
} }
// 特殊处理
// 获取配置
systemConfigDao := dao.SystemConfigDao{}
systemConfig, err := systemConfigDao.GetSystemConfigById(1)
if err != nil {
responses.FailWithMessage(err.Error(), c)
return
}
// 年度审查
if systemConfig.IsAnnualReview == 1 {
adminUserId := c.GetInt64("UserId")
if adminUserId == 1845704393354121216 || adminUserId == 1732273543535661056 {
annualReviewHide := 0
req.AnnualReviewHide = &annualReviewHide
}
}
// 获取数据 // 获取数据
orderProductDao := dao.OrderProductDao{} orderProductDao := dao.OrderProductDao{}
orderProducts, err := orderProductDao.GetOrderProductExportListSearch(req) orderProducts, err := orderProductDao.GetOrderProductExportListSearch(req)
@ -568,24 +514,6 @@ func (r *Export) OrderTransferPrescription(c *gin.Context) {
return return
} }
// 特殊处理
// 获取配置
systemConfigDao := dao.SystemConfigDao{}
systemConfig, err := systemConfigDao.GetSystemConfigById(1)
if err != nil {
responses.FailWithMessage(err.Error(), c)
return
}
// 年度审查
if systemConfig.IsAnnualReview == 1 {
adminUserId := c.GetInt64("UserId")
if adminUserId == 1845704393354121216 || adminUserId == 1732273543535661056 {
annualReviewHide := 0
req.AnnualReviewHide = &annualReviewHide
}
}
// 获取数据 // 获取数据
orderPrescriptionDao := dao.OrderPrescriptionDao{} orderPrescriptionDao := dao.OrderPrescriptionDao{}
orderPrescriptions, err := orderPrescriptionDao.GetOrderTransferPrescriptionExportListSearch(req) orderPrescriptions, err := orderPrescriptionDao.GetOrderTransferPrescriptionExportListSearch(req)
@ -634,24 +562,6 @@ func (r *Export) OrderPrescription(c *gin.Context) {
return return
} }
// 特殊处理
// 获取配置
systemConfigDao := dao.SystemConfigDao{}
systemConfig, err := systemConfigDao.GetSystemConfigById(1)
if err != nil {
responses.FailWithMessage(err.Error(), c)
return
}
// 年度审查
if systemConfig.IsAnnualReview == 1 {
adminUserId := c.GetInt64("UserId")
if adminUserId == 1845704393354121216 || adminUserId == 1732273543535661056 {
annualReviewHide := 0
req.AnnualReviewHide = &annualReviewHide
}
}
// 获取数据 // 获取数据
orderPrescriptionDao := dao.OrderPrescriptionDao{} orderPrescriptionDao := dao.OrderPrescriptionDao{}
orderPrescriptions, err := orderPrescriptionDao.GetOrderPrescriptionExportListSearch(req) orderPrescriptions, err := orderPrescriptionDao.GetOrderPrescriptionExportListSearch(req)

60
api/controller/orderInquiry.go
View File

@ -54,10 +54,8 @@ func (r *OrderInquiry) GetOrderInquiryPage(c *gin.Context) {
if adminUserId == 1845704393354121216 || adminUserId == 1732273543535661056 { if adminUserId == 1845704393354121216 || adminUserId == 1732273543535661056 {
status := 1 status := 1
req.MultiPointStatus = &status req.MultiPointStatus = &status
annualReviewHide := 0
req.AnnualReviewHide = &annualReviewHide
} }
} }
orderInquiryDao := dao.OrderInquiryDao{} orderInquiryDao := dao.OrderInquiryDao{}
@ -107,40 +105,6 @@ func (r *OrderInquiry) GetOrderInquiry(c *gin.Context) {
responses.OkWithData(getUserDoctorResponses, c) responses.OkWithData(getUserDoctorResponses, c)
} }
// PutAnnualReviewHide 修改问诊订单年度审查隐藏状态
func (r *OrderInquiry) PutAnnualReviewHide(c *gin.Context) {
id := c.Param("order_inquiry_id")
if id == "" {
responses.FailWithMessage("缺少参数", c)
return
}
orderInquiryId, err := strconv.ParseInt(id, 10, 64)
if err != nil {
responses.Fail(c)
return
}
req := requests.PutAnnualReviewHide{}
if err := c.ShouldBind(&req); err != nil {
responses.FailWithMessage(err.Error(), c)
return
}
if err := global.Validate.Struct(req); err != nil {
responses.FailWithMessage(utils.Translate(err), c)
return
}
orderInquiryService := service.OrderInquiryService{}
err = orderInquiryService.PutAnnualReviewHide(orderInquiryId, *req.AnnualReviewHide)
if err != nil {
responses.FailWithMessage(err.Error(), c)
return
}
responses.Ok(c)
}
// CancelOrderInquiry 取消问诊订单 // CancelOrderInquiry 取消问诊订单
func (r *OrderInquiry) CancelOrderInquiry(c *gin.Context) { func (r *OrderInquiry) CancelOrderInquiry(c *gin.Context) {
@ -239,10 +203,8 @@ func (r *OrderInquiry) GetOrderInquiryRecordPage(c *gin.Context) {
if adminUserId == 1845704393354121216 || adminUserId == 1732273543535661056 { if adminUserId == 1845704393354121216 || adminUserId == 1732273543535661056 {
status := 1 status := 1
req.GetOrderInquiryRecordPage.MultiPointStatus = &status req.GetOrderInquiryRecordPage.MultiPointStatus = &status
annualReviewHide := 0
req.GetOrderInquiryRecordPage.AnnualReviewHide = &annualReviewHide
} }
} }
orderInquiryDao := dao.OrderInquiryDao{} orderInquiryDao := dao.OrderInquiryDao{}
@ -361,24 +323,6 @@ func (r *OrderInquiry) GetOrderInquiryForAccountPage(c *gin.Context) {
req.PageSize = 20 req.PageSize = 20
} }
// 特殊处理
// 获取配置
systemConfigDao := dao.SystemConfigDao{}
systemConfig, err := systemConfigDao.GetSystemConfigById(1)
if err != nil {
responses.FailWithMessage(err.Error(), c)
return
}
// 年度审查
if systemConfig.IsAnnualReview == 1 {
adminUserId := c.GetInt64("UserId")
if adminUserId == 1845704393354121216 || adminUserId == 1732273543535661056 {
annualReviewHide := 0
req.AnnualReviewHide = &annualReviewHide
}
}
orderInquiryDao := dao.OrderInquiryDao{} orderInquiryDao := dao.OrderInquiryDao{}
orderInquiry, total, err := orderInquiryDao.GetOrderInquiryForAccountPageSearch(req, req.Page, req.PageSize) orderInquiry, total, err := orderInquiryDao.GetOrderInquiryForAccountPageSearch(req, req.Page, req.PageSize)
if err != nil { if err != nil {

18
api/controller/orderPrescription.go
View File

@ -38,24 +38,6 @@ func (r *OrderPrescription) GetOrderPrescriptionPage(c *gin.Context) {
req.PageSize = 20 req.PageSize = 20
} }
// 特殊处理
// 获取配置
systemConfigDao := dao.SystemConfigDao{}
systemConfig, err := systemConfigDao.GetSystemConfigById(1)
if err != nil {
responses.FailWithMessage(err.Error(), c)
return
}
// 年度审查
if systemConfig.IsAnnualReview == 1 {
adminUserId := c.GetInt64("UserId")
if adminUserId == 1845704393354121216 || adminUserId == 1732273543535661056 {
annualReviewHide := 0
req.AnnualReviewHide = &annualReviewHide
}
}
orderPrescriptionDao := dao.OrderPrescriptionDao{} orderPrescriptionDao := dao.OrderPrescriptionDao{}
orderPrescription, total, err := orderPrescriptionDao.GetOrderPrescriptionPageSearch(req, req.Page, req.PageSize) orderPrescription, total, err := orderPrescriptionDao.GetOrderPrescriptionPageSearch(req, req.Page, req.PageSize)
if err != nil { if err != nil {

18
api/controller/orderProduct.go
View File

@ -38,24 +38,6 @@ func (r *OrderProduct) GetOrderProductPage(c *gin.Context) {
req.PageSize = 20 req.PageSize = 20
} }
// 特殊处理
// 获取配置
systemConfigDao := dao.SystemConfigDao{}
systemConfig, err := systemConfigDao.GetSystemConfigById(1)
if err != nil {
responses.FailWithMessage(err.Error(), c)
return
}
// 年度审查
if systemConfig.IsAnnualReview == 1 {
adminUserId := c.GetInt64("UserId")
if adminUserId == 1845704393354121216 || adminUserId == 1732273543535661056 {
annualReviewHide := 0
req.AnnualReviewHide = &annualReviewHide
}
}
orderProductDao := dao.OrderProductDao{} orderProductDao := dao.OrderProductDao{}
orderProduct, total, err := orderProductDao.GetOrderProductPageSearch(req, req.Page, req.PageSize) orderProduct, total, err := orderProductDao.GetOrderProductPageSearch(req, req.Page, req.PageSize)

20
api/dao/orderInquiry.go
View File

@ -267,11 +267,6 @@ func (r *OrderInquiryDao) GetOrderInquiryPageSearch(req requests.GetOrderInquiry
query = query.Where("user_id IN (?)", patientSubQuery).Or("doctor_id IN (?)", doctorSubQuery) query = query.Where("user_id IN (?)", patientSubQuery).Or("doctor_id IN (?)", doctorSubQuery)
} }
// 年度审查隐藏
if req.AnnualReviewHide != nil {
query = query.Where("annual_review_hide = ?", req.AnnualReviewHide)
}
// 排序 // 排序
query = query.Order("created_at desc") query = query.Order("created_at desc")
@ -469,11 +464,6 @@ func (r *OrderInquiryDao) GetOrderInquiryRecordPageSearch(req requests.GetOrderI
query = query.Where("user_id IN (?)", patientSubQuery).Or("doctor_id IN (?)", doctorSubQuery) query = query.Where("user_id IN (?)", patientSubQuery).Or("doctor_id IN (?)", doctorSubQuery)
} }
// 年度审查隐藏
if req.AnnualReviewHide != nil {
query = query.Where("annual_review_hide = ?", req.AnnualReviewHide)
}
// 排序 // 排序
query = query.Order("created_at desc") query = query.Order("created_at desc")
@ -637,11 +627,6 @@ func (r *OrderInquiryDao) GetOrderInquiryForAccountPageSearch(req requests.GetOr
query = query.Where("user_id IN (?)", subQuery) query = query.Where("user_id IN (?)", subQuery)
} }
// 年度审查隐藏
if req.AnnualReviewHide != nil {
query = query.Where("annual_review_hide = ?", req.AnnualReviewHide)
}
// 排序 // 排序
query = query.Order("created_at desc") query = query.Order("created_at desc")
@ -791,11 +776,6 @@ func (r *OrderInquiryDao) GetOrderInquiryForAccountExportListSearch(req requests
} }
} }
// 年度审查隐藏
if req.AnnualReviewHide != nil {
query = query.Where("annual_review_hide = ?", req.AnnualReviewHide)
}
// 当前选中数据 // 当前选中数据
if req.Type == 2 { if req.Type == 2 {
if req.Id == "" { if req.Id == "" {

17
api/dao/orderPrescription.go
View File

@ -94,12 +94,6 @@ func (r *OrderPrescriptionDao) GetOrderPrescriptionPageSearch(req requests.GetOr
// 构建查询条件 // 构建查询条件
query := global.Db.Model(&model.OrderPrescription{}) query := global.Db.Model(&model.OrderPrescription{})
// 年度审查隐藏
if req.AnnualReviewHide != nil {
query = query.Joins("JOIN gdxz_order_inquiry ON gdxz_order_inquiry.order_inquiry_id = gdxz_order_prescription.order_inquiry_id")
query = query.Where("gdxz_order_inquiry.annual_review_hide = ?", req.AnnualReviewHide)
}
// 患者表 // 患者表
query = query.Preload("UserPatient", func(db *gorm.DB) *gorm.DB { query = query.Preload("UserPatient", func(db *gorm.DB) *gorm.DB {
return db.Omit("open_id", "union_id", "wx_session_key") return db.Omit("open_id", "union_id", "wx_session_key")
@ -456,11 +450,6 @@ func (r *OrderPrescriptionDao) GetOrderTransferPrescriptionExportListSearch(req
// 构建查询条件 // 构建查询条件
query := global.Db.Model(&model.OrderPrescription{}) query := global.Db.Model(&model.OrderPrescription{})
// 年度审查隐藏
if req.AnnualReviewHide != nil {
query = query.Where(inquiryTable + ".annual_review_hide = ?", req.AnnualReviewHide)
}
// 关联问诊表，只查询TransferDoctorId不等于null的记录 // 关联问诊表，只查询TransferDoctorId不等于null的记录
query = query.Joins("INNER JOIN " + inquiryTable + " ON " + prescriptionTable + ".order_inquiry_id = " + inquiryTable + ".order_inquiry_id"). query = query.Joins("INNER JOIN " + inquiryTable + " ON " + prescriptionTable + ".order_inquiry_id = " + inquiryTable + ".order_inquiry_id").
Where(inquiryTable + ".transfer_doctor_id IS NOT NULL") Where(inquiryTable + ".transfer_doctor_id IS NOT NULL")
@ -655,12 +644,6 @@ func (r *OrderPrescriptionDao) GetOrderPrescriptionExportListSearch(req requests
// 构建查询条件 // 构建查询条件
query := global.Db.Model(&model.OrderPrescription{}) query := global.Db.Model(&model.OrderPrescription{})
// 年度审查隐藏
if req.AnnualReviewHide != nil {
query = query.Joins("JOIN gdxz_order_inquiry ON gdxz_order_inquiry.order_inquiry_id = gdxz_order_prescription.order_inquiry_id")
query = query.Where("gdxz_order_inquiry.annual_review_hide = ?", req.AnnualReviewHide)
}
// 患者表 // 患者表
query = query.Preload("UserPatient", func(db *gorm.DB) *gorm.DB { query = query.Preload("UserPatient", func(db *gorm.DB) *gorm.DB {
return db.Omit("open_id", "union_id", "wx_session_key") return db.Omit("open_id", "union_id", "wx_session_key")

12
api/dao/orderProduct.go
View File

@ -123,12 +123,6 @@ func (r *OrderProductDao) GetOrderProductPageSearch(req requests.GetOrderProduct
// 构建查询条件 // 构建查询条件
query := global.Db.Model(&model.OrderProduct{}) query := global.Db.Model(&model.OrderProduct{})
// 年度审查隐藏
if req.AnnualReviewHide != nil {
query = query.Joins("JOIN gdxz_order_inquiry ON gdxz_order_inquiry.order_inquiry_id = gdxz_order_product.order_inquiry_id")
query = query.Where("gdxz_order_inquiry.annual_review_hide = ?", req.AnnualReviewHide)
}
// 药品数据 // 药品数据
query = query.Preload("OrderProductItem") query = query.Preload("OrderProductItem")
@ -418,12 +412,6 @@ func (r *OrderProductDao) GetOrderProductExportListSearch(req requests.OrderProd
// 构建查询条件 // 构建查询条件
query := global.Db.Model(&model.OrderProduct{}) query := global.Db.Model(&model.OrderProduct{})
// 年度审查隐藏
if req.AnnualReviewHide != nil {
query = query.Joins("JOIN gdxz_order_inquiry ON gdxz_order_inquiry.order_inquiry_id = gdxz_order_product.order_inquiry_id")
query = query.Where("gdxz_order_inquiry.annual_review_hide = ?", req.AnnualReviewHide)
}
// 医生 // 医生
query = query.Preload("UserDoctor", func(db *gorm.DB) *gorm.DB { query = query.Preload("UserDoctor", func(db *gorm.DB) *gorm.DB {
return db.Omit("open_id", "union_id", "wx_session_key") return db.Omit("open_id", "union_id", "wx_session_key")

6
api/dto/OrderInquiry.go
View File

@ -40,7 +40,6 @@ type OrderInquiryDto struct {
PatientNameMask string `json:"patient_name_mask"` // 患者姓名-就诊人(掩码) PatientNameMask string `json:"patient_name_mask"` // 患者姓名-就诊人(掩码)
PatientSex int `json:"patient_sex"` // 患者性别-就诊人（0:未知 1:男 2:女） PatientSex int `json:"patient_sex"` // 患者性别-就诊人（0:未知 1:男 2:女）
PatientAge int `json:"patient_age"` // 患者年龄-就诊人 PatientAge int `json:"patient_age"` // 患者年龄-就诊人
AnnualReviewHide int `json:"annual_review_hide"` // 年度审查隐藏（0:否 1:是）
PatientMobile string `json:"patient_mobile"` // 患者电话 PatientMobile string `json:"patient_mobile"` // 患者电话
DoctorName string `json:"doctor_name"` // 医生姓名 DoctorName string `json:"doctor_name"` // 医生姓名
UserName string `json:"user_name"` // 用户姓名（患者） UserName string `json:"user_name"` // 用户姓名（患者）
@ -103,7 +102,6 @@ func GetOrderInquiryDto(m *model.OrderInquiry) *OrderInquiryDto {
PatientNameMask: m.PatientNameMask, PatientNameMask: m.PatientNameMask,
PatientSex: m.PatientSex, PatientSex: m.PatientSex,
PatientAge: m.PatientAge, PatientAge: m.PatientAge,
AnnualReviewHide: m.AnnualReviewHide,
CreatedAt: m.CreatedAt, CreatedAt: m.CreatedAt,
UpdatedAt: m.UpdatedAt, UpdatedAt: m.UpdatedAt,
} }
@ -151,7 +149,6 @@ func GetOrderInquiryListDto(m []*model.OrderInquiry) []*OrderInquiryDto {
PatientNameMask: v.PatientNameMask, PatientNameMask: v.PatientNameMask,
PatientSex: v.PatientSex, PatientSex: v.PatientSex,
PatientAge: v.PatientAge, PatientAge: v.PatientAge,
AnnualReviewHide: v.AnnualReviewHide,
PatientMobile: v.User.Mobile, PatientMobile: v.User.Mobile,
CreatedAt: v.CreatedAt, CreatedAt: v.CreatedAt,
UpdatedAt: v.UpdatedAt, UpdatedAt: v.UpdatedAt,
@ -204,7 +201,6 @@ func GetOrderInquiryRecordListDto(m []*model.OrderInquiry) []*OrderInquiryDto {
PatientNameMask: v.PatientNameMask, PatientNameMask: v.PatientNameMask,
PatientSex: v.PatientSex, PatientSex: v.PatientSex,
PatientAge: v.PatientAge, PatientAge: v.PatientAge,
AnnualReviewHide: v.AnnualReviewHide,
PatientMobile: v.User.Mobile, PatientMobile: v.User.Mobile,
CreatedAt: v.CreatedAt, CreatedAt: v.CreatedAt,
UpdatedAt: v.UpdatedAt, UpdatedAt: v.UpdatedAt,
@ -269,7 +265,6 @@ func GetOrderInquiryForAccountListDto(m []*model.OrderInquiry) []*OrderInquiryDt
PatientNameMask: v.PatientNameMask, PatientNameMask: v.PatientNameMask,
PatientSex: v.PatientSex, PatientSex: v.PatientSex,
PatientAge: v.PatientAge, PatientAge: v.PatientAge,
AnnualReviewHide: v.AnnualReviewHide,
CreatedAt: v.CreatedAt, CreatedAt: v.CreatedAt,
UpdatedAt: v.UpdatedAt, UpdatedAt: v.UpdatedAt,
} }
@ -334,7 +329,6 @@ func GetOrderInquiryRecordDto(m *model.OrderInquiry) *OrderInquiryDto {
PatientNameMask: m.PatientNameMask, PatientNameMask: m.PatientNameMask,
PatientSex: m.PatientSex, PatientSex: m.PatientSex,
PatientAge: m.PatientAge, PatientAge: m.PatientAge,
AnnualReviewHide: m.AnnualReviewHide,
CreatedAt: m.CreatedAt, CreatedAt: m.CreatedAt,
UpdatedAt: m.UpdatedAt, UpdatedAt: m.UpdatedAt,
} }

1
api/model/orderInquiry.go
View File

@ -43,7 +43,6 @@ type OrderInquiry struct {
PatientNameMask string `gorm:"column:patient_name_mask;type:varchar(255);comment:患者姓名-就诊人(掩码)" json:"patient_name_mask"` PatientNameMask string `gorm:"column:patient_name_mask;type:varchar(255);comment:患者姓名-就诊人(掩码)" json:"patient_name_mask"`
PatientSex int `gorm:"column:patient_sex;type:tinyint(1);default:0;comment:患者性别-就诊人（0:未知 1:男 2:女）" json:"patient_sex"` PatientSex int `gorm:"column:patient_sex;type:tinyint(1);default:0;comment:患者性别-就诊人（0:未知 1:男 2:女）" json:"patient_sex"`
PatientAge int `gorm:"column:patient_age;type:int(1);comment:患者年龄-就诊人" json:"patient_age"` PatientAge int `gorm:"column:patient_age;type:int(1);comment:患者年龄-就诊人" json:"patient_age"`
AnnualReviewHide int `gorm:"column:annual_review_hide;type:tinyint(1);default:0;comment:年度审查隐藏（0:否 1:是）" json:"annual_review_hide"`
UserDoctor *UserDoctor `gorm:"foreignKey:DoctorId;references:doctor_id" json:"user_doctor"` // 医生 UserDoctor *UserDoctor `gorm:"foreignKey:DoctorId;references:doctor_id" json:"user_doctor"` // 医生
TransferUserDoctor *UserDoctor `gorm:"foreignKey:TransferDoctorId;references:doctor_id" json:"transfer_user_doctor"` // 接受抄方的医生 TransferUserDoctor *UserDoctor `gorm:"foreignKey:TransferDoctorId;references:doctor_id" json:"transfer_user_doctor"` // 接受抄方的医生
User *User `gorm:"foreignKey:UserId;references:user_id" json:"user"` // 患者 User *User `gorm:"foreignKey:UserId;references:user_id" json:"user"` // 患者

11
api/requests/orderInquiry.go
View File

@ -8,12 +8,6 @@ type OrderInquiryRequest struct {
GetOrderInquiryForAccountPage // 获取账户关联问诊订单列表-分页 GetOrderInquiryForAccountPage // 获取账户关联问诊订单列表-分页
OrderInquiryForAccountExportList // 医生账户-关联订单-导出 OrderInquiryForAccountExportList // 医生账户-关联订单-导出
OrderInquiryExportList // 问诊订单列表-导出 OrderInquiryExportList // 问诊订单列表-导出
PutAnnualReviewHide // 修改问诊订单年度审查隐藏状态
}
// PutAnnualReviewHide 修改问诊订单年度审查隐藏状态
type PutAnnualReviewHide struct {
AnnualReviewHide *int `json:"annual_review_hide" form:"annual_review_hide" validate:"required,oneof=0 1" label:"年度审查隐藏"`
} }
// GetOrderInquiryPage 获取问诊订单列表-分页 // GetOrderInquiryPage 获取问诊订单列表-分页
@ -39,7 +33,6 @@ type GetOrderInquiryPage struct {
CreatedAt string `json:"created_at" form:"created_at" label:"订单创建时间"` // 时间区间，数组形式，下标0为开始时间，下标1为结束时间 CreatedAt string `json:"created_at" form:"created_at" label:"订单创建时间"` // 时间区间，数组形式，下标0为开始时间，下标1为结束时间
PatientName string `json:"patient_name" form:"patient_name" label:"患者姓名-就诊人"` PatientName string `json:"patient_name" form:"patient_name" label:"患者姓名-就诊人"`
Mobile string `json:"mobile" form:"mobile" label:"手机号-医生/患者"` Mobile string `json:"mobile" form:"mobile" label:"手机号-医生/患者"`
AnnualReviewHide *int `json:"-" form:"-"` // 用于内部传递隐藏条件
} }
// CancelOrderInquiry 取消问诊订单 // CancelOrderInquiry 取消问诊订单
@ -71,7 +64,6 @@ type GetOrderInquiryRecordPage struct {
CreatedAt string `json:"created_at" form:"created_at" label:"订单创建时间"` // 时间区间，数组形式，下标0为开始时间，下标1为结束时间 CreatedAt string `json:"created_at" form:"created_at" label:"订单创建时间"` // 时间区间，数组形式，下标0为开始时间，下标1为结束时间
PatientName string `json:"patient_name" form:"patient_name" label:"患者姓名-就诊人"` PatientName string `json:"patient_name" form:"patient_name" label:"患者姓名-就诊人"`
Mobile string `json:"mobile" form:"mobile" label:"手机号-医生/患者"` Mobile string `json:"mobile" form:"mobile" label:"手机号-医生/患者"`
AnnualReviewHide *int `json:"-" form:"-"` // 用于内部传递隐藏条件
} }
// GetOrderInquiryImPage 获取问诊订单im内容列表-分页 // GetOrderInquiryImPage 获取问诊订单im内容列表-分页
@ -98,7 +90,6 @@ type GetOrderInquiryForAccountPage struct {
IsWithdrawal *int `json:"is_withdrawal" form:"is_withdrawal" label:"是否提现"` // 0:否 1:是 2:提现中 IsWithdrawal *int `json:"is_withdrawal" form:"is_withdrawal" label:"是否提现"` // 0:否 1:是 2:提现中
CancelTime string `json:"cancel_time" form:"cancel_time" label:"订单取消时间"` // 时间区间，数组形式，下标0为开始时间，下标1为结束时间 CancelTime string `json:"cancel_time" form:"cancel_time" label:"订单取消时间"` // 时间区间，数组形式，下标0为开始时间，下标1为结束时间
CreatedAt string `json:"created_at" form:"created_at" label:"订单创建时间"` // 时间区间，数组形式，下标0为开始时间，下标1为结束时间 CreatedAt string `json:"created_at" form:"created_at" label:"订单创建时间"` // 时间区间，数组形式，下标0为开始时间，下标1为结束时间
AnnualReviewHide *int `json:"-" form:"-"` // 用于内部传递隐藏条件
} }
// OrderInquiryForAccountExportList 医生账户-关联订单-导出 // OrderInquiryForAccountExportList 医生账户-关联订单-导出
@ -118,7 +109,6 @@ type OrderInquiryForAccountExportList struct {
IsWithdrawal *int `json:"is_withdrawal" form:"is_withdrawal" label:"是否提现"` // 0:否 1:是 2:提现中 IsWithdrawal *int `json:"is_withdrawal" form:"is_withdrawal" label:"是否提现"` // 0:否 1:是 2:提现中
CancelTime string `json:"cancel_time" form:"cancel_time" label:"订单取消时间"` // 时间区间，数组形式，下标0为开始时间，下标1为结束时间 CancelTime string `json:"cancel_time" form:"cancel_time" label:"订单取消时间"` // 时间区间，数组形式，下标0为开始时间，下标1为结束时间
CreatedAt string `json:"created_at" form:"created_at" label:"订单创建时间"` // 时间区间，数组形式，下标0为开始时间，下标1为结束时间 CreatedAt string `json:"created_at" form:"created_at" label:"订单创建时间"` // 时间区间，数组形式，下标0为开始时间，下标1为结束时间
AnnualReviewHide *int `json:"-" form:"-"` // 用于内部传递隐藏条件
} }
// OrderInquiryExportList 问诊订单列表-导出 // OrderInquiryExportList 问诊订单列表-导出
@ -143,5 +133,4 @@ type OrderInquiryExportList struct {
CreatedAt string `json:"created_at" form:"created_at" label:"订单创建时间"` // 时间区间，数组形式，下标0为开始时间，下标1为结束时间 CreatedAt string `json:"created_at" form:"created_at" label:"订单创建时间"` // 时间区间，数组形式，下标0为开始时间，下标1为结束时间
PatientName string `json:"patient_name" form:"patient_name" label:"患者姓名-就诊人"` PatientName string `json:"patient_name" form:"patient_name" label:"患者姓名-就诊人"`
Mobile string `json:"mobile" form:"mobile" label:"手机号-医生/患者"` Mobile string `json:"mobile" form:"mobile" label:"手机号-医生/患者"`
AnnualReviewHide *int `json:"-" form:"-"` // 用于内部传递隐藏条件
} }

2
api/requests/orderPrescription.go
View File

@ -20,7 +20,6 @@ type GetOrderPrescriptionPage struct {
ExpiredTime string `json:"expired_time" form:"expired_time" label:"处方过期时间"` // 时间区间，数组形式，下标0为开始时间，下标1为结束时间 ExpiredTime string `json:"expired_time" form:"expired_time" label:"处方过期时间"` // 时间区间，数组形式，下标0为开始时间，下标1为结束时间
InquiryNo string `json:"inquiry_no" form:"inquiry_no" label:"问诊订单编号"` InquiryNo string `json:"inquiry_no" form:"inquiry_no" label:"问诊订单编号"`
OrderProductNo string `json:"order_product_no" form:"order_product_no" label:"药品订单编号"` OrderProductNo string `json:"order_product_no" form:"order_product_no" label:"药品订单编号"`
AnnualReviewHide *int `json:"-" form:"-"` // 内部传递条件
} }
// OrderPrescriptionExportList 处方-导出 // OrderPrescriptionExportList 处方-导出
@ -38,5 +37,4 @@ type OrderPrescriptionExportList struct {
ExpiredTime string `json:"expired_time" form:"expired_time" label:"处方过期时间"` // 时间区间，数组形式，下标0为开始时间，下标1为结束时间 ExpiredTime string `json:"expired_time" form:"expired_time" label:"处方过期时间"` // 时间区间，数组形式，下标0为开始时间，下标1为结束时间
InquiryNo string `json:"inquiry_no" form:"inquiry_no" label:"问诊订单编号"` InquiryNo string `json:"inquiry_no" form:"inquiry_no" label:"问诊订单编号"`
OrderProductNo string `json:"order_product_no" form:"order_product_no" label:"药品订单编号"` OrderProductNo string `json:"order_product_no" form:"order_product_no" label:"药品订单编号"`
AnnualReviewHide *int `json:"-" form:"-"` // 内部传递条件
} }

3
api/requests/orderProduct.go
View File

@ -34,7 +34,7 @@ type GetOrderProductPage struct {
ProductName string `json:"product_name" form:"product_name" label:"药品名称"` ProductName string `json:"product_name" form:"product_name" label:"药品名称"`
CommonName string `json:"common_name" form:"common_name" label:"药品通用名"` CommonName string `json:"common_name" form:"common_name" label:"药品通用名"`
PrescriptionCode string `json:"prescription_code" form:"prescription_code" label:"处方编号"` PrescriptionCode string `json:"prescription_code" form:"prescription_code" label:"处方编号"`
AnnualReviewHide *int `json:"-" form:"-"` // 内部传递条件
} }
// CancelOrderProduct 取消药品订单 // CancelOrderProduct 取消药品订单
@ -67,5 +67,4 @@ type OrderProductExportList struct {
ConsigneeTel string `json:"consignee_tel" form:"cancel_reason" label:"收货人电话"` ConsigneeTel string `json:"consignee_tel" form:"cancel_reason" label:"收货人电话"`
PatientName string `json:"patient_name" form:"patient_name" label:"患者姓名-就诊人"` PatientName string `json:"patient_name" form:"patient_name" label:"患者姓名-就诊人"`
Mobile string `json:"mobile" form:"mobile" label:"手机号-医生/患者"` Mobile string `json:"mobile" form:"mobile" label:"手机号-医生/患者"`
AnnualReviewHide *int `json:"-" form:"-"` // 内部传递条件
} }

3
api/router/router.go
View File

@ -441,9 +441,6 @@ func privateRouter(r *gin.Engine, api controller.Api) {
// 获取问诊订单im内容列表-分页 // 获取问诊订单im内容列表-分页
inquiryGroup.GET("/im", api.OrderInquiry.GetOrderInquiryImPage) inquiryGroup.GET("/im", api.OrderInquiry.GetOrderInquiryImPage)
// 修改问诊订单年度审查隐藏状态
inquiryGroup.PUT("/hide/:order_inquiry_id", api.OrderInquiry.PutAnnualReviewHide)
} }
// 药品订单 // 药品订单

20
api/service/OrderInquiry.go
View File

@ -456,23 +456,3 @@ func (r *OrderInquiryService) GetOrderInquiryDoctorAmount(inquiryStatus int, amo
return doctorAmount return doctorAmount
} }
// PutAnnualReviewHide 修改问诊订单年度审查隐藏状态
func (r *OrderInquiryService) PutAnnualReviewHide(orderInquiryId int64, annualReviewHide int) error {
// 获取问诊订单数据
orderInquiryDao := dao.OrderInquiryDao{}
orderInquiry, err := orderInquiryDao.GetOrderInquiryById(orderInquiryId)
if err != nil || orderInquiry == nil {
return errors.New("订单数据错误")
}
// 修改问诊订单
orderInquiryData := make(map[string]interface{})
orderInquiryData["annual_review_hide"] = annualReviewHide
err = orderInquiryDao.EditOrderInquiryById(global.Db, orderInquiryId, orderInquiryData)
if err != nil {
return errors.New("修改隐藏状态失败")
}
return nil
}

5
api/service/UserCaCert.go
View File

@ -764,11 +764,6 @@ func (r *UserCaCertService) GetHospitalCloudCert() (g *dto.UserCaCertDto, err er
maps["ca_pin"] = userId maps["ca_pin"] = userId
maps["type"] = 2 maps["type"] = 2
userCaCert, _ := userCaCertDao.GetUserCaCert(maps) userCaCert, _ := userCaCertDao.GetUserCaCert(maps)
if userCaCert == nil {
// 如果找不到证书，可以返回 nil，或者返回一个特定的业务 error (如: errors.New("暂无医院证书"))
return nil, nil
}
g = dto.GetUserCaCertDto(userCaCert) g = dto.GetUserCaCertDto(userCaCert)
return g, nil return g, nil