修正修改医生问题处理

api/responses/userDoctorResponse/userDoctor.go

@@ -156,6 +156,10 @@ type GetUserDoctorPending struct {
 	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"`                           // 用户

api/service/userDoctor.go

@@ -947,6 +947,10 @@ func (r *UserDoctorService) GetUserDoctorPending(doctorId int64) (g *userDoctorR
 		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,
@@ -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 {

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
 	}

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)