Merge branch '20201014_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20201014_xt_api_new_branch

controllers/drug_stock_api_contorller.go

@@ -1868,7 +1868,7 @@ func (c *StockDrugApiController) GetDrugQueryInfo() {
 	keyword := c.GetString("keyword")
 
 	adminUserInfo := c.GetAdminUserInfo()
-	list, total, err := service.FindAllStockInfo(adminUserInfo.CurrentOrgId, page, limit, keyword)
+	list, total, err := service.FindAllDrugStockInfo(adminUserInfo.CurrentOrgId, page, limit, keyword)
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{
 			"list":  list,

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -2612,6 +2612,16 @@ func (c *DialysisAPIController) CreateRemindDoctorAdvice() {
 			advice.WeekDay = week_day
 		}
 
+		if adviceNameM["way"] != nil || reflect.TypeOf(adviceNameM["way"]).String() == "float64" {
+			way := int64(adviceNameM["way"].(float64))
+			advice.Way = way
+		}
+
+		if adviceNameM["drug_id"] != nil || reflect.TypeOf(adviceNameM["drug_id"]).String() == "float64" {
+			drug_id := int64(adviceNameM["drug_id"].(float64))
+			advice.DrugId = drug_id
+		}
+
 		if adviceNameM["template_id"] != nil && reflect.TypeOf(adviceNameM["template_id"]).String() == "string" {
 			template_id, _ := adviceNameM["template_id"].(string)
 			advice.TemplateId = template_id

controllers/mobile_api_controllers/patient_api_controller.go

@@ -2335,13 +2335,13 @@ func adviceFormData(advice *models.DoctorAdvice, data []byte, action string) (co
 		advice.AdviceDesc = adviceDsc
 	}
 
-	if dataBody["src_type"] == nil {
+	if dataBody["way"] == nil {
 		advice.Way = 0
 
 	} else {
-		if dataBody["src_type"] != nil || reflect.TypeOf(dataBody["src_type"]).String() == "float64" {
-			src_type := int64(dataBody["src_type"].(float64))
-			advice.Way = src_type
+		if dataBody["way"] != nil || reflect.TypeOf(dataBody["way"]).String() == "float64" {
+			way := int64(dataBody["way"].(float64))
+			advice.Way = way
 		}
 
 	}
@@ -3060,13 +3060,13 @@ func (c *PatientApiController) setAdviceWithJSON(advice *models.GroupAdvice, jso
 	//	src_type, _ := strconv.ParseInt(json["src_type"].(string),10)
 	//	advice.Way = src_type
 	//}
-	if json["src_type"] == nil {
+	if json["way"] == nil {
 		advice.Way = 0
 
 	} else {
-		if json["src_type"] != nil || reflect.TypeOf(json["src_type"]).String() == "float64" {
-			src_type := int64(json["src_type"].(float64))
-			advice.Way = src_type
+		if json["way"] != nil || reflect.TypeOf(json["way"]).String() == "float64" {
+			way := int64(json["way"].(float64))
+			advice.Way = way
 		}
 
 	}

controllers/role_controller.go

@@ -200,9 +200,7 @@ func (this *RoleAPIController) ModifyRoleStatus() {
 // @param role_id:int
 func (this *RoleAPIController) EditPurviewInitData() {
 	//adminUserInfo := this.GetAdminUserInfo()
-	//if adminUserInfo.AdminUser.IsSuperAdmin == false {
-	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePermissionDenied)
-	//	return
+	//if
 	//}
 
 	roleId, _ := this.GetInt64("role_id")
@@ -219,42 +217,337 @@ func (this *RoleAPIController) EditPurviewInitData() {
 	purviews_mall, getPurviewsErr := service.GetAllGeneralPurviewVMsProcessed(7)
 	purviews_ky_mall, getPurviewsErr := service.GetAllGeneralPurviewVMsProcessed(8)
 
-	//purviews_func/**/, getPurviewsErr := service.GetAllFuncPurview()
+	purviews_func, _ := service.GetAllGeneralFuncPurviewVMsProcessed()
 
 	//门诊
-	outpatientRegistration, _ := service.GetOtherAllGeneralPurviewVMsProcessed("/outpatientRegistration/manage")
+	outpatientRegistration, _, _ := service.GetOtherAllGeneralPurviewVMsProcessed("/outpatientRegistration/manage")
 	//电子病历
-	ele, _ := service.GetOtherAllGeneralPurviewVMsProcessed("/patinets/ele")
+	_, _, originEle := service.GetOtherAllGeneralPurviewVMsProcessed("/patinets/ele")
 	//透析管理
-	dialysis, _ := service.GetOtherAllGeneralPurviewVMsProcessed("/dialysis/manage")
+	_, _, originDialysis := service.GetOtherAllGeneralPurviewVMsProcessed("/dialysis/manage")
 	//库房管理
-	stock, _ := service.GetOtherAllGeneralPurviewVMsProcessed("/stock/manage")
+	_, _, originStock := service.GetOtherAllGeneralPurviewVMsProcessed("/stock/manage")
 	//配置管理
-	config, _ := service.GetOtherAllGeneralPurviewVMsProcessed("/config/manage")
+	//_, _, orginConfig := service.GetOtherAllGeneralPurviewVMsProcessed("/config/manage")
 
-	//sub_outpatientRegistration,_ := service.GetOtherAllGeneralPurviewVMsProcessed("/outpatientRegistration/index")
+	//门诊管理
+	_, _, outpatientRegistrationPurview := service.GetOtherAllGeneralPurviewVMsProcessed("/outpatientRegistration/index")
+
+	//透析管理
+	_, _, originDialysisWatchPurview := service.GetOtherAllGeneralPurviewVMsProcessed("/dialysis/watch")
+	_, _, originWorkforcePurview := service.GetOtherAllGeneralPurviewVMsProcessed("/workforce/patient")
+	_, _, originSignPurview := service.GetOtherAllGeneralPurviewVMsProcessed("/sign/lineup")
+	_, _, originMedicalSchedulingPurview := service.GetOtherAllGeneralPurviewVMsProcessed("/medicalScheduling/index")
+	_, _, originQcdPurview := service.GetOtherAllGeneralPurviewVMsProcessed("/qcd/manage")
+	_, _, originDevicePurview := service.GetOtherAllGeneralPurviewVMsProcessed("/device/manage")
+	_, _, originDataUploadPurview := service.GetOtherAllGeneralPurviewVMsProcessed("/data/upload")
+
+	_, _, originConsumablesPurview := service.GetOtherAllGeneralPurviewVMsProcessed("/stock/consumablesManagement")
+	_, _, originDrugsPurview := service.GetOtherAllGeneralPurviewVMsProcessed("/stock/drugs")
+	_, _, originSelfPreparedMedicinePurview := service.GetOtherAllGeneralPurviewVMsProcessed("/stock/selfPreparedMedicineIndex")
+	_, _, originOtherPurview := service.GetOtherAllGeneralPurviewVMsProcessed("/stock/other")
+
+	_, _, originIntegrationPurview := service.GetOtherAllGeneralPurviewVMsProcessed("/integration/manage")
+	_, _, originTemplatePurview := service.GetOtherAllGeneralPurviewVMsProcessed("/template/manage")
+	_, _, originDictMedicinePurview := service.GetOtherAllGeneralPurviewVMsProcessed("/dict/manage")
+	_, _, originBedPurview := service.GetOtherAllGeneralPurviewVMsProcessed("/bed/manage")
+
+	//门诊管理
+
+	subPurviewTreeViewModel := []*service.PurviewTreeViewModel{}
+	for _, item := range outpatientRegistrationPurview {
+		temp := &service.PurviewTreeViewModel{
+			ID:     item.Id,
+			PID:    item.Parentid,
+			Name:   item.Name,
+			Number: 1,
+		}
+		subPurviewTreeViewModel = append(subPurviewTreeViewModel, temp)
+	}
 
-	//GetNewAllPurview("/outpatientRegistration/index")
+	for _, item := range outpatientRegistration {
+		if item.Name == "门诊挂号" {
+			item.Childs = append(item.Childs, subPurviewTreeViewModel...)
+		}
+	}
 
-	//ele,_ := service.GetOtherNewAllPurview("/patinets/ele")
-	//dialysis,_ := service.GetOtherNewAllPurview("/dialysis/manage")
-	//stock,_ := service.GetOtherNewAllPurview("/stock/manage")
-	//config,_ :=  service.GetOtherNewAllPurview("/config/manage")
-	//outpatientRegistration,_ := service.GetOtherNewAllPurview("/outpatientRegistration/manage")
+	//电子病历
 
-	//
-	//for _, item := range dialysis {
-	//		if item.Name == "透析记录" {
-	//			item.Childs = purviews_func
+	subElePurviewTreeViewModel := []*service.PurviewTreeViewModel{}
+	for _, item := range originEle {
+		temp := &service.PurviewTreeViewModel{
+			ID:     item.Id,
+			PID:    item.Parentid,
+			Name:   item.Name,
+			Number: 1,
+		}
+		subElePurviewTreeViewModel = append(subElePurviewTreeViewModel, temp)
+	}
+
+	//透析管理
+	subDialysisPurviewTreeViewModel := []*service.PurviewTreeViewModel{}
+	for _, item := range originDialysis {
+		temp := &service.PurviewTreeViewModel{
+			ID:     item.Id,
+			PID:    item.Parentid,
+			Name:   item.Name,
+			Number: 1,
+		}
+		subDialysisPurviewTreeViewModel = append(subDialysisPurviewTreeViewModel, temp)
+	}
+
+	//库存管理
+	subStockPurviewTreeViewModel := []*service.PurviewTreeViewModel{}
+	for _, item := range originStock {
+		temp := &service.PurviewTreeViewModel{
+			ID:     item.Id,
+			PID:    item.Parentid,
+			Name:   item.Name,
+			Number: 1,
+		}
+		subStockPurviewTreeViewModel = append(subStockPurviewTreeViewModel, temp)
+	}
+
+	////配置管理
+	//subConfigPurviewTreeViewModel := []*service.PurviewTreeViewModel{}
+	//for _, item := range orginConfig {
+	//	temp := &service.PurviewTreeViewModel{
+	//		ID:     item.Id,
+	//		PID:    item.Parentid,
+	//		Name:   item.Name,
+	//		Number: 1,
 	//	}
+	//	subConfigPurviewTreeViewModel = append(subConfigPurviewTreeViewModel, temp)
 	//}
 	//
-	//for _, item := range outpatientRegistration {
-	//	if item.Name == "门诊挂号" {
-	//		fmt.Println("111111")
-	//		item.Childs = purviews_func
 	//
+
+	//监测管理
+	subWatchPurviewTreeViewModel := []*service.PurviewTreeViewModel{}
+	for _, item := range originDialysisWatchPurview {
+		temp := &service.PurviewTreeViewModel{
+			ID:     item.Id,
+			PID:    item.Parentid,
+			Name:   item.Name,
+			Number: 1,
+		}
+		subWatchPurviewTreeViewModel = append(subWatchPurviewTreeViewModel, temp)
+	}
+
+	//排班管理
+	subWorkforcePurviewTreeViewModel := []*service.PurviewTreeViewModel{}
+	for _, item := range originWorkforcePurview {
+		temp := &service.PurviewTreeViewModel{
+			ID:     item.Id,
+			PID:    item.Parentid,
+			Name:   item.Name,
+			Number: 1,
+		}
+		subWorkforcePurviewTreeViewModel = append(subWorkforcePurviewTreeViewModel, temp)
+	}
+
+	//签到排队
+	subSignPurviewTreeViewModel := []*service.PurviewTreeViewModel{}
+	for _, item := range originSignPurview {
+		temp := &service.PurviewTreeViewModel{
+			ID:     item.Id,
+			PID:    item.Parentid,
+			Name:   item.Name,
+			Number: 1,
+		}
+		subSignPurviewTreeViewModel = append(subSignPurviewTreeViewModel, temp)
+	}
+
+	//医护排班
+	subMedicalSchedulingPurviewTreeViewModel := []*service.PurviewTreeViewModel{}
+	for _, item := range originMedicalSchedulingPurview {
+		temp := &service.PurviewTreeViewModel{
+			ID:     item.Id,
+			PID:    item.Parentid,
+			Name:   item.Name,
+			Number: 1,
+		}
+		subMedicalSchedulingPurviewTreeViewModel = append(subMedicalSchedulingPurviewTreeViewModel, temp)
+	}
+
+	subQCDPurviewTreeViewModel := []*service.PurviewTreeViewModel{}
+	for _, item := range originQcdPurview {
+		temp := &service.PurviewTreeViewModel{
+			ID:     item.Id,
+			PID:    item.Parentid,
+			Name:   item.Name,
+			Number: 1,
+		}
+		subQCDPurviewTreeViewModel = append(subQCDPurviewTreeViewModel, temp)
+	}
+
+	subDevicePurviewTreeViewModel := []*service.PurviewTreeViewModel{}
+	for _, item := range originDevicePurview {
+		temp := &service.PurviewTreeViewModel{
+			ID:     item.Id,
+			PID:    item.Parentid,
+			Name:   item.Name,
+			Number: 1,
+		}
+		subDevicePurviewTreeViewModel = append(subDevicePurviewTreeViewModel, temp)
+	}
+
+	subDataUploadPurviewTreeViewModel := []*service.PurviewTreeViewModel{}
+	for _, item := range originDataUploadPurview {
+		temp := &service.PurviewTreeViewModel{
+			ID:     item.Id,
+			PID:    item.Parentid,
+			Name:   item.Name,
+			Number: 1,
+		}
+		subDataUploadPurviewTreeViewModel = append(subDataUploadPurviewTreeViewModel, temp)
+	}
+
+	subConsumablesPurviewTreeViewModel := []*service.PurviewTreeViewModel{}
+	for _, item := range originConsumablesPurview {
+		temp := &service.PurviewTreeViewModel{
+			ID:     item.Id,
+			PID:    item.Parentid,
+			Name:   item.Name,
+			Number: 1,
+		}
+		subConsumablesPurviewTreeViewModel = append(subConsumablesPurviewTreeViewModel, temp)
+	}
+
+	subDrugPurviewTreeViewModel := []*service.PurviewTreeViewModel{}
+	for _, item := range originDrugsPurview {
+		temp := &service.PurviewTreeViewModel{
+			ID:     item.Id,
+			PID:    item.Parentid,
+			Name:   item.Name,
+			Number: 1,
+		}
+		subDrugPurviewTreeViewModel = append(subDrugPurviewTreeViewModel, temp)
+	}
+
+	subSelfPreparedMedicinePurviewTreeViewModel := []*service.PurviewTreeViewModel{}
+	for _, item := range originSelfPreparedMedicinePurview {
+		temp := &service.PurviewTreeViewModel{
+			ID:     item.Id,
+			PID:    item.Parentid,
+			Name:   item.Name,
+			Number: 1,
+		}
+		subSelfPreparedMedicinePurviewTreeViewModel = append(subSelfPreparedMedicinePurviewTreeViewModel, temp)
+	}
+
+	subOtherPurviewTreeViewModel := []*service.PurviewTreeViewModel{}
+	for _, item := range originOtherPurview {
+		temp := &service.PurviewTreeViewModel{
+			ID:     item.Id,
+			PID:    item.Parentid,
+			Name:   item.Name,
+			Number: 1,
+		}
+		subOtherPurviewTreeViewModel = append(subOtherPurviewTreeViewModel, temp)
+	}
+
+	subIntegrationPurviewTreeViewModel := []*service.PurviewTreeViewModel{}
+	for _, item := range originIntegrationPurview {
+		temp := &service.PurviewTreeViewModel{
+			ID:     item.Id,
+			PID:    item.Parentid,
+			Name:   item.Name,
+			Number: 1,
+		}
+		subIntegrationPurviewTreeViewModel = append(subIntegrationPurviewTreeViewModel, temp)
+	}
+
+	subTemplatePurviewTreeViewModel := []*service.PurviewTreeViewModel{}
+	for _, item := range originTemplatePurview {
+		temp := &service.PurviewTreeViewModel{
+			ID:     item.Id,
+			PID:    item.Parentid,
+			Name:   item.Name,
+			Number: 1,
+		}
+		subTemplatePurviewTreeViewModel = append(subTemplatePurviewTreeViewModel, temp)
+	}
+
+	subDictPurviewTreeViewModel := []*service.PurviewTreeViewModel{}
+	for _, item := range originDictMedicinePurview {
+		temp := &service.PurviewTreeViewModel{
+			ID:     item.Id,
+			PID:    item.Parentid,
+			Name:   item.Name,
+			Number: 1,
+		}
+		subDictPurviewTreeViewModel = append(subDictPurviewTreeViewModel, temp)
+	}
+
+	subBedPrviewTreeViewModel := []*service.PurviewTreeViewModel{}
+	for _, item := range originBedPurview {
+		temp := &service.PurviewTreeViewModel{
+			ID:     item.Id,
+			PID:    item.Parentid,
+			Name:   item.Name,
+			Number: 1,
+		}
+		subBedPrviewTreeViewModel = append(subBedPrviewTreeViewModel, temp)
+	}
+
+	for _, item := range subDialysisPurviewTreeViewModel {
+		if item.Name == "透析记录" {
+			item.Childs = append(item.Childs, purviews_func...)
+		}
+		if item.Name == "透析监控" {
+			item.Childs = append(item.Childs, subWatchPurviewTreeViewModel...)
+		}
+		if item.Name == "患者排班" {
+			item.Childs = append(item.Childs, subWorkforcePurviewTreeViewModel...)
+		}
+		if item.Name == "签到排队" {
+			item.Childs = append(item.Childs, subSignPurviewTreeViewModel...)
+		}
+		if item.Name == "医护排班" {
+			item.Childs = append(item.Childs, subMedicalSchedulingPurviewTreeViewModel...)
+		}
+		if item.Name == "质控管理" {
+			item.Childs = append(item.Childs, subQCDPurviewTreeViewModel...)
+		}
+		if item.Name == "院感管理" {
+			item.Childs = append(item.Childs, subDevicePurviewTreeViewModel...)
+		}
+		if item.Name == "质控上报" {
+			item.Childs = append(item.Childs, subDataUploadPurviewTreeViewModel...)
+		}
+	}
+
+	for _, item := range subStockPurviewTreeViewModel {
+		if item.Name == "耗材管理" {
+			item.Childs = append(item.Childs, subConsumablesPurviewTreeViewModel...)
+		}
+		if item.Name == "药品管理" {
+			item.Childs = append(item.Childs, subDrugPurviewTreeViewModel...)
+		}
+		if item.Name == "自备药管理" {
+			item.Childs = append(item.Childs, subSelfPreparedMedicinePurviewTreeViewModel...)
+		}
+		if item.Name == "其他管理" {
+			item.Childs = append(item.Childs, subOtherPurviewTreeViewModel...)
+		}
+
+	}
+
+	//for _, item := range subConfigPurviewTreeViewModel {
+	//	if item.Name == "集成管理" {
+	//		item.Childs = append(item.Childs, subIntegrationPurviewTreeViewModel...)
+	//	}
+	//	if item.Name == "模版管理" {
+	//		item.Childs = append(item.Childs, subTemplatePurviewTreeViewModel...)
+	//	}
+	//	if item.Name == "字典管理" {
+	//		item.Childs = append(item.Childs, subDictPurviewTreeViewModel...)
 	//	}
+	//	if item.Name == "床位管理" {
+	//		item.Childs = append(item.Childs, subBedPrviewTreeViewModel...)
+	//	}
+	//
 	//}
 
 	purviews := []*service.PurviewTreeViewModel{}
@@ -268,14 +561,12 @@ func (this *RoleAPIController) EditPurviewInitData() {
 	}
 	purviews = append(purviews, menzhen)
 
-	//purviews =
-
 	dianzi := &service.PurviewTreeViewModel{
 		ID:     0,
 		PID:    0,
 		Name:   "电子病历",
 		Number: 3,
-		Childs: ele,
+		Childs: subElePurviewTreeViewModel,
 	}
 	purviews = append(purviews, dianzi)
 
@@ -284,7 +575,7 @@ func (this *RoleAPIController) EditPurviewInitData() {
 		PID:    0,
 		Name:   "透析管理",
 		Number: 3,
-		Childs: dialysis,
+		Childs: subDialysisPurviewTreeViewModel,
 	}
 	purviews = append(purviews, touxi)
 
@@ -293,7 +584,7 @@ func (this *RoleAPIController) EditPurviewInitData() {
 		PID:    0,
 		Name:   "库房管理",
 		Number: 3,
-		Childs: stock,
+		Childs: subStockPurviewTreeViewModel,
 	}
 	purviews = append(purviews, kufang)
 
@@ -336,14 +627,14 @@ func (this *RoleAPIController) EditPurviewInitData() {
 
 	purviews = append(purviews, mall)
 
-	peizhi := &service.PurviewTreeViewModel{
-		ID:     0,
-		PID:    0,
-		Name:   "配置管理",
-		Number: 3,
-		Childs: config,
-	}
-	purviews = append(purviews, peizhi)
+	//peizhi := &service.PurviewTreeViewModel{
+	//	ID:     0,
+	//	PID:    0,
+	//	Name:   "配置管理",
+	//	Number: 3,
+	//	Childs: subConfigPurviewTreeViewModel,
+	//}
+	//purviews = append(purviews, peizhi)
 
 	if getPurviewsErr != nil {
 		//beego.Error("获取所有权限时出错:", getPurviewsErr)

controllers/stock_in_api_controller.go

@@ -1776,7 +1776,7 @@ func (c *StockManagerApiController) GetQueryInfo() {
 	keyword := c.GetString("keyword")
 
 	adminUserInfo := c.GetAdminUserInfo()
-	list, total, err := service.FindAllDrugStockInfo(adminUserInfo.CurrentOrgId, page, limit, keyword)
+	list, total, err := service.FindAllStockInfo(adminUserInfo.CurrentOrgId, page, limit, keyword)
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{
 			"list":  list,

models/doctor_advice_models.go

@@ -75,6 +75,8 @@ type DoctorAdviceTemplate struct {
 	DrugId                  int64                   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
 	Way                     int64                   `gorm:"column:way" json:"way" form:"way"`
 	SubDoctorAdviceTemplate []*DoctorAdviceTemplate `gorm:"ForeignKey:ParentId;AssociationForeignKey:ID" json:"child"`
+	Way                     int64                   `gorm:"column:way" json:"way"`
+	DrugId                  int64                   `gorm:"column:drug_id" json:"drug_id"`
 }
 
 func (DoctorAdviceTemplate) TableName() string {

models/purview_models.go

@@ -17,6 +17,7 @@ type Purview struct {
 	Desc                string     `gorm:"column:desc" json:"desc" form:"desc"`
 	Link                string     `gorm:"-" json:"link"`   // urlfor 解析后的链接
 	Childs              []*Purview `gorm:"-" json:"childs"` // 子节点
+	ParentUrl           string     `gorm:"column:parent_url" json:"parent_url" form:"parent_url"`
 }
 
 func (Purview) TableName() string {

service/doctor_advice_service.go

@@ -204,7 +204,7 @@ func FindDoctorAdviceTemplateById(id int64, org_id int64) (temps models.DoctorAd
 
 func FindAllAdviceTemplate(org_id int64, advice_type int64) (temps []*models.DoctorAdviceParentTemplate, err error) {
 	err = readDb.Model(&models.DoctorAdviceParentTemplate{}).Preload("DoctorAdviceTemplate", func(db *gorm.DB) *gorm.DB {
-		return db.Select("id,advice_name,advice_desc,single_dose,single_dose_unit,prescribing_number,prescribing_number_unit,delivery_way,execution_frequency,status,created_time,updated_time,parent_id,template_id,drug_spec,drug_spec_unit,advice_type,day_count,week_days,frequency_type, IF(parent_id>0, parent_id, id) as advice_order").Where("status = 1").Order("advice_order desc, id")
+		return db.Select("id,advice_name,advice_desc,single_dose,single_dose_unit,prescribing_number,prescribing_number_unit,delivery_way,execution_frequency,status,created_time,updated_time,parent_id,template_id,drug_spec,drug_spec_unit,advice_type,day_count,week_days,frequency_type,way,drug_id, IF(parent_id>0, parent_id, id) as advice_order").Where("status = 1").Order("advice_order desc, id")
 	}).Where("org_id = ? AND status=1 AND advice_type = ?", org_id, advice_type).Find(&temps).Error
 	return
 }

service/role_service.go

@@ -2,6 +2,7 @@ package service
 
 import (
 	"database/sql"
+	"fmt"
 	"strconv"
 	"strings"
 	"time"
@@ -357,11 +358,13 @@ func CreateGeneralAdminUser(orgID int64, appID int64, mobile string, name string
 }
 
 type PurviewTreeViewModel struct {
-	ID     int64                   `json:"id"`
-	PID    int64                   `json:"pid"`
-	Name   string                  `json:"name"`
-	Childs []*PurviewTreeViewModel `json:"childs"`
-	Number int64                   `json:"number"`
+	ID        int64                   `json:"id"`
+	PID       int64                   `json:"pid"`
+	Name      string                  `json:"name"`
+	Childs    []*PurviewTreeViewModel `json:"childs"`
+	Number    int64                   `json:"number"`
+	Url       string                  `json:"url"`
+	ParentUrl string                  `json:"parent_url"`
 }
 
 func GetAllGeneralPurviewVMsProcessed(module int) ([]*PurviewTreeViewModel, error) {
@@ -785,7 +788,6 @@ type Purview struct {
 	ParentUrl           string     `gorm:"column:parent_url" json:"parent_url" form:"parent_url"`
 	Link                string     `gorm:"-" json:"link"`   // urlfor 解析后的链接
 	Childs              []*Purview `gorm:"-" json:"childs"` // 子节点
-
 }
 
 func (Purview) TableName() string {
@@ -812,28 +814,33 @@ func GetAllFuncPurview() ([]*models.SgjUserOperatePurview, error) {
 	return originPurviews, getPurviewErr
 }
 
-func GetOtherAllGeneralPurviewVMsProcessed(url string) ([]*PurviewTreeViewModel, error) {
+func GetOtherAllGeneralPurviewVMsProcessed(url string) ([]*PurviewTreeViewModel, error, []*models.Purview) {
 	var originPurviews []*models.Purview
 	getPurviewErr := readUserDb.Model(Purview{}).Where("status = 1 AND parent_url = ?", url).Order("listorder asc").Order("id asc").Find(&originPurviews).Error
 	if getPurviewErr != nil {
-		return nil, getPurviewErr
+		return nil, getPurviewErr, nil
 	}
 	// 加工这些规则：树形化
 	purviewVMs := make([]*PurviewTreeViewModel, 0)
 	pid_childs := make(map[int64][]*PurviewTreeViewModel)
+	fmt.Println(originPurviews)
 	for _, purview := range originPurviews {
 		// warning：下面这个算法只适用最多两层树形结构的菜单，对于两层以上的会丢失掉第三层及其以下的节点
 		// 因为取出 originPurviews 的时候已经排过序了，所以顶级节点肯定最先处理，不需要担心子节点比父节点先处理
 		pvm := &PurviewTreeViewModel{
-			ID:     purview.Id,
-			PID:    purview.Parentid,
-			Name:   purview.Name,
-			Number: 2,
+			ID:        purview.Id,
+			PID:       purview.Parentid,
+			Name:      purview.Name,
+			Number:    2,
+			ParentUrl: purview.ParentUrl,
+			Url:       purview.Urlfor,
 		}
 		if purview.Parentid == 0 {
+
 			purviewVMs = append(purviewVMs, pvm)
 		} else {
 			childs := pid_childs[purview.Parentid]
+
 			if childs == nil {
 				childs = make([]*PurviewTreeViewModel, 0)
 			}
@@ -846,5 +853,5 @@ func GetOtherAllGeneralPurviewVMsProcessed(url string) ([]*PurviewTreeViewModel,
 		vm.Childs = pid_childs[vm.ID]
 	}
 
-	return purviewVMs, nil
+	return purviewVMs, nil, originPurviews
 }

service/stock_service.go

@@ -25,6 +25,8 @@ func ModifyDealer(dealer *models.Dealer) error {
 		"modifier":        dealer.Modifier,
 		"mtime":           time.Now().Unix(),
 		"remark":          dealer.Remark,
+		"wubi":            dealer.WuBi,
+		"pinyin":          dealer.PinYin,
 	}).Error
 
 	return err
@@ -71,6 +73,8 @@ func ModifyManufacturer(manufacturer *models.Manufacturer) error {
 		"modifier":          manufacturer.Modifier,
 		"mtime":             time.Now().Unix(),
 		"remark":            manufacturer.Remark,
+		"wubi":              manufacturer.WuBi,
+		"pinyin":            manufacturer.PinYin,
 	}).Error
 
 	return err