From 845ea4a0009a8d6a19016d42a9803c7eeb3dcfe0 Mon Sep 17 00:00:00 2001 From: wucongxing <815046773@qq.com> Date: Wed, 19 Jul 2023 13:22:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=BF=AE=E6=94=B9=E5=8C=BB?= =?UTF-8?q?=E7=94=9F=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../userDoctorResponse/userDoctor.go | 48 +++++++++-------- api/service/userDoctor.go | 52 +++++++++++-------- extend/ca/ca.go | 4 +- extend/ca/caOnline.go | 8 ++- 4 files changed, 65 insertions(+), 47 deletions(-) diff --git a/api/responses/userDoctorResponse/userDoctor.go b/api/responses/userDoctorResponse/userDoctor.go index 402f142..2abf9d6 100644 --- a/api/responses/userDoctorResponse/userDoctor.go +++ b/api/responses/userDoctorResponse/userDoctor.go @@ -140,28 +140,32 @@ type GetMultiPage struct { // GetUserDoctorPending 身份审核-医生详情 type GetUserDoctorPending struct { - DoctorID string `json:"doctor_id"` // 主键id - UserID string `json:"user_id"` // 用户id - UserName string `json:"user_name"` // 用户名称 - Status int `json:"status"` // 状态（0:禁用 1:正常 2:删除） - IDCardStatus int `json:"idcard_status"` // 实名认证状态（0:未认证 1:认证通过 2:认证失败） - IdenAuthStatus int `json:"iden_auth_status"` // 身份认证状态（0:未认证 1:认证通过 2:审核中 3:认证失败） - IdenAuthTime model.LocalTime `json:"iden_auth_time"` // 审核时间 - IdenAuthFailReason *IdenAuthFailReason `json:"iden_auth_fail_reason"` // 身份认证失败原因 - Avatar string `json:"avatar"` // 头像 - DoctorTitle int `json:"doctor_title"` // 医生职称（1:主任医师 2:主任中医师 3:副主任医师 4:副主任中医师 5:主治医师 6:住院医师） - DepartmentCustomID string `json:"department_custom_id"` // 科室id-自定义 - DepartmentCustomName string `json:"department_custom_name"` // 科室名称（如未自己输入，填入标准科室名称） - DepartmentCustomMobile string `json:"department_custom_mobile"` // 科室电话 - HospitalID string `json:"hospital_id"` // 所属医院id - BeGoodAt string `json:"be_good_at"` // 擅长 - BriefIntroduction string `json:"brief_introduction"` // 医生简介 - CreatedAt model.LocalTime `json:"created_at"` // 创建时间 - UpdatedAt model.LocalTime `json:"updated_at"` // 更新时间 - User *userResponse.User `json:"user"` // 用户 - Hospital *hospitalResponse.Hospital `json:"hospital"` // 医院 - UserDoctorInfo *userDoctorInfoResponse.UserDoctorInfo `json:"user_doctor_info"` // 医生详情 - DoctorExpertise []*doctorExpertiseResponse.DoctorExpertise `json:"doctor_expertise"` // 医生专长 + DoctorID string `json:"doctor_id"` // 主键id + UserID string `json:"user_id"` // 用户id + UserName string `json:"user_name"` // 用户名称 + Status int `json:"status"` // 状态（0:禁用 1:正常 2:删除） + IDCardStatus int `json:"idcard_status"` // 实名认证状态（0:未认证 1:认证通过 2:认证失败） + IdenAuthStatus int `json:"iden_auth_status"` // 身份认证状态（0:未认证 1:认证通过 2:审核中 3:认证失败） + IdenAuthTime model.LocalTime `json:"iden_auth_time"` // 审核时间 + IdenAuthFailReason *IdenAuthFailReason `json:"iden_auth_fail_reason"` // 身份认证失败原因 + Avatar string `json:"avatar"` // 头像 + DoctorTitle int `json:"doctor_title"` // 医生职称（1:主任医师 2:主任中医师 3:副主任医师 4:副主任中医师 5:主治医师 6:住院医师） + DepartmentCustomID string `json:"department_custom_id"` // 科室id-自定义 + DepartmentCustomName string `json:"department_custom_name"` // 科室名称（如未自己输入，填入标准科室名称） + DepartmentCustomMobile string `json:"department_custom_mobile"` // 科室电话 + HospitalID string `json:"hospital_id"` // 所属医院id + BeGoodAt string `json:"be_good_at"` // 擅长 + BriefIntroduction string `json:"brief_introduction"` // 医生简介 + IsPlatformDeepCooperation int `json:"is_platform_deep_cooperation"` // 是否平台深度合作医生（0:否 1:是） + IsEnterpriseDeepCooperation int `json:"is_enterprise_deep_cooperation"` // 是否企业深度合作医生（0:否 1:是） + IsSysDiagnoCooperation int `json:"is_sys_diagno_cooperation"` // 是否先思达合作医生（0:否 1:是） + IsRecommend int `json:"is_recommend"` // 是否首页推荐（0:否 1:是） + CreatedAt model.LocalTime `json:"created_at"` // 创建时间 + UpdatedAt model.LocalTime `json:"updated_at"` // 更新时间 + User *userResponse.User `json:"user"` // 用户 + Hospital *hospitalResponse.Hospital `json:"hospital"` // 医院 + UserDoctorInfo *userDoctorInfoResponse.UserDoctorInfo `json:"user_doctor_info"` // 医生详情 + DoctorExpertise []*doctorExpertiseResponse.DoctorExpertise `json:"doctor_expertise"` // 医生专长 } // IdenAuthFailReason 身份认证失败原因 diff --git a/api/service/userDoctor.go b/api/service/userDoctor.go index 7584ce7..f55e629 100644 --- a/api/service/userDoctor.go +++ b/api/service/userDoctor.go @@ -931,28 +931,32 @@ func (r *UserDoctorService) GetUserDoctorPending(doctorId int64) (g *userDoctorR } g = &userDoctorResponse.GetUserDoctorPending{ - DoctorID: strconv.Itoa(int(userDoctor.DoctorId)), - UserID: strconv.Itoa(int(userDoctor.UserId)), - UserName: userDoctor.UserName, - Status: userDoctor.Status, - IDCardStatus: userDoctor.Status, - IdenAuthStatus: userDoctor.IdenAuthStatus, - IdenAuthTime: userDoctor.IdenAuthTime, - IdenAuthFailReason: IdenAuthFailReason, - Avatar: utils.AddOssDomain(userDoctor.Avatar), - DoctorTitle: userDoctor.DoctorTitle, - DepartmentCustomID: strconv.Itoa(int(userDoctor.DepartmentCustomId)), - DepartmentCustomName: userDoctor.DepartmentCustomName, - DepartmentCustomMobile: userDoctor.DepartmentCustomMobile, - HospitalID: strconv.Itoa(int(userDoctor.HospitalID)), - BeGoodAt: userDoctor.BeGoodAt, - BriefIntroduction: userDoctor.BriefIntroduction, - CreatedAt: userDoctor.CreatedAt, - UpdatedAt: userDoctor.UpdatedAt, - User: user, - Hospital: hospital, - UserDoctorInfo: userDoctorInfo, - DoctorExpertise: doctorExpertise, // 专长 + DoctorID: strconv.Itoa(int(userDoctor.DoctorId)), + UserID: strconv.Itoa(int(userDoctor.UserId)), + UserName: userDoctor.UserName, + Status: userDoctor.Status, + IDCardStatus: userDoctor.Status, + IdenAuthStatus: userDoctor.IdenAuthStatus, + IdenAuthTime: userDoctor.IdenAuthTime, + IdenAuthFailReason: IdenAuthFailReason, + Avatar: utils.AddOssDomain(userDoctor.Avatar), + DoctorTitle: userDoctor.DoctorTitle, + DepartmentCustomID: strconv.Itoa(int(userDoctor.DepartmentCustomId)), + DepartmentCustomName: userDoctor.DepartmentCustomName, + DepartmentCustomMobile: userDoctor.DepartmentCustomMobile, + HospitalID: strconv.Itoa(int(userDoctor.HospitalID)), + BeGoodAt: userDoctor.BeGoodAt, + BriefIntroduction: userDoctor.BriefIntroduction, + IsPlatformDeepCooperation: userDoctor.IsPlatformDeepCooperation, + IsEnterpriseDeepCooperation: userDoctor.IsEnterpriseDeepCooperation, + IsSysDiagnoCooperation: userDoctor.IsSysDiagnoCooperation, + IsRecommend: userDoctor.IsRecommend, + CreatedAt: userDoctor.CreatedAt, + UpdatedAt: userDoctor.UpdatedAt, + User: user, + Hospital: hospital, + UserDoctorInfo: userDoctorInfo, + DoctorExpertise: doctorExpertise, // 专长 } return g, nil @@ -1259,6 +1263,10 @@ func (r *UserDoctorService) PutMulti(doctorId int64, req requests.PutMulti) (boo return false, errors.New("已审核成功，无法进行操作") } + if userDoctor.IdenAuthStatus != 1 { + return false, errors.New("请先通过身份认证") + } + userDoctorData := make(map[string]interface{}) // 医生数据 if userDoctor.MultiPointStatus == req.MultiPointStatus { diff --git a/extend/ca/ca.go b/extend/ca/ca.go index fc44851..3c0d919 100644 --- a/extend/ca/ca.go +++ b/extend/ca/ca.go @@ -6,6 +6,7 @@ import ( "encoding/hex" "encoding/json" "errors" + "fmt" "hospital-admin-api/config" "io" "net/http" @@ -102,11 +103,12 @@ func postRequest(requestUrl string, formData url.Values, signature string) (map[ body := make(map[string]interface{}) if response.Body != nil || response.Body != "" { bodyMap, ok := response.Body.(map[string]interface{}) - if !ok { + if ok { body = bodyMap } } + fmt.Println(body) if len(body) == 0 { return nil, nil } diff --git a/extend/ca/caOnline.go b/extend/ca/caOnline.go index f76c379..983cb30 100644 --- a/extend/ca/caOnline.go +++ b/extend/ca/caOnline.go @@ -93,6 +93,7 @@ func EditCloudCert(d *EditCloudCertRequestData) (*EditCloudCertResponse, error) requestDataMap["orgName"] = d.OrgName requestDataMap["orgNumber"] = d.OrgNumber requestDataMap["pin"] = d.Pin + requestDataMap["orgDept"] = d.OrgDept requestDataMap["province"] = d.Province requestDataMap["locality"] = d.Locality requestDataMap["authType"] = d.AuthType @@ -114,6 +115,7 @@ func EditCloudCert(d *EditCloudCertRequestData) (*EditCloudCertResponse, error) formData.Set("orgName", d.OrgName) formData.Set("orgNumber", d.OrgNumber) formData.Set("pin", d.Pin) + formData.Set("orgDept", d.OrgDept) formData.Set("province", d.Province) formData.Set("locality", d.Locality) formData.Set("authType", d.AuthType) @@ -136,12 +138,12 @@ func EditCloudCert(d *EditCloudCertRequestData) (*EditCloudCertResponse, error) certP7, ok := response["certP7"] if !ok { - return nil, errors.New("返回数据错误") + return nil, errors.New("返回数据错误1") } certSerialnumber, ok := response["certSerialnumber"] if !ok { - return nil, errors.New("返回数据错误") + return nil, errors.New("返回数据错误2") } result := &EditCloudCertResponse{ @@ -168,6 +170,7 @@ func AddCloudCert(d *AddCloudCertRequest) (*AddCloudCertResponse, error) { requestDataMap["orgName"] = d.OrgName requestDataMap["orgNumber"] = d.OrgNumber requestDataMap["pin"] = d.Pin + requestDataMap["orgDept"] = d.OrgDept requestDataMap["province"] = d.Province requestDataMap["locality"] = d.Locality requestDataMap["authType"] = d.AuthType @@ -189,6 +192,7 @@ func AddCloudCert(d *AddCloudCertRequest) (*AddCloudCertResponse, error) { formData.Set("orgName", d.OrgName) formData.Set("orgNumber", d.OrgNumber) formData.Set("pin", d.Pin) + formData.Set("orgDept", d.OrgDept) formData.Set("province", d.Province) formData.Set("locality", d.Locality) formData.Set("authType", d.AuthType)